Commit graph

2143 commits

Author SHA1 Message Date
Artur Mancha
0e7e511c03 hide_network and stranger_notifications added
Update pt.json
2021-06-17 12:27:36 +00:00
Alex Gleason
4b790caa72 Merge branch 'streaming-fix' into 'develop'
Fix streaming notifictaions

Closes #653

See merge request soapbox-pub/soapbox-fe!537
2021-06-17 07:20:52 +00:00
Alex Gleason
94a57e7e34
Fix streaming notifictaions 2021-06-17 02:18:17 -05:00
Alex Gleason
ceee6ad755 Merge branch 'emoji-pool-fix' into 'develop'
Populate emojis in autosuggest again

See merge request soapbox-pub/soapbox-fe!535
2021-06-16 22:41:17 +00:00
Alex Gleason
bce54285e4
Populate emojis in autosuggest again 2021-06-16 17:39:03 -05:00
Alex Gleason
d5d51487c7 Merge branch 'emoji-search-fix' into 'develop'
Skip custom emojis when they match a Unicode emoji's shortcode

Closes #610

See merge request soapbox-pub/soapbox-fe!534
2021-06-16 22:04:24 +00:00
Alex Gleason
2ef977a204
Skip custom emojis when they match a Unicode emoji's shortcode 2021-06-16 16:48:23 -05:00
Alex Gleason
6db8c07bc0 Merge branch 'hidden-video-fix' into 'develop'
Fix display of multiple rich media items

Closes #650

See merge request soapbox-pub/soapbox-fe!533
2021-06-16 20:34:46 +00:00
Alex Gleason
dedac70e58
Fix display of multiple rich media items 2021-06-16 15:20:14 -05:00
Alex Gleason
c0c6c52621 Merge branch 'exif-orientation' into 'develop'
Update resize_image.js from Mastodon

Closes #652

See merge request soapbox-pub/soapbox-fe!532
2021-06-16 20:09:27 +00:00
Alex Gleason
258c4d6422
Update resize_image.js from Mastodon 2021-06-16 14:53:43 -05:00
Alex Gleason
282c9d2bfe Merge branch 'hide-network' into 'develop'
Support hidden stats

Closes #569

See merge request soapbox-pub/soapbox-fe!531
2021-06-16 19:36:41 +00:00
Alex Gleason
351ae2df25
Support hidden stats 2021-06-16 14:20:57 -05:00
Alex Gleason
ac5228c16a Merge branch 'layouts' into 'develop'
Make right sidebar available on most pages

See merge request soapbox-pub/soapbox-fe!530
2021-06-16 18:50:52 +00:00
Alex Gleason
5ca4d4c3d7
Make right sidebar available on most pages 2021-06-16 13:34:54 -05:00
Alex Gleason
26421e6f42 Merge branch 'lisbonjoker-develop-patch-11935' into 'develop'
Missed - donate_crypto

See merge request soapbox-pub/soapbox-fe!529
2021-06-16 14:10:16 +00:00
Artur Mancha
f6f5841fdc Missed - donate_crypto
Update pt.json
2021-06-16 12:07:07 +00:00
Alex Gleason
d804929a56 Merge branch 'lisbonjoker-develop-patch-64570' into 'develop'
Cryptocurrency - Update pt.json

See merge request soapbox-pub/soapbox-fe!528
2021-06-16 01:08:27 +00:00
Artur Mancha
6bf8f0a495 Cryptocurrency Update pt.json 2021-06-16 00:53:54 +00:00
Alex Gleason
845ac6ab08 Merge branch 'email-list' into 'develop'
Email list integration

See merge request soapbox-pub/soapbox-fe!527
2021-06-15 22:05:45 +00:00
Alex Gleason
eb006202e7
EmailList: let csv links be clickable, add combined.csv support, conditionally display elements 2021-06-15 15:20:00 -05:00
Alex Gleason
6255ba4976
Support email list 2021-06-14 22:22:48 -05:00
Alex Gleason
0cd0eb6787 Merge branch 'mkljczk-develop-patch-49381' into 'develop'
Update Polish translation

