Jeremy Kescher
|
fae98d1deb
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
|
2024-05-20 23:57:04 +02:00 |
|
Renaud Chaput
|
ca5955ed76
|
[Glitch] Use a modern React context for identity in the app
Port a178ba7cd5 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-20 12:53:52 +02:00 |
|
Jeremy Kescher
|
e73c612cb1
|
Merge branch 'refs/heads/glitch-soc' into develop
|
2024-05-11 23:31:31 +02:00 |
|
Claire
|
6662d604c1
|
[Glitch] Add loading indicator and empty result message to advanced interface search
Port 7d3fe2b4c3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-05-04 16:15:54 +02:00 |
|
Jeremy Kescher
|
2df3b9f803
|
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
# app/serializers/initial_state_serializer.rb
|
2024-04-11 21:50:48 +02:00 |
|
Eugen Rochko
|
91531e9586
|
[Glitch] Add ability to reorder uploaded media before posting in web UI
Port 8e7e86ee35 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-04-06 22:34:03 +02:00 |
|
Jeremy Kescher
|
0353a3d759
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
# app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
|
2024-03-20 22:59:13 +01:00 |
|
Claire
|
5e039b96c3
|
[Glitch] Fix emoji picker placement on limited-height viewports
Port 94f7ae192b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-03-20 12:31:45 +01:00 |
|
Jeremy Kescher
|
21a23b58ab
|
Merge branch 'glitch-soc' into develop
|
2024-03-14 21:46:57 +01:00 |
|
Jeremy Kescher
|
caccc2e0f4
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# README.md
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/reducers/compose.js
# app/javascript/flavours/glitch/styles/components.scss
# app/javascript/mastodon/reducers/compose.js
# app/models/notification.rb
|
2024-03-14 20:01:30 +01:00 |
|
Eugen Rochko
|
042d17ddf1
|
[Glitch] Fix wrong background color on search results in web UI
Port 1e1d97a787 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-03-14 17:30:46 +01:00 |
|
Renaud Chaput
|
6440651976
|
[Glitch] Use the server setting to get the max number of poll options in UI
Port b9722dfe2b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-03-11 17:38:07 +01:00 |
|
Mashiro
|
1fc6edfa84
|
[Glitch] Fix unhandled nullable attachments limitation counter
Port b8bd94ca8e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-03-07 13:01:21 +01:00 |
|
Jeremy Kescher
|
de1e89f42c
|
Merge branch 'glitch-soc' into develop
|
2024-02-28 23:01:31 +01:00 |
|
Claire
|
c19787f3f4
|
Add doodle feature back (#2652)
|
2024-02-27 21:27:51 +01:00 |
|
Claire
|
e8155319c7
|
Take advantage of upstream's refactor and reduce code duplication
|
2024-02-27 19:28:13 +01:00 |
|
Claire
|
916d78373d
|
[Glitch] Change behavior of privacy dropdown to only change value on validation
Port 90573c3abb to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-27 19:24:34 +01:00 |
|
Essem
|
fa2bbbfd9d
|
Fix "threaded more" typo
|
2024-02-25 17:10:25 -06:00 |
|
Essem
|
4edbebfbac
|
Fix reaction picker dropdown appearance
|
2024-02-25 18:16:15 +01:00 |
|
Jeremy Kescher
|
77d74465af
|
Remove useless "inverted" prop
|
2024-02-24 19:36:31 +01:00 |
|
Jeremy Kescher
|
009251a17d
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
|
2024-02-24 19:11:05 +01:00 |
|
Jeremy Kescher
|
8f8cb0fad3
|
Merge branch 'glitch-soc' into develop
|
2024-02-24 17:51:18 +01:00 |
|
Claire
|
3ffb81e04f
|
[Glitch] Add end-to-end test for OCR in media uploads
Port ca8fbda5d0 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 16:13:13 +01:00 |
|
Claire
|
ad0be125f5
|
[Glitch] Fix pixel alignment for some composer icons
Port 25ffe0af45 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 15:53:42 +01:00 |
|
Yamagishi Kazutoshi
|
b4cca47f5f
|
[Glitch] Remove unused l18n messages
Port b3075a9993 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 14:19:26 +01:00 |
|
J H
|
4d6844eb2f
|
[Glitch] Fixed the toggle emoji dropdown bug
Port 1467f1e1e1 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 14:15:59 +01:00 |
|
Claire
|
6da69967d0
|
[Glitch] Change compose form to use server-provided post character limit
Port 805dba7f8d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-24 13:56:12 +01:00 |
|
Jeremy Kescher
|
004b22602b
|
Merge branch 'emoji-reactions-base' into develop
# Conflicts:
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/styles/components.scss
|
2024-02-24 11:08:13 +01:00 |
|
Claire
|
6901930c8d
|
Add back confirmation modal for missing media description
|
2024-02-23 23:04:32 +01:00 |
|
Claire
|
6eede9d84b
|
Add notification badge feature back
|
2024-02-23 21:05:34 +01:00 |
|
Claire
|
9ab030bb13
|
Add thread mode button
|
2024-02-23 21:05:34 +01:00 |
|
Claire
|
e62cd93650
|
Fix composer offering to edit federation settings for an existing post
|
2024-02-23 21:05:34 +01:00 |
|
Claire
|
23dc650596
|
Restore preselect on reply option
|
2024-02-23 21:05:34 +01:00 |
|
Claire
|
84d05ca221
|
Reimplement glitchy elephant friend
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
3564a15553
|
Refactor composer dropdowns
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
0e77c45624
|
Add local-only option back as a federation setting dropdown
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
47deb680d5
|
Add Content-Type dropdown back
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
118bb5bc81
|
Add secondary post button back
|
2024-02-23 21:05:33 +01:00 |
|
Claire
|
61559a42a9
|
Restore glitch-soc's permalink behavior for reply indicator
|
2024-02-23 20:57:20 +01:00 |
|
Claire
|
179437ed0e
|
Restore access to glitch-soc app settings
|
2024-02-23 20:57:20 +01:00 |
|
Claire
|
056f9bf3c2
|
Add back “spoilers always on” feature
|
2024-02-23 20:57:18 +01:00 |
|
Claire
|
380f4fc95c
|
Reimplement sensitive checkbox
|
2024-02-22 23:49:06 +01:00 |
|
Claire
|
5fd50756b4
|
Restore glitch-soc's support of custom poll limits
|
2024-02-22 23:06:12 +01:00 |
|
Eugen Rochko
|
9c10aaa4d5
|
[Glitch] Change design of compose form in web UI
Port 6936e5aa69 to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2024-02-22 23:06:12 +01:00 |
|
Claire
|
7586d4348f
|
Switch glitch-soc to upstream's old composer
|
2024-02-22 22:10:17 +01:00 |
|
Claire
|
9a11b077f7
|
Reduce CSS and markup differences with upstream (#2629)
|
2024-02-18 19:12:23 +01:00 |
|
Jeremy Kescher
|
1c9291adcd
|
Merge branch 'glitch-soc' into develop
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
|
2024-02-14 18:02:38 +01:00 |
|
Claire
|
c249c10f74
|
Fix account suggestion size inconsistency with upstream
|
2024-02-11 21:55:36 +01:00 |
|
Claire
|
f6f62002c7
|
Remove leftovers from glitch-soc's layout option
|
2024-02-08 19:21:35 +01:00 |
|
Claire
|
189b70cd6a
|
Merge SCSS in a single components.scss file
|
2024-02-08 18:50:38 +01:00 |
|