Wykres commitów

4051 Commity (0ddee401363a927ae8d86ef6c74e5843194e1c98)

Autor SHA1 Wiadomość Data
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
marcin mikołajczak a041a4452b Rename modal -> modals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-02 16:36:20 +01:00
marcin mikołajczak 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
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 0799f19c83 Merge branch 'mastodon-lookup-fix' into 'develop'
Mastodon: fall back to account lookup API

See merge request soapbox-pub/soapbox-fe!1021
2022-01-31 17:56:53 +00: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
marcin mikołajczak 467ddf404e Merge branch 'quote-posts-styles' into 'develop'
Fix quoted status content overflow with multiple paragraphs on Firefox

See merge request soapbox-pub/soapbox-fe!1019
2022-01-30 22:31:57 +00:00
marcin mikołajczak 0166dd40ff Fix quoted status content with multiple paragraphs on Firefox
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-30 23:17:55 +01:00
Isabell Deinschnitzel a0af3310b1 Update de.json 2022-01-30 22:01:23 +00:00
marcin mikołajczak 39f2106bf7 Merge remote-tracking branch 'soapbox/develop' into modals-stack 2022-01-30 18:56:30 +01:00
marcin mikołajczak 807b3c7e5b Use stack for modals
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-01-30 18:53:47 +01:00
Alex Gleason 26961b8445 Merge branch 'fedibird-rt-fix' into 'develop'
Strip all instances of compat features from statuses

See merge request soapbox-pub/soapbox-fe!1016
2022-01-30 16:02:06 +00:00
Alex Gleason 630f583c2f
Strip all instances of compat features from statuses 2022-01-30 09:47:31 -06:00
marcin mikołajczak 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 dada0f7d73 Merge branch 'rt-mrf-md' into 'develop'
Fix RT spacing in the other place

See merge request soapbox-pub/soapbox-fe!1014
2022-01-28 21:07:09 +00:00
Alex Gleason cac8b5026e
Fix RT spacing in the other place 2022-01-28 14:52:22 -06:00
Alex Gleason c30671a7d8 Merge branch 'quote-posts' into 'develop'
Quote posts: Add line-clamp to quoted post content

See merge request soapbox-pub/soapbox-fe!1013
2022-01-28 20:24:52 +00:00