Jeremy Kescher
d650277b0f
Merge branch 'refs/heads/glitch-soc' into develop
2024-04-26 21:27:00 +02:00
GitHub Actions
c61130af33
New Crowdin translations
2024-04-22 04:27:38 +00: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
Claire
c3a128f31e
Remove strings already defined upstream
2024-04-06 21:25:04 +02:00
Jeremy Kescher
7122d5381c
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/notifications/components/notification.jsx
2024-04-06 21:03:55 +02:00
github-actions[bot]
8a64406d34
New Crowdin Translations (automated) ( #2668 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 18:18:06 +02: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
13c9524436
[Glitch] Add notification policies and notification requests in web UI
...
Port c10bbf5fe3
2024-03-13 18:38:46 +01:00
Claire
e95f2c2b68
Add a glitch-soc local setting to make the post publish toast optional ( #2666 )
2024-03-08 11:35:18 +01:00
github-actions[bot]
d002458c7b
New Crowdin Translations (automated) ( #2661 )
...
* New Crowdin translations
* Fix bogus translations
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-07 22:39:48 +01:00
GitHub Actions
1b418a3550
New Crowdin translations
2024-03-04 04:57:12 +00:00
Jeremy Kescher
05747febb6
Merge branch 'glitch-soc' into develop
2024-02-29 19:32:12 +01:00
GitHub Actions
ab195bcee1
New Crowdin translations
2024-02-29 04:27:18 +00: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
Essem
fa2bbbfd9d
Fix "threaded more" typo
2024-02-25 17:10:25 -06:00
Jeremy Kescher
8f8cb0fad3
Merge branch 'glitch-soc' into develop
2024-02-24 17:51:18 +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
9ab030bb13
Add thread mode button
2024-02-23 21:05:34 +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
380f4fc95c
Reimplement sensitive checkbox
2024-02-22 23:49:06 +01:00
Eugen Rochko
9c10aaa4d5
[Glitch] Change design of compose form in web UI
...
Port 6936e5aa69
2024-02-22 23:06:12 +01:00
Claire
bbecf1c56b
Further reduce differences with upstream ( #2631 )
...
* Further reduce CSS diffs with upstream
* Remove superfluous “Sensitive content” label in media galleries and clean up dead code
2024-02-18 22:30:20 +01:00
Jeremy Kescher
05a5c20681
Merge branch 'glitch-soc' into develop
2024-02-17 18:16:14 +01:00
Claire
c0279385d7
Adopt upstream's design for account profiles ( #2622 )
...
* Mostly adopt upstream's design for account profiles
* Reduce some margins
2024-02-16 17:57:43 +01:00
Jeremy Kescher
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +01:00
github-actions[bot]
a2611d782c
New Crowdin Translations (automated) ( #2588 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:45:07 +01:00
Jeremy Kescher
c7e37c256e
Merge branch 'glitch-soc' into develop
2024-02-01 18:18:19 +01:00
Claire
8b87673f5e
Remove obsolete locale file ( #2596 )
2024-01-30 23:21:35 +01:00
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
2024-01-28 02:29:46 +01:00
github-actions[bot]
ae9c675930
New Crowdin Translations (automated) ( #2564 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-26 19:45:04 +01:00
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop
2024-01-17 22:37:29 +01:00
Claire
50188ad211
[Glitch] Use helpers to check environment in frontend ( #2571 )
...
Port 277e6968f5
2024-01-15 12:16:05 +01:00
Jeremy Kescher
777be10810
Merge branch 'glitch-soc' into develop
2024-01-14 19:46:03 +01:00
Claire
0213ae6b37
Extract glitch-soc-only i18n string
2024-01-14 16:32:08 +01:00
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5
2024-01-12 22:03:50 +01:00
github-actions[bot]
e5b97eadd5
New Crowdin Translations (automated) ( #2502 )
...
* New Crowdin translations
* Update no.yml
* Update simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-11 12:56:56 +01:00
Essem
9670ba6a1b
More cleanup
2023-12-29 12:39:01 -06:00
Essem
6ae86f40d1
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-12-29 12:33:13 -06:00
Claire
a8f6a5b40f
Update translation strings
2023-12-03 11:23:12 +01:00
Claire
335cfab32f
Change account note design to match upstream's ( #2495 )
2023-12-03 11:22:38 +01:00
GitHub Actions
46a28fc41f
New Crowdin translations
2023-11-11 04:27:29 +00:00
github-actions[bot]
786e586686
New Crowdin translations ( #2388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-29 08:28:45 +02:00
github-actions[bot]
efb1888320
New Crowdin translations ( #2376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-26 22:53:46 +02:00
github-actions[bot]
3378bdb01f
New Crowdin translations ( #2354 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-11 22:03:11 +02:00
github-actions[bot]
3b49b5a880
New Crowdin translations ( #2348 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-31 07:44:04 +02:00
Plastikmensch
ebfa184e74
Port search popout changes from upstream ( #2333 )
...
* [Glitch] Change search pop-out in web UI
Port 2b113764116028d047b9e38b39194051b83ed19573b64b8917
2023-07-30 18:42:35 +02:00
github-actions[bot]
3a14104411
New Crowdin translations ( #2338 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-30 13:09:02 +02:00
