|
|
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 |
|
|
|
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 |
|
|
|
39f2106bf7
|
Merge remote-tracking branch 'soapbox/develop' into modals-stack
|
2022-01-30 18:56:30 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
65a71b7653
|
Add line-clamp to quoted post content
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-28 21:11:03 +01:00 |
|
Alex Gleason
|
be7910945b
|
Merge branch 'rt-mrf-md' into 'develop'
sw.js: Fix display of RT line in push notifications
See merge request soapbox-pub/soapbox-fe!1012
|
2022-01-28 18:06:46 +00:00 |
|
Alex Gleason
|
309981a294
|
sw.js: Fix display of RT line in push notifications
|
2022-01-28 11:52:41 -06:00 |
|
Alex Gleason
|
91fe4f4306
|
Merge branch 'fix-quote-imports' into 'develop'
Fix quote_visible for nested quote
See merge request soapbox-pub/soapbox-fe!1011
|
2022-01-28 16:51:14 +00: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 |
|
Justin
|
f42754ad58
|
Apply 1 suggestion(s) to 1 file(s)
|
2022-01-27 19:56:16 +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
|
f0051b7bbc
|
Merge branch 'demo' into 'develop'
Add "demo" mode for taking screenshots
See merge request soapbox-pub/soapbox-fe!1007
|
2022-01-27 01:52:06 +00:00 |
|
Alex Gleason
|
0964fc1f4d
|
Add "demo" mode for taking screenshots
|
2022-01-26 19:37:32 -06:00 |
|
Alex Gleason
|
978a2a0086
|
Merge branch 'pending-status-quotes' into 'develop'
Add quotes for pending statuses
See merge request soapbox-pub/soapbox-fe!1006
|
2022-01-26 19:01:10 +00: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 |
|
Alex Gleason
|
0e7f397841
|
Merge branch 'shift-click-reblogs' into 'develop'
Quote posts: Shift+Click for normal repost
See merge request soapbox-pub/soapbox-fe!1005
|
2022-01-26 16:33:11 +00:00 |
|
|
|
741e80d9ab
|
Birthdays: Try to fix timezones
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 23:37:40 -08:00 |
|
