Commit graph

2094 commits

Author SHA1 Message Date
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
Alex Gleason
fb7c642dc7
GoToSocial support 2022-02-06 20:46:06 -06: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
NEETzsche
bf0a7d7bae State why you can't follow someone, don't just disable the button 2022-02-05 20:36:25 +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
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
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
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
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
Alex Gleason
1fc1f653b4 Merge branch 'iss_dein_schnitzel-develop-patch-32323' into 'develop'
Update de.json

See merge request soapbox-pub/soapbox-fe!1018
2022-02-01 00:40:09 +00:00
Alex Gleason
e04e75f831
Set attachment limit from instance 2022-01-31 17:52:12 -06:00
Alex Gleason
04979486e8
Normalize instance configuration for Mastodon 2022-01-31 16:51:11 -06:00
Alex Gleason
0d000bf4e0
Set instance version default, just in case... 2022-01-31 11:23:39 -06:00
Alex Gleason
6e889c7a4f
Mastodon: fall back to account lookup API 2022-01-31 11:18:44 -06:00
Alex Gleason
7e7ca52cca
Delay rendering until instance has loaded or failed (for feature detection) 2022-01-31 10:58:44 -06:00
Isabell Deinschnitzel
a0af3310b1 Update de.json 2022-01-30 22:01:23 +00:00
Alex Gleason
630f583c2f
Strip all instances of compat features from statuses 2022-01-30 09:47:31 -06:00
f25c9298ca Merge remote-tracking branch 'soapbox/develop' into account-subscriptions-mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-28 23:47:27 +01:00
Alex Gleason
cac8b5026e
Fix RT spacing in the other place 2022-01-28 14:52:22 -06:00
Alex Gleason
309981a294
sw.js: Fix display of RT line in push notifications 2022-01-28 11:52:41 -06:00
Alex Gleason
e5e4105a03
Fix quote_visible for nested quote 2022-01-28 10:17:38 -06:00
marcin mikołajczak
7bb404207a Merge branch 'quote-posts-tombstones' into 'develop'
Add quoted status tombstone

See merge request soapbox-pub/soapbox-fe!1009
2022-01-27 23:07:14 +00:00
ae7f2f86a0 Add quoted status tombstone
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-27 17:26:39 +01:00
bf7cd98c03 Add 'View' action link to some notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-27 16:00:05 +01:00
Alex Gleason
0964fc1f4d
Add "demo" mode for taking screenshots 2022-01-26 19:37:32 -06:00
22b3986178 PendingStatus: Do not display PlaceholderCard if it has a quote
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-26 19:49:04 +01:00
7c790a53eb Add quotes for pending statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-26 19:45:02 +01:00
6c11d2f0bf Merge branch 'birthdays' of https://gitlab.com/mkljczk/soapbox-fe into birthdays
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-26 18:43:44 +01:00
b1bc544a01 Birthdays: Use custom header
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-26 18:43:00 +01:00
741e80d9ab Birthdays: Try to fix timezones
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 23:37:40 -08:00
Alex Gleason
0f9e01b4a1
"birth date" --> "birthday", move the toggle next to the picker 2022-01-25 17:08:20 -06:00
8277d78f4c Quote posts: Shift+Click for normal repost
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 23:00:30 +01:00
ac42b43fab Birthdays: renames
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 21:10:13 +01:00
ecfef7b151 Merge remote-tracking branch 'soapbox/develop' into birthdays 2022-01-25 20:27:16 +01:00
980f5f8ae3 Birthdays: use maxDate
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-25 16:51:15 +01:00
Alex Gleason
d36f0f7aae Merge branch 'recipients-inline' into 'develop'
Status: strip compatibility features from markup when importing

See merge request soapbox-pub/soapbox-fe!1004
2022-01-25 02:53:26 +00:00
Alex Gleason
462df83989
Status: strip compatibility features from markup when importing 2022-01-24 20:39:22 -06:00