Commit graph

3767 commits

Author SHA1 Message Date
Alex Gleason
01dd53328b
Cleanup unused code 2022-02-10 16:36:36 -06:00
Alex Gleason
f051b70b10
Support Ethereum external login 2022-02-10 16:34:46 -06:00
Alex Gleason
012a7f8d89
Mitra: support Ethereum login 2022-02-09 19:47:13 -06:00
Alex Gleason
06214272a8 Merge branch 'status-menu' into 'develop'
Don't show 'Bookmark' item menu if not authenticated

See merge request soapbox-pub/soapbox-fe!1033
2022-02-09 22:26:37 +00:00
c672f7a6ae Don't show 'Bookmark' item menu if not authenticated
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-09 23:11:45 +01:00
marcin mikołajczak
bbc5728ad7 Merge branch 'language-pl' into 'develop'
Update Polish translation

See merge request soapbox-pub/soapbox-fe!1032
2022-02-09 12:12:59 +00:00
6687741057 Update Polish translation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-09 12:58:28 +01:00
Alex Gleason
872d5135b8 Merge branch 'mitra' into 'develop'
First pass at Mitra compatibility

See merge request soapbox-pub/soapbox-fe!1031
2022-02-07 19:29:48 +00:00
Alex Gleason
d260cc2e2c
Add fallback avatar 2022-02-07 13:14:15 -06:00
Alex Gleason
c4bf347dae
MediaGallery: fall back on url when preview_url isn't provided 2022-02-07 12:26:11 -06:00
Alex Gleason
2c51054ae4
UI: actually, don't wait for the streaming URL to render 2022-02-07 12:20:03 -06:00
Alex Gleason
c084a7a232
Mitra: handle status context endpoint as a list of statuses 2022-02-07 12:19:28 -06:00
Alex Gleason
69712baa02
Normalizer: normalize required account & status fields 2022-02-07 11:50:05 -06:00
Alex Gleason
6b3438185d Merge branch 'develop' into 'develop'
Added birthday Hebrew translation, fixed typos.

See merge request soapbox-pub/soapbox-fe!1030
2022-02-07 04:00:46 +00:00
Ashdemai
70d59e0673 Update app/soapbox/locales/he.json 2022-02-07 03:03:52 +00:00
Ashdemai
a50ca998c2 Update app/soapbox/locales/he.json 2022-02-07 03:01:45 +00:00
Alex Gleason
8d65c60638 Merge branch 'gotosocial' into 'develop'
GoToSocial support

See merge request soapbox-pub/soapbox-fe!1029
2022-02-07 03:00:19 +00:00
Ashdemai
387690d46a Update app/soapbox/locales/he.json 2022-02-07 02:46:46 +00:00
Alex Gleason
fb7c642dc7
GoToSocial support 2022-02-06 20:46:06 -06:00
Ashdemai
39c9161bfb Update app/soapbox/locales/he.json 2022-02-07 02:36:50 +00:00
Ashdemai
4928024e9a Update app/soapbox/locales/he.json 2022-02-07 02:33:29 +00:00
Alex Gleason
19ff6ba90b Merge branch 'develop' into 'develop'
Translation to Hebrew

See merge request soapbox-pub/soapbox-fe!1028
2022-02-07 02:14:15 +00:00
Ashdemai
c3e7c8e1dd Update app/soapbox/locales/he.json 2022-02-07 02:03:28 +00:00
Ashdemai
a6d34af6e4 Update app/soapbox/locales/he.json 2022-02-07 01:58:12 +00:00
Ashdemai
a14f218009 Update app/soapbox/locales/he.json 2022-02-07 01:57:12 +00:00
Ashdemai
a6ac9645dc Merge branch 'Ashdemai-develop-patch-97154' into 'develop'
Update app/soapbox/locales/he.json

See merge request Ashdemai/soapbox-fe!1
2022-02-07 00:38:03 +00:00
Alex Gleason
eb3fc815d9 Merge branch 'blocked_message_when_blocked' into 'develop'
State why you can't follow someone, don't just disable the button