See merge request soapbox-pub/soapbox-fe!526
2021-06-14 19:22:13 +00:00
marcin mikołajczak
c726dc5989 Update Polish translation 2021-06-14 19:08:05 +00:00
Alex Gleason
9180dd28c6 Merge branch 'rczajka-develop-patch-35986' into 'develop'
Update pl.json

See merge request soapbox-pub/soapbox-fe!525
2021-06-11 21:33:27 +00:00
Radek Czajka
054f6a6cda Update pl.json 2021-06-11 21:19:08 +00:00
Alex Gleason
d8e7737742 Merge branch 'crypto-updates' into 'develop'
CryptoDonate updates

See merge request soapbox-pub/soapbox-fe!524
2021-06-11 15:04:03 +00:00
Alex Gleason
10a1b908b8
Fix CopyableInput button CSS 2021-06-11 10:00:44 -05:00
Alex Gleason
dc4aa76a37
CryptoDonate: add more shitcoins to block explorers 2021-06-11 09:43:30 -05:00
Alex Gleason
3f8318adf3
CryptoDonate: fix CryptoAddress actions stacking 2021-06-11 09:29:44 -05:00
Alex Gleason
a9c2131b18
fund the --> fund our 2021-06-10 19:26:44 -05:00
Alex Gleason
085135b660
CryptoDonatePanel: set default limit to 1 2021-06-10 18:55:19 -05:00
Alex Gleason
8fdf478fe0
Make CryptoDonate page a public route 2021-06-10 15:44:47 -05:00
Alex Gleason
bd323bbc8a Merge branch 'crypto-donate-explorers' into 'develop'
CryptoDonate: update block explorer data

See merge request soapbox-pub/soapbox-fe!523
2021-06-10 20:23:36 +00:00
Alex Gleason
e68b8e63b1
CryptoDonate: update block explorer data 2021-06-10 15:19:05 -05:00
Alex Gleason
31c0ce802b Merge branch 'crypto-donate-2' into 'develop'
Crypto donate improvements

See merge request soapbox-pub/soapbox-fe!522
2021-06-10 19:42:18 +00:00
Alex Gleason
ef53cd2de1
CryptoDonate: add donate button to mobile sidebar 2021-06-10 14:05:07 -05:00
Alex Gleason
8a2d436d31
CryptoDonate: add explanation box to donation page 2021-06-10 14:00:45 -05:00
Alex Gleason
7525713460
CryptoDonate: configure wallets and panel in SoapboxConfig 2021-06-10 13:48:43 -05:00
Alex Gleason
6f1ce38473
crypto_addresses -> cryptoAddresses 2021-06-10 12:57:16 -05:00
Alex Gleason
acfca37dec
CryptoDonate: add CryptoDonateWidget to homepage 2021-06-10 12:56:27 -05:00
Alex Gleason
a3ee5789bc Merge branch 'crypto-donate' into 'develop'
Crypto donations

See merge request soapbox-pub/soapbox-fe!521
2021-06-10 01:57:29 +00:00
Alex Gleason
95b5738dfd
CryptoDonate: parse Profile Fields as CrypoAddresses 2021-06-09 20:36:02 -05:00
Alex Gleason
820afa9412
CryptoDonate: refactor duplicated code 2021-06-09 19:49:53 -05:00
Alex Gleason
39ee6505d8
CryptoDonate: add CryptoDonateModal 2021-06-09 19:28:16 -05:00
Alex Gleason
940af0dd85
CryptoDonate: style form elements 2021-06-09 18:53:13 -05:00
Alex Gleason
acbfd7bcc3
CryptoDonate: add block explorer links 2021-06-09 18:28:54 -05:00
Alex Gleason
51ac3e3d4e
CryptoDonate: improve styling 2021-06-09 17:57:14 -05:00
Alex Gleason
fde99ff11c
CryptoDonate: make crypto addresses copyable 2021-06-09 17:39:45 -05:00
Alex Gleason
483fadb7c2
CryptoDonate: refactor, rename, reorganize 2021-06-09 17:12:26 -05:00