Commit graph

7718 commits

Author SHA1 Message Date
Alex Gleason
21f864c8a6 Merge branch 'backups' into 'develop'
Restore zip backups, export CSV, import CSV

Closes #1264

See merge request soapbox-pub/soapbox!2158
2023-01-13 19:41:01 +00:00
Alex Gleason
1215c99b61 Merge branch 'qrcode-border' into 'develop'
Upgrade qrcode.react, add white border

Closes #1321

See merge request soapbox-pub/soapbox!2166
2023-01-13 19:39:15 +00:00
Alex Gleason
b1af21956e
Upgrade qrcode.react, add white border
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1321
2023-01-13 12:47:51 -06:00
Alex Gleason
8b50afc128 Merge branch 'types-react' into 'develop'
Upgrade @types/react to v18

See merge request soapbox-pub/soapbox!2147
2023-01-13 18:05:59 +00:00
Alex Gleason
613a0077d3 Merge branch 'compose-icon' into 'develop'
ComposeForm: fix publish icon

Closes #1319

See merge request soapbox-pub/soapbox!2165
2023-01-13 17:53:36 +00:00
Alex Gleason
b28e80a1fe
ComposeForm: fix publish icon
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1319
2023-01-13 11:10:39 -06:00
Alex Gleason
36e9a88929 Merge branch 'weblate-soapbox-pub-soapbox' into 'develop'
Translations update from Hosted Weblate