See merge request soapbox-pub/soapbox-fe!1010
2022-02-05 20:36:26 +00:00
NEETzsche
bf0a7d7bae State why you can't follow someone, don't just disable the button 2022-02-05 20:36:25 +00:00
Alex Gleason
a229f77f5d Merge branch 'goldendemise-develop-patch-71514' into 'develop'
Allow icon picker to work properly for promo panel items:  patch 71514

See merge request soapbox-pub/soapbox-fe!1027
2022-02-04 17:53:52 +00:00
Sean
4c522ca148 fix spacing 2022-02-04 17:43:01 +00:00
Sean
aea44e2ac6 Update app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js 2022-02-03 16:14:36 +00:00
Sean
ea0d6484a6 Update app/soapbox/features/soapbox_config/components/icon_picker_dropdown.js 2022-02-03 16:06:41 +00:00
Sean
e6ca4ba299 Add css to center only the icons created by the hack in icon_picker_dropdown.js 2022-02-03 05:25:59 +00:00
Sean
58850f1d8e Fix icons to show in the picker for promotional items 2022-02-03 05:23:12 +00:00
Ashdemai
3f36b4c1dd Update app/soapbox/locales/he.json 2022-02-03 02:00:09 +00:00
a041a4452b Rename modal -> modals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-02 16:36:20 +01:00
e0f0370579 Merge remote-tracking branch 'soapbox/develop' into modals-stack
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-02 14:30:38 +01:00
Alex Gleason
d5ae29bfda Merge branch 'mastodon-configuration' into 'develop'
Normalize instance configuration for Mastodon

See merge request soapbox-pub/soapbox-fe!1022
2022-02-01 15:23:50 +00:00
marcin mikołajczak
5fda820a95 Merge branch 'snackbar-action-link' into 'develop'
Add 'View' action link to some notifications

Closes #791

See merge request soapbox-pub/soapbox-fe!1008
2022-02-01 08:42:11 +00:00
marcin mikołajczak
8fed920bb7 Merge branch 'develop' into 'snackbar-action-link'
# Conflicts:
#   app/soapbox/features/edit_profile/index.js
2022-02-01 08:27:38 +00:00
Alex Gleason
c4c6e24c48 Merge branch 'develop' into 'develop'
Develop

See merge request soapbox-pub/soapbox-fe!1024
2022-02-01 03:13:12 +00:00
Ashdemai
1d66392150 Update app/soapbox/locales/he.json 2022-02-01 02:59:13 +00:00
Alex Gleason
8134d27c10 Merge branch 'birthday-utc' into 'develop'
Format birthday as UTC, fixes #821

Closes #821

See merge request soapbox-pub/soapbox-fe!1023
2022-02-01 02:32:21 +00:00
Ashdemai
1de9421f0d Update app/soapbox/locales/he.json 2022-02-01 02:27:01 +00:00
Alex Gleason
abe5b07245
Format birthday as UTC 2022-01-31 20:18:15 -06:00
Alex Gleason
154b9849f3 Merge branch 'revert-5381b27c' into 'develop'
Reintroduce replying-to on pending statuses

See merge request soapbox-pub/soapbox-fe!990
2022-02-01 01:01:06 +00:00
Alex Gleason
3708c0128c Merge branch 'birthdays' into 'develop'
Birth dates

See merge request soapbox-pub/soapbox-fe!1000
2022-02-01 01:00:52 +00:00
Alex Gleason
b74b5084b5 Merge branch 'shavian-transliteration' into 'develop'
Shavian transliteration

See merge request soapbox-pub/soapbox-fe!1020
2022-02-01 01:00:32 +00:00
t t
b665891659 Shavian transliteration 2022-02-01 01:00:32 +00:00
Alex Gleason
67399473d0 Merge branch 'account-subscriptions-mastodon' into 'develop'
Support account subscriptions on Mastodon

See merge request soapbox-pub/soapbox-fe!940
2022-02-01 00:59:14 +00:00