Commit Graph

8114 Commits

Author SHA1 Message Date
195ec1b67d Merge branch 'chat-resize-reset' into 'develop'
Chats: reset chat message field height after sending a message

See merge request soapbox-pub/soapbox!2277
2023-02-12 22:14:03 +00:00
35bf20507d Merge branch 'cleanup' into 'develop'
Fixes, styles improvements, cleanup, enforce classes order for classNames

See merge request soapbox-pub/soapbox!2258
2023-02-12 21:59:53 +00:00
4936c3ed38 Merge remote-tracking branch 'soapbox/develop' into cleanup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-12 22:26:55 +01:00
7759f64fed Chats: reset chat message field height after sending a message
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-12 22:23:44 +01:00
8f79ef2bcd Merge branch 'filters' into 'develop'
Fix filters, restyle filters page

See merge request soapbox-pub/soapbox!2262
2023-02-12 21:08:15 +00:00
380d2b763f Merge branch 'improve-reactions' into 'develop'
Improve Emoji Reactions and add support for Chat Reactions

See merge request soapbox-pub/soapbox!2267
2023-02-09 21:37:57 +00:00
1dda90da10 Merge branch 'emoji-compat' into 'develop'
Invert features.emojiReactsRGI

See merge request soapbox-pub/soapbox!2266
2023-02-09 20:44:29 +00:00
48eb42687a Disable chatEmojiReacts 2023-02-09 13:16:06 -05:00
2def1d0170 Discard changes to 'emojiReactsRGI' feature 2023-02-09 13:13:01 -05:00
9d08467b07 Update Changelog 2023-02-09 13:02:03 -05:00
8bdebd229d Merge branch 'display-all-reactions' into 'develop'
Display all emoji reactions

See merge request soapbox-pub/soapbox!2270
2023-02-09 14:00:38 +00:00
1461113f7f Merge branch 'weblate-soapbox-pub-soapbox' into 'develop'
Translations update from Hosted Weblate

See merge request soapbox-pub/soapbox!2269
2023-02-09 03:04:22 +00:00
c95261fcf1 Display all emoji reactions 2023-02-08 21:00:17 -06:00
4ac6e66bbb Translated using Weblate (Italian)
Currently translated at 100.0% (1447 of 1447 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/it/
2023-02-09 03:40:19 +01:00
0ae3cd853e Update CHANGELOG.md
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-08 23:45:03 +01:00
47403872fa Merge remote-tracking branch 'soapbox/develop' into filters 2023-02-08 23:40:40 +01:00
772c53a6ac Merge branch 'weblate-soapbox-pub-soapbox' into 'develop'
Translations update from Hosted Weblate

See merge request soapbox-pub/soapbox!2260
2023-02-08 19:46:26 +00:00
861509baa5 Translated using Weblate (Spanish)
Currently translated at 100.0% (1447 of 1447 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/es/
2023-02-08 20:39:21 +01:00
3ca491c03f classNames -> clsx 2023-02-08 14:06:41 -05:00
e255bfac3d Improve Emoji Reactions and add support for Chat Reactions 2023-02-08 12:58:01 -05:00
81bb8b933a Invert features.emojiReactsRGI 2023-02-08 11:57:23 -06:00
7373a650f1 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1447 of 1447 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
2023-02-08 13:40:02 +01:00
7f03d3bfe9 Translated using Weblate (Spanish)
Currently translated at 100.0% (1446 of 1446 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/es/
2023-02-07 23:53:30 +01:00
8404be2745 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1446 of 1446 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
2023-02-07 23:53:30 +01:00
ad8ad9cae8 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (1443 of 1443 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
2023-02-07 23:53:30 +01:00
4a3877d442 Translated using Weblate (German)
Currently translated at 100.0% (1443 of 1443 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/de/
2023-02-07 23:53:30 +01:00
dbf2e53b93 Merge branch 'rss-button' into 'develop'
Add RSS link to account menu

See merge request soapbox-pub/soapbox!1881
2023-02-07 22:53:23 +00:00
b19de058a1 Update changelog
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-07 22:24:58 +01:00
07b7d1ec2a Merge remote-tracking branch 'soapbox/develop' into rss-button 2023-02-07 22:24:15 +01:00
df19b4e4a3 Merge branch 'add-intl-to-storybook' into 'develop'
Add support for react-intl for Storybook

See merge request soapbox-pub/soapbox!2264
2023-02-07 21:16:20 +00:00
674ff4aa65 Add support for react-intl for Storybook 2023-02-07 14:23:28 -05:00
800b9e7742 Merge branch 'improve-tabs' into 'develop'
Update default border color for Tabs

See merge request soapbox-pub/soapbox!2263
2023-02-07 17:34:07 +00:00
0cc4188cad Update default border color for Tabs 2023-02-07 12:00:14 -05:00
1bbbaf8f4b Update en.json
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-07 17:43:37 +01:00
49a7d40efb Fix filters, restyle filters page
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-07 15:38:31 +01:00
71a2e679a0 Update .eslintrc.cjs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-07 09:42:08 +01:00
bfe1401a34 Fix imports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 23:48:44 +01:00
d44be7fbf8 Merge branch 'chat-composer' into 'develop'
Chats: move chat attachments into composer

See merge request soapbox-pub/soapbox!2229
2023-02-06 21:05:42 +00:00
d62290f020 Merge branch 'events' into 'develop'
Add NewEventPanel to events list page

See merge request soapbox-pub/soapbox!2255
2023-02-06 20:53:49 +00:00
e3f168f050 Merge remote-tracking branch 'origin/develop' into chat-composer 2023-02-06 14:25:37 -06:00
227f28d013 update eslint config
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 20:50:05 +01:00
76c76688e9 Merge branch 'renovate/react-sticky-box-2.x' into 'develop'
Update dependency react-sticky-box to v2

See merge request soapbox-pub/soapbox!2257
2023-02-06 19:38:33 +00:00
4721452986 Merge remote-tracking branch 'soapbox/develop' into cleanup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 20:31:20 +01:00
c56728b722 classNames() ==> clsx()
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 20:28:18 +01:00
75076abeac more styles cleanup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2023-02-06 20:20:14 +01:00
e5f90e4733 Merge branch 'clsx' into 'develop'
classNames() --> clsx(), lint

See merge request soapbox-pub/soapbox!2259
2023-02-06 19:15:43 +00:00
ea075c3799 Merge branch 'improve-logo-alignment' into 'develop'
Improve navbar alignment

See merge request soapbox-pub/soapbox!2253
2023-02-06 18:31:49 +00:00
785612691a yarn lint:js --fix 2023-02-06 12:06:44 -06:00
701215d7bc classNames() --> clsx() 2023-02-06 12:05:19 -06:00
89d55b1b70 ChatComposer: shrink "x" icon, fix pending upload jump 2023-02-06 11:30:36 -06:00