See merge request soapbox-pub/soapbox!2164
2023-01-13 16:17:11 +00:00
Alex Gleason
edfece4ac0
Merge remote-tracking branch 'origin/develop' into types-react 2023-01-13 09:56:20 -06:00
Dan
27dabda872
Translated using Weblate (Ukrainian)
Currently translated at 87.0% (1171 of 1345 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/uk/
2023-01-13 07:48:46 +01:00
Tassoman
d5ac42b6d1
Translated using Weblate (Italian)
Currently translated at 94.9% (1277 of 1345 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/it/
2023-01-12 22:43:45 +01:00
Tassoman
c8c0c2d4d8
Translated using Weblate (Italian)
Currently translated at 91.0% (1225 of 1345 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/it/
2023-01-12 22:10:29 +01:00
Alex Gleason
3e8137172c Merge branch 'status-content-18' into 'develop'
StatusContent: useLayoutEffect, fix "read more" button glitchiness on React 18

See merge request soapbox-pub/soapbox!2162
2023-01-12 21:07:07 +00:00
Alex Gleason
c032c0bfea Merge branch 'weblate-soapbox-pub-soapbox' into 'develop'
Translations update from Hosted Weblate

See merge request soapbox-pub/soapbox!2163
2023-01-12 20:54:33 +00:00
Tassoman
1b6c54348d
Translated using Weblate (Italian)
Currently translated at 87.2% (1174 of 1345 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/it/
2023-01-12 20:26:01 +01:00
Alex Gleason
25a0730bf5
StatusContent: useLayoutEffect, fix "read more" button glitchiness on React 18 2023-01-12 10:57:39 -06:00
Alex Gleason
7e69eb2aa5 Merge branch 'gallery-18' into 'develop'
AccountGallery: fix crash in React 18

Closes #1318

See merge request soapbox-pub/soapbox!2161
2023-01-12 15:55:25 +00:00
Alex Gleason
8cbdc6019f
AccountGallery: fix crash in React 18
Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1318
2023-01-12 09:41:11 -06:00
Alex Gleason
658e336e5c
Fix export_data locale 2023-01-11 18:06:20 -06:00
Alex Gleason
e50e4b8e60
Restore export data CSV (behind a feature flag) 2023-01-11 17:59:50 -06:00
Alex Gleason
ebfd7bdc94
Move "Import data" under settings 2023-01-11 17:30:32 -06:00
Alex Gleason
98f311873c
Expose backups again 2023-01-11 17:25:55 -06:00
marcin mikołajczak
c6700539f7 Merge branch 'hover-card-avatar' into 'develop'
Fix avatar size in profile hover card

See merge request soapbox-pub/soapbox!2157
2023-01-11 23:11:22 +00:00
6208ea8e43 Fix avatar size in profile hover card
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-11 23:45:43 +01:00
Alex Gleason
994d9ebd35 Merge branch 'weblate-soapbox-pub-soapbox' into 'develop'
Translations update from Hosted Weblate

See merge request soapbox-pub/soapbox!2156
2023-01-11 20:40:22 +00:00
Hosted Weblate
e7331c4cdc
Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
2023-01-11 21:38:01 +01:00
Hosted Weblate
ab56391c92
Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
2023-01-11 21:37:52 +01:00
Chewbacca
6a612a854a Merge branch 'improve-link-previews' into 'develop'
Remove 'file-icon' in empty link preview

See merge request soapbox-pub/soapbox!2041
2023-01-11 20:37:46 +00:00
Alex Gleason
f6d86560ac Merge branch 'weblate-soapbox-pub-soapbox' into 'develop'
Translations update from Hosted Weblate

See merge request soapbox-pub/soapbox!2010
2023-01-11 20:31:18 +00:00
Hosted Weblate
65196d4ab4
Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
2023-01-11 21:07:01 +01:00
Chewbacca
e1a38b9d41 Merge branch 'fix-undefined-bug' into 'develop'
Fix multiple bugs

See merge request soapbox-pub/soapbox!2142
2023-01-11 20:06:47 +00:00
Chewbacca
cf9156b414 Refactor conditional 2023-01-11 14:55:52 -05:00
Alex Gleason
7607daf371 Merge branch 'fix-toast-test' into 'develop'
Fix toast test

See merge request soapbox-pub/soapbox!2153
2023-01-11 19:25:30 +00:00
Alex Gleason
5d0b10a5b8
Fix toast test 2023-01-11 13:13:27 -06:00
Alex Gleason
0d6cf4273d Merge branch 'fix/weblate1' into 'develop'
Weblate could not merge upstream changes while updating the repository.

See merge request soapbox-pub/soapbox!2107
2023-01-11 19:00:46 +00:00
Tassoman
cfd5c1e927 Weblate could not merge upstream changes while updating the repository. 2023-01-11 19:00:46 +00:00
Chewbacca
e36d26cb91 Merge branch 'use-api-error' into 'develop'
Use human-readable message from the API as the default

See merge request soapbox-pub/soapbox!2126
2023-01-11 17:36:25 +00:00
Chewbacca
375d135e65 Merge branch 'chats-jumpy-scrollbar' into 'develop'
Chats: fix jumpy scrollbar

Closes #1315

See merge request soapbox-pub/soapbox!2149
2023-01-11 16:45:50 +00:00
Chewbacca
c3595ea15b Chats: fix jumpy scrollbar
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/1315

Co-authored-by: Alex Gleason <alex@alexgleason.me>
2023-01-11 11:13:56 -05:00
Alex Gleason
f8be5ecdf4 Merge branch 'account-creation' into 'develop'
Expose Registration form to unknown backends

See merge request soapbox-pub/soapbox!2150
2023-01-11 04:24:16 +00:00
Alex Gleason
e5f592bfaf
Expose Registration form to unknown backends 2023-01-10 22:10:27 -06:00
Alex Gleason
ad18b0f1c9
Merge remote-tracking branch 'origin/develop' into types-react 2023-01-10 18:03:53 -06:00
Alex Gleason
87aa965069 Merge branch 'force-glob-parent' into 'develop'
Force a patched version of glob-parent

See merge request soapbox-pub/soapbox!2148
2023-01-10 23:32:10 +00:00
Alex Gleason
48fdc3882c
Force a patched version of glob-parent 2023-01-10 17:22:19 -06:00
Alex Gleason
5e22d1169f
Upgrade @types/react to v18 2023-01-10 17:03:15 -06:00
marcin mikołajczak
4ffaecbf32 Merge branch 'pending-status' into 'develop'
Set withLinkToProfile to false in PendingStatus

See merge request soapbox-pub/soapbox!2144
2023-01-10 22:22:02 +00:00
Alex Gleason
c9bfc7d259 Merge branch 'remove-prop-types' into 'develop'
Remove prop-types

See merge request soapbox-pub/soapbox!2146
2023-01-10 21:55:00 +00:00
Alex Gleason
edbbae2b48 Update babel.config.js 2023-01-10 21:36:35 +00:00
Alex Gleason
5de9afd18b
Remove prop-types 2023-01-10 15:06:26 -06:00
08742ea73d Set withLinkToProfile to false in PendingStatus
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-01-10 21:14:20 +01:00
Alex Gleason
ead55d5c30 Merge branch 'jsonwebtoken' into 'develop'
Force jsonwebtoken to ^9.0.0

See merge request soapbox-pub/soapbox!2143
2023-01-10 19:36:47 +00:00