156c6ea36c
Fix position of “expand” icon in media modal on glitch-soc ( #1838 )
2022-08-31 16:23:10 +02:00
0fece174f6
Fix error when accessing /filters/:id/statuses on glitch-soc ( #1837 )
...
I failed to account for glitch-soc's theming system when merging
from upstream.
2022-08-31 11:55:27 +02:00
0495302f1c
Fix local settings navigation ( #1836 )
...
The “filters” page was removed, but not from the navigation, which would offset
everything.
2022-08-30 10:57:27 +02:00
90917b305a
Fix WebUI error in development mode ( #19078 )
...
Caused by using JSX features without importing React
2022-08-29 10:02:40 +02:00
bbb45568ad
Fix WebUI error in development mode ( #1835 )
...
Caused by using JSX features without importing React
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-29 08:23:05 +02:00
7a02c1d9ba
Add regexp filter field to public timeline column settings ( #1834 )
...
* Add regexp filter field to public timeline column settings
This has accidentally been removed while porting an upstream change years ago.
* Remove dead code
* Fix regexp filter not working for local and public TLs when using non-default settings
2022-08-28 22:21:55 +02:00
54ae7a221e
[Glitch] Replace to `workbox-webpack-plugin` from `offline-plugin`
...
Port 81e1cc5fec
2022-08-28 11:41:21 +02:00
6c7bb926d8
Revert "Remove preference to aggregate reblogs in home/list feeds ( #18112 )"
...
This reverts commit af396fa35f
2022-08-28 11:31:39 +02:00
077183a121
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
Upstream dropping `digest` from notifications emails while we have more
notification emails settings.
Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
Conflicts caused by glitch-soc's theming system.
Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream removed a setting close to a glitch-soc-only setting.
Applied upstream's change.
2022-08-28 11:31:00 +02:00
546672e292
Change "Allow trends without prior review" setting to include statuses ( #17977 )
...
* Change "Allow trends without prior review" setting to include posts
* Fix i18n-tasks
2022-08-28 04:00:39 +02:00
c57907737a
Change search API to be accessible without being logged in ( #18963 )
...
But with the resolve option turned off
2022-08-28 03:45:19 +02:00
c99c106ef0
Change following and followers API to be accessible without being logged in ( #18964 )
2022-08-28 03:45:07 +02:00
2a7766dcc9
Add admin API for managing e-mail domain blocks ( #19066 )
2022-08-28 03:37:55 +02:00
c556c3a0d1
Add admin API for managing canonical e-mail blocks ( #19067 )
2022-08-28 03:31:54 +02:00
b399d79545
Add admin API for managing IP blocks ( #19065 )
2022-08-27 20:56:47 +02:00
54d9a9c18a
Fix react warning on notifications column ( #1832 )
2022-08-27 15:17:27 +02:00
c7147bab90
Fix incorrect and slow cache invalidation in ClearDomainMediaService ( #19062 )
...
Fixes #19060
2022-08-27 00:45:54 +02:00
1fac99e842
Add rel="noopener" to links to remote profiles ( #19014 )
...
* Update timeline_hint.js
* Update timeline_hint.js
2022-08-26 02:12:46 +02:00
1d84cbeaab
Fix "select all matching items" being offered when all items are on the page ( #19054 )
2022-08-26 02:11:23 +02:00
af396fa35f
Remove preference to aggregate reblogs in home/list feeds ( #18112 )
2022-08-25 23:38:36 +02:00
0b3e4fd5de
Remove digest e-mails ( #17985 )
...
* Remove digest e-mails
* Remove digest-related code
2022-08-25 23:38:22 +02:00
5b0e8cc92b
Add ability to select all accounts matching search for batch actions ( #19053 )
2022-08-25 23:33:34 +02:00
d696f729f1
Add meta tag for official iOS app ( #16599 )
2022-08-25 23:27:10 +02:00
0396acf39e
Add audit log entries for user roles ( #19040 )
...
* Refactor audit log schema
* Add audit log entries for user roles
2022-08-25 20:39:40 +02:00
81e1cc5fec
Replace to `workbox-webpack-plugin` from `offline-plugin` ( #18409 )
2022-08-25 20:10:01 +02:00
d99f91bceb
[Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
...
Port 55bef1e34f
2022-08-25 18:19:09 +02:00
43a1bfd05d
[Glitch] Fix “Filter this post” potentially listing deleted filters
...
Port 2cae5f5b8d
2022-08-25 18:18:34 +02:00
3ff340c790
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-25 17:49:14 +02:00
55bef1e34f
Fix quickly switching notification filters resulting in empty or incorrect list ( #19052 )
...
Follow-up to #18960
The aforementioned PR fixed an issue in which switching notification filters
while notifications were loading prevented the query for the new filter from
running, but another issue remained: if the first query completed after the
second one, its results would override the second one, thus leading to the
same issue.
This commit cancels the first request if it is still running, before issuing
the second one.
2022-08-25 17:36:54 +02:00
2cae5f5b8d
Fix “Filter this post” potentially listing deleted filters ( #19051 )
2022-08-25 17:36:35 +02:00
3efa8da2d6
New Crowdin updates ( #18972 )
...
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Uyghur)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Dutch)
* New translations en.json (Portuguese)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Danish)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.json (Catalan)
* New translations en.json (Hungarian)
* New translations en.json (Slovenian)
* New translations en.json (Galician)
* New translations en.json (Greek)
* New translations en.json (Polish)
* New translations en.json (Turkish)
* New translations devise.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* New translations en.json (Albanian)
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Icelandic)
* New translations en.json (Latvian)
* New translations en.json (Spanish)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Ido)
* New translations en.json (Russian)
* New translations en.json (Vietnamese)
* New translations en.yml (Esperanto)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.json (Thai)
* New translations en.json (Russian)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Korean)
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Albanian)
* New translations en.yml (Korean)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Portuguese)
* New translations en.yml (Slovenian)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Italian)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Georgian)
* New translations en.yml (Armenian)
* New translations en.yml (Spanish)
* New translations en.yml (Japanese)
* New translations en.yml (German)
* New translations en.yml (Russian)
* New translations en.yml (Slovak)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Romanian)
* New translations en.yml (French)
* New translations en.yml (Afrikaans)
* New translations en.yml (Hungarian)
* New translations en.yml (Arabic)
* New translations en.yml (Bulgarian)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Frisian)
* New translations en.yml (Basque)
* New translations en.yml (Irish)
* New translations en.yml (Hebrew)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Corsican)
* New translations en.yml (Breton)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Ido)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Sinhala)
* New translations en.yml (Malayalam)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Latvian)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Hindi)
* New translations en.yml (Tatar)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Swedish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Polish)
* New translations en.yml (Slovenian)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Polish)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Spanish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Vietnamese)
* New translations en.yml (Icelandic)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-08-25 19:40:19 +09:00
2b03e21d36
Fix glitch-soc-specific timeline filtering logic
2022-08-25 11:53:16 +02:00
3844f15da0
Remove obsolete filter local settings
2022-08-25 09:52:13 +02:00
0b733ca790
[Glitch] Add ability to filter individual posts
...
Port 50487db122
2022-08-25 09:52:13 +02:00
28f0dfc0b4
[Glitch] Fix case where boolean was passed to onFilter on StatusActionBar
...
Port 66b8abf218
2022-08-25 09:52:13 +02:00
93b6ad2c6c
[Glitch] Remove dead code in WebUI filtering code
...
Port a233a9bfb5
2022-08-25 09:52:13 +02:00
bbafe28fbc
[Glitch] Fix reblogged statuses being erroneously shown as filtered
...
Port 3c24f19afe
2022-08-25 09:52:13 +02:00
a15fe32e61
[Glitch] Revamp post filtering system
...
Port front-end changes from 02851848e9
2022-08-25 09:40:45 +02:00
448ed92f76
[Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
...
Port afb8bc97d0
2022-08-25 05:16:43 +02:00
3c80b62045
[Glitch] Fix media modal link button
...
Port ba745ca99a
2022-08-25 05:14:00 +02:00
68564a622c
[Glitch] Fix action type for unfollowHashtag
...
Port 5d70a16a14
2022-08-25 05:11:55 +02:00
2d1d4210f9
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-25 05:07:39 +02:00
861b35dd54
Support "http_hidden_proxy" ENV var for hidden service only proxy ( #18427 )
...
* Support "http_hidden_proxy" ENV var for hidden service only proxy
* Fallback to http_proxy if http_hidden_proxy is not set
2022-08-25 04:41:14 +02:00
42ff4dce41
Use type="color" on badge color input field ( #18825 )
...
This informs browser to use interactive color picker
2022-08-25 04:38:34 +02:00
5d70a16a14
Fix action type for unfollowHashtag ( #18924 )
2022-08-25 04:38:01 +02:00
66b8abf218
Fix case where boolean was passed to onFilter on StatusActionBar ( #18923 )
2022-08-25 04:37:40 +02:00
03241d884e
Add option for EMAIL_DOMAIN_DENYLIST/EMAIL_DOMAIN_ALLOWLIST to apply after confirmation ( #18642 )
...
Fixes #18620
2022-08-25 04:31:10 +02:00
ba745ca99a
Fix media modal link button ( #18877 )
...
Fixes regression from #18697
2022-08-25 04:30:53 +02:00
afb8bc97d0
Fix quickly switching notification filters resulting in empty or incorrect list ( #18960 )
2022-08-25 04:29:00 +02:00
50487db122
Add ability to filter individual posts ( #18945 )
...
* Add database table for status-specific filters
* Add REST endpoints, entities and attributes
* Show status filters in /filters interface
* Perform server-side filtering for individual posts filters
* Fix filtering on context mismatch
* Refactor `toServerSideType` by moving it to its own module
* Move loupe and delete icons to their own module
* Add ability to filter individual posts from WebUI
* Replace keyword list by warnings (expired, context mismatch)
* Refactor server-side filtering code
* Add tests
2022-08-25 04:27:47 +02:00
0412a4d03e
Change e-mail domain blocks to match subdomains of blocked domains ( #18979 )
2022-08-24 19:00:55 +02:00
d83faa1a89
Add ability to block sign-ups from IP ( #19037 )
2022-08-24 19:00:37 +02:00
8a93dd3d83
[Glitch] Update notifications.js
...
Port d92ce31c92
2022-08-21 14:44:58 +02:00
0b37299775
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-21 14:39:25 +02:00
d415f1116b
Fix /admin/accounts/ order parameter ( #18996 )
2022-08-17 22:07:30 +01:00
656ac99ef0
Fix ambiguous column names in `tootctl search deploy` ( #18993 )
2022-08-17 22:07:12 +01:00
d92ce31c92
Update notifications.js ( #18977 )
2022-08-15 20:33:05 +02:00
6aa83b13ba
Properly delete remote account's avatar/header when fetch/update ( #18973 )
2022-08-15 20:32:21 +02:00
41fa50ac86
[Glitch] Add warning for sensitive audio posts
...
Port e6979aa6d4
2022-08-15 14:57:57 +02:00
e2a7a458d6
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-15 14:33:05 +02:00
aa33c7f26e
New Crowdin updates ( #18905 )
...
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Urdu (Pakistan))
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations activerecord.en.yml (Bengali)
* New translations doorkeeper.en.yml (Tamil)
* New translations devise.en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations activerecord.en.yml (Marathi)
* New translations doorkeeper.en.yml (Marathi)
* New translations devise.en.yml (Thai)
* New translations en.yml (Croatian)
* New translations simple_form.en.yml (Croatian)
* New translations en.yml (Spanish, Argentina)
* New translations devise.en.yml (Tamil)
* New translations devise.en.yml (Vietnamese)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations devise.en.yml (Galician)
* New translations doorkeeper.en.yml (Galician)
* New translations devise.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Tamil)
* New translations simple_form.en.yml (Indonesian)
* New translations devise.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations simple_form.en.yml (Persian)
* New translations activerecord.en.yml (Persian)
* New translations devise.en.yml (Persian)
* New translations doorkeeper.en.yml (Persian)
* New translations en.yml (Tamil)
* New translations simple_form.en.yml (Tamil)
* New translations activerecord.en.yml (Croatian)
* New translations devise.en.yml (Croatian)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Telugu)
* New translations doorkeeper.en.yml (Hindi)
* New translations devise.en.yml (English, United Kingdom)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations en.yml (Malay)
* New translations devise.en.yml (Hindi)
* New translations doorkeeper.en.yml (Croatian)
* New translations en.yml (Estonian)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations simple_form.en.yml (Kazakh)
* New translations activerecord.en.yml (Kazakh)
* New translations devise.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations devise.en.yml (Latvian)
* New translations doorkeeper.en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations devise.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations devise.en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations simple_form.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Breton)
* New translations en.yml (Uyghur)
* New translations simple_form.en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations devise.en.yml (Breton)
* New translations devise.en.yml (Tatar)
* New translations doorkeeper.en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations simple_form.en.yml (Malayalam)
* New translations activerecord.en.yml (Malayalam)
* New translations devise.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations simple_form.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations devise.en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations simple_form.en.yml (Kabyle)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations activerecord.en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations devise.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Kabyle)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Taigi)
* New translations simple_form.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Corsican)
* New translations en.yml (Occitan)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Occitan)
* New translations activerecord.en.yml (Occitan)
* New translations devise.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations devise.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Corsican)
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Vietnamese)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Ido)
* New translations en.yml (German)
* New translations en.yml (German)
* New translations en.json (Hebrew)
* New translations en.json (Hebrew)
* New translations en.yml (Hebrew)
* New translations activerecord.en.yml (German)
* New translations en.yml (Hebrew)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Spanish)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations activerecord.en.yml (German)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Slovak)
* New translations en.json (Finnish)
* New translations en.json (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations activerecord.en.yml (Finnish)
* New translations doorkeeper.en.yml (Finnish)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.yml (German)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Albanian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations activerecord.en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Esperanto)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-08-15 07:39:44 +09:00
e6979aa6d4
Add warning for sensitive audio posts ( #17885 )
2022-08-13 15:39:05 +02:00
3a9e3c1248
Merge branch 'main' into glitch-soc/merge-upstream
2022-08-01 17:47:02 +02:00
991349e6e2
[Glitch] Add ability to follow hashtags in web UI
2022-07-30 20:00:00 -05:00
bcb958c264
Merge remote-tracking branch 'mastodon/main' into cit/wip/follow-hashtags
2022-07-30 18:54:55 -05:00
4b36e47474
New Crowdin updates ( #18855 )
...
* New translations en.json (Hebrew)
* New translations en.json (Indonesian)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Indonesian)
* New translations en.yml (Hebrew)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Hebrew)
* New translations activerecord.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations devise.en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.json (Galician)
* New translations en.json (Punjabi)
* New translations en.json (Irish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Norwegian)
* New translations en.json (Polish)
* New translations en.json (Basque)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Icelandic)
* New translations en.json (Finnish)
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Albanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Japanese)
* New translations en.json (Dutch)
* New translations en.json (Portuguese)
* New translations en.json (Chinese Simplified)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Romanian)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Sinhala)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Indonesian)
* New translations en.json (Esperanto)
* New translations en.json (Thai)
* New translations en.json (Welsh)
* New translations en.json (Persian)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Corsican)
* New translations en.json (Malayalam)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Breton)
* New translations en.json (Tatar)
* New translations en.json (Tamil)
* New translations en.json (Kazakh)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Estonian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Uyghur)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Thai)
* New translations activerecord.en.yml (Thai)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (Greek)
* New translations en.json (Hungarian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations en.json (Polish)
* New translations en.json (Latvian)
* New translations en.json (Albanian)
* New translations simple_form.en.yml (Turkish)
* New translations activerecord.en.yml (Turkish)
* New translations en.json (Russian)
* New translations en.json (Turkish)
* New translations en.json (Portuguese)
* New translations en.json (Spanish)
* New translations en.json (Danish)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese)
* New translations en.json (Italian)
* New translations en.json (Polish)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Kabyle)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Ido)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations activerecord.en.yml (Polish)
* New translations en.json (Korean)
* New translations en.json (Spanish)
* New translations en.json (Hindi)
* New translations en.json (Vietnamese)
* New translations activerecord.en.yml (Vietnamese)
* New translations en.json (Hindi)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Esperanto)
* New translations activerecord.en.yml (French)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations activerecord.en.yml (Thai)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations activerecord.en.yml (Thai)
* New translations en.json (Thai)
* New translations activerecord.en.yml (Thai)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-07-30 22:09:18 +09:00
f174ce1048
Use slightly more margin between post buttons (under compose box) ( #1816 )
2022-07-27 19:17:15 +02:00
18346f4044
Add option to share CW toggle state across instances of a post
2022-07-25 11:57:09 +02:00
eacde1a130
Regroup CW unfolding settings in their own section
2022-07-24 17:28:47 +02:00
a5f81e1abd
Improve interaction between out-of-CW attachments and collapsed toots
2022-07-24 13:16:03 +02:00
db5b44330d
Add explanation for some options in the local settings dialog
2022-07-24 11:11:38 +02:00
3f4e27ab6f
Add local setting toggle to move media attachments outside CWs
...
Fixes #1812
2022-07-24 11:10:49 +02:00
1ceebf2710
[Glitch] Change hashtag numbers to have clearer labels in web UI
...
Port f5d8501138
2022-07-22 18:41:39 +02:00
969d805e86
[Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
...
Port d5ca204e89
2022-07-22 18:39:57 +02:00
9608e720a4
Add ability to follow hashtags in web UI ( #18862 )
2022-07-22 15:52:06 +02:00
d799fe2082
Merge branch 'main' into glitch-soc/merge-upstream
2022-07-22 09:58:35 +02:00
76ff452306
Fix unicode regression in #18809 ( #18863 )
2022-07-22 03:17:56 +02:00
f5d8501138
Change hashtag numbers to have clearer labels in web UI ( #18864 )
2022-07-22 03:17:41 +02:00
726931fe4a
Fix /api/v1/tags/:id route constraints ( #18854 )
...
The constraint was applied prior to decoding, and rejected anything containing
the '%' character, which would be used for anything with non-ASCII unicode
characters.
2022-07-20 17:06:52 +02:00
f8b3e36929
New Crowdin updates ( #18810 )
...
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations en.json (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Thai)
* New translations activerecord.en.yml (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Icelandic)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Romanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Polish)
* New translations en.yml (Esperanto)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Hungarian)
* New translations activerecord.en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Chinese Simplified)
* Run `bundle exec i18n-tasks normalize`
* Fix syntax
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-07-20 21:21:57 +09:00
d5ca204e89
Bump react-redux-loading-bar from 4.0.8 to 5.0.4 ( #18562 )
2022-07-20 20:56:44 +09:00
7205098ccf
[Glitch] Fix badge color not affected
...
Port f248d95be2
2022-07-19 16:11:40 +02:00
3a516acfc2
Merge branch 'main' into glitch-soc/merge-upstream
2022-07-19 16:08:59 +02:00
f248d95be2
Fix badge color not affected ( #18826 )
...
* Fix badge color not affected
* Generate user role css
2022-07-19 01:06:11 +02:00
ec83e2a35e
Fix missing scope for current_user in _sidebar.html.haml ( #18822 )
...
Fixes https://github.com/mastodon/mastodon/issues/18821
Fix suggested by https://miaow.gay/@meganeko/108665430982072358
2022-07-18 08:41:50 +02:00
ad489f865a
Fix custom.css html escaped ( #18824 )
2022-07-18 08:41:08 +02:00
cd87d7dcef
Merge branch 'main' into glitch-soc/merge-upstream
...
- `.env.production.sample`:
Our sample config file is very different from upstream since it is much more
complete. Upstream added documentation for a few env variables.
Copied the new variables/documentation from upstream.
- `app/lib/feed_manager.rb`:
Upstream added a timeline type (hashtags), while glitch-soc already had an
extra one (direct messages). Not really a conflict but textually close
changes.
Ported upstream's changes.
- `app/models/custom_emoji.rb`:
Upstream upped the custom emoji size limit, while glitch-soc had configurable
limits.
Upped the default limits accordingly.
- `streaming/index.js`:
Upstream reworked how hastags were normalized. Minor conflict due to
glitch-soc's handling of instance-local posts.
Ported upstream's changes.
2022-07-17 22:07:20 +02:00
c3f0621a59
Add ability to follow hashtags ( #18809 )
2022-07-17 13:49:29 +02:00
ecb3bb3256
Add support for editing labelling of one's own role ( #18812 )
...
Still disallow edition of rank or permissions
2022-07-17 13:37:30 +02:00
bbb5f1917d
New Crowdin updates ( #18781 )
...
* New translations en.json (Malayalam)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Breton)
* New translations en.json (Tatar)
* New translations en.json (Tamil)
* New translations en.json (Kazakh)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Estonian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Welsh)
* New translations en.json (Uyghur)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Slovenian)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Danish)
* New translations en.json (Polish)
* New translations en.json (Slovenian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Ido)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Danish)
* New translations activerecord.en.yml (Danish)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Latvian)
* New translations en.yml (Czech)
* New translations en.json (Czech)
* New translations en.json (Greek)
* New translations en.json (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (Korean)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Russian)
* New translations simple_form.en.yml (Hungarian)
* New translations activerecord.en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations activerecord.en.yml (Catalan)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Esperanto)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations activerecord.en.yml (Ukrainian)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Spanish)
* New translations simple_form.en.yml (Polish)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Spanish)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Korean)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.json (Sinhala)
* New translations activerecord.en.yml (Sinhala)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Hungarian)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Polish)
* New translations en.yml (Thai)
* New translations en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations activerecord.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (French)
* New translations activerecord.en.yml (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations activerecord.en.yml (French)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* New translations en.yml (Portuguese)
* New translations en.json (Vietnamese)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-07-15 10:20:58 +09:00
6ca0de9494
Fix nil error when rendering featured hashtags on profile ( #18808 )
...
Regression from #18795
2022-07-14 01:23:10 +02:00
e7aa2be828
Change how hashtags are normalized ( #18795 )
...
* Change how hashtags are normalized
* Fix tests
2022-07-13 15:03:28 +02:00
12ed2d793b
Change custom emoji file size limit from 50 KB to 256 KB ( #18788 )
2022-07-09 22:07:17 +02:00
befbac3f1c
Fix various in the user role management UI ( #18777 )
...
* Reword priority description
* Disable checkboxes for permissions you can't enable in role edition interface
* Set max priority in HTML attribute
* Explicitly link to role edition, do not link when you can't edit
* Reword priority description based on review
2022-07-07 18:18:23 +02:00
25e076505e
ip_cleanup_scheduler: Make IP and session retention configurable ( #18757 )
2022-07-07 03:14:28 +02:00
c9d6571da8
New Crowdin updates ( #18716 )
...
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Croatian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Malayalam)
* New translations en.yml (Sinhala)
* New translations en.yml (Breton)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Welsh)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Kabyle)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Finnish)
* New translations doorkeeper.en.yml (Danish)
* New translations activerecord.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations activerecord.en.yml (Greek)
* New translations doorkeeper.en.yml (Greek)
* New translations activerecord.en.yml (Frisian)
* New translations doorkeeper.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations doorkeeper.en.yml (Basque)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Czech)
* New translations activerecord.en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations doorkeeper.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations doorkeeper.en.yml (Italian)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Romanian)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (Catalan)
* New translations doorkeeper.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations doorkeeper.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations doorkeeper.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations activerecord.en.yml (Catalan)
* New translations doorkeeper.en.yml (Japanese)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Swedish)
* New translations doorkeeper.en.yml (Swedish)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations doorkeeper.en.yml (Galician)
* New translations activerecord.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Albanian)
* New translations activerecord.en.yml (Georgian)
* New translations doorkeeper.en.yml (Georgian)
* New translations activerecord.en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Dutch)
* New translations activerecord.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Norwegian)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Polish)
* New translations doorkeeper.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations doorkeeper.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations activerecord.en.yml (Persian)
* New translations doorkeeper.en.yml (Persian)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Tamil)
* New translations doorkeeper.en.yml (Hindi)
* New translations activerecord.en.yml (Hindi)
* New translations doorkeeper.en.yml (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations doorkeeper.en.yml (Estonian)
* New translations activerecord.en.yml (Estonian)
* New translations doorkeeper.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Marathi)
* New translations doorkeeper.en.yml (Marathi)
* New translations activerecord.en.yml (Thai)
* New translations doorkeeper.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations doorkeeper.en.yml (Croatian)
* New translations doorkeeper.en.yml (Malayalam)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations doorkeeper.en.yml (Kabyle)
* New translations activerecord.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Sardinian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Occitan)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations en.yml (Galician)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Galician)
* New translations en.yml (Catalan)
* New translations en.yml (Slovenian)
* New translations en.yml (Turkish)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Greek)
* New translations simple_form.en.yml (Slovenian)
* New translations activerecord.en.yml (Slovenian)
* New translations en.yml (Turkish)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Turkish)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Turkish)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Polish)
* New translations activerecord.en.yml (Icelandic)
* New translations en.json (Esperanto)
* New translations en.yml (Danish)
* New translations en.yml (Italian)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Danish)
* New translations en.yml (Italian)
* New translations simple_form.en.yml (Italian)
* New translations activerecord.en.yml (Italian)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations activerecord.en.yml (Vietnamese)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Icelandic)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Spanish)
* New translations activerecord.en.yml (Spanish)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.json (Esperanto)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Czech)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-07-07 05:58:31 +09:00
0665ba8a23
Fix incorrect param in role card link ( #18776 )
2022-07-05 20:01:50 +02:00
7527937758
Fix authorization check in domain blocks controller
2022-07-05 11:57:30 +02:00
30e7836a19
[Glitch] Add customizable user roles
...
Port front-end changes from 44b2ee3485
2022-07-05 11:35:32 +02:00
92c06a1113
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/admin/base_controller.rb`:
Minor conflict caused by glitch-soc's theming system.
- `app/javascript/mastodon/initial_state.js`:
Minor conflict caused by glitch-soc making use of max_toot_chars.
- `app/models/form/admin_settings.rb`:
Minor conflict caused by glitch-soc's theming system.
- `app/models/trends.rb`:
Minor conflict caused by glitch-soc having more granular
notification settings for trends.
- `app/views/admin/accounts/index.html.haml`:
Minor conflict caused by glitch-soc's theming system.
- `app/views/admin/instances/show.html.haml`:
Minor conflict caused by glitch-soc's theming system.
- `app/views/layouts/application.html.haml`:
Minor conflict caused by glitch-soc's theming system.
- `app/views/settings/preferences/notifications/show.html.haml`:
Minor conflict caused by glitch-soc having more granular
notification settings for trends.
- `config/navigation.rb`:
Minor conflict caused by glitch-soc having additional
navigation items for the theming system while upstream
slightly changed every line.
2022-07-05 09:33:44 +02:00
Claire