Eugen Rochko
ba969db9c8
Fix returning empty <p> tag for blank account note in REST API ( #17687 )
2022-03-03 06:45:46 +01:00
Eugen Rochko
97eaac87fa
Remove profile directory link from main navigation panel ( #17688 )
2022-03-03 06:45:30 +01:00
Claire
761df31510
[Glitch] Change visual separation of applications in authorized apps list
...
Port SCSS changes from d37c28f54c
2022-03-02 20:52:44 +01:00
Claire
3e3fc8398b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
Not really a conflict, upstream change textually too close to a glitch-soc
change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
system).
Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
Not really a conflict, upstream change textually too close to a glitch-soc
change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
system).
Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
Not really a conflict, upstream change textually too close to a glitch-soc
change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
system).
Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
Not really a conflict, upstream change textually too close to a glitch-soc
change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
system).
Ported upstream changes.
2022-03-02 20:48:27 +01:00
Claire
d37c28f54c
Change visual separation of applications in authorized apps list ( #17686 )
2022-03-02 20:28:25 +01:00
Eugen Rochko
dc23b3aeef
Add descriptions to trending features in admin UI ( #17677 )
2022-03-02 18:57:44 +01:00
Eugen Rochko
69d1a44f05
Fix leak of existence of otherwise inaccessible statuses in REST API ( #17684 )
2022-03-02 18:57:26 +01:00
Eugen Rochko
fc26ac7a98
Fix report category not being saved in REST API ( #17682 )
2022-03-02 18:57:08 +01:00
Eugen Rochko
93ba12efd6
[Glitch] Add ability to mark statuses as sensitive from reports in admin UI
...
Port SCSS changes from b25b703cce
2022-03-02 18:08:56 +01:00
Eugen Rochko
c71c6092a8
[Glitch] Change authorized applications page
...
Port SCSS changes from 4d0a2968d9
2022-03-02 18:07:57 +01:00
Claire
4795ee7f2c
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-02 18:02:48 +01:00
Eugen Rochko
b25b703cce
Add ability to mark statuses as sensitive from reports in admin UI ( #17668 )
...
* Add ability to mark statuses as sensitive from reports in admin UI
* Allow mark as sensitive action on statuses with preview cards
2022-03-01 22:20:29 +01:00
Claire
514842c9c6
Change old moderation strikes to be displayed in a separate page ( #17566 )
...
* Change old moderation strikes to be displayed in a separate page
Fixes #17552
This changes the moderation strikes displayed on `/auth/edit` to be those from
the past 3 months, and make all moderation strikes targeting the current user
available in `/disputes`.
* Add short description of what the strikes page is for
* Move link to list of strikes to “Account status” instead of navigation item
* Normalize i18n file
* Fix layout and styling of strikes link
* Revert highlights_on regexp
* Reintroduce account status summary
- this way, “Account status” is never empty
- account status is not necessarily bound to strikes, or recent strikes
2022-03-01 19:37:47 +01:00
Eugen Rochko
4d0a2968d9
Change authorized applications page ( #17656 )
...
* Change authorized applications page
* Hide revoke button for superapps and suspended accounts
* Clean up db/schema.rb
2022-03-01 16:48:58 +01:00
Eugen Rochko
2b90261718
New Crowdin updates ( #17628 )
...
* New translations en.yml (Swedish)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Turkish)
* New translations en.yml (Italian)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.yml (Finnish)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Kabyle)
* New translations en.json (Kabyle)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Greek)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations en.yml (Catalan)
* New translations en.yml (Portuguese)
* New translations en.yml (Italian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Japanese)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Italian)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Spanish)
* New translations en.yml (Thai)
* New translations en.yml (French)
* New translations en.yml (Thai)
* New translations en.yml (Indonesian)
* New translations en.yml (Danish)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.yml (German)
* New translations en.yml (Thai)
* New translations en.yml (Icelandic)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Hungarian)
* New translations en.json (Norwegian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Catalan)
* New translations en.json (Slovenian)
* New translations en.json (Persian)
* New translations en.json (Occitan)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Latvian)
* New translations en.json (Indonesian)
* New translations en.json (Tamil)
* 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 (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Hindi)
* New translations en.json (Icelandic)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Welsh)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Sinhala)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Galician)
* New translations en.json (Basque)
* New translations en.json (Polish)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Punjabi)
* New translations en.json (Portuguese)
* New translations en.json (Vietnamese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* 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 Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* 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 (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Catalan)
* New translations en.json (French)
* New translations en.json (Catalan)
* New translations en.json (French)
* New translations en.json (Albanian)
* New translations en.json (Catalan)
* New translations en.yml (Albanian)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.json (Danish)
* New translations en.json (Danish)
* New translations en.json (Icelandic)
* New translations en.json (Danish)
* New translations en.json (Italian)
* New translations en.json (Italian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Hungarian)
* New translations en.json (Ukrainian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Hungarian)
* New translations en.json (Greek)
* New translations en.json (Finnish)
* New translations en.json (Russian)
* New translations en.json (Greek)
* New translations en.json (Hungarian)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Finnish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Finnish)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Finnish)
* New translations en.json (Finnish)
* New translations en.json (Chinese Traditional)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Thai)
* New translations en.json (Turkish)
* New translations en.json (Scottish Gaelic)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Spanish)
* New translations en.json (Spanish)
* New translations en.json (Latvian)
* New translations en.json (Latvian)
* New translations en.json (Latvian)
* New translations en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Danish)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* Run `bundle exec i18n-tasks normalize`
* Fix
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-01 18:38:36 +09:00
Eugen Rochko
43721775d4
[Glitch] Fix report submit button not being disabled during submission in web UI
...
Port c49b23819b
2022-03-01 10:01:06 +01:00
Claire
d2eb561d32
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-01 09:59:18 +01:00
Eugen Rochko
00fcfa176f
Chore: Update translatable strings ( #17495 )
2022-02-28 14:14:52 +01:00
Eugen Rochko
45341c5287
Fix not showing loading indicator when searching in web UI ( #17655 )
2022-02-27 07:37:07 +01:00
Eugen Rochko
c49b23819b
Fix report submit button not being disabled during submission in web UI ( #17654 )
...
Add loading indicator for status selection step in report dialog in web UI
2022-02-27 07:37:00 +01:00
Claire
185977560c
[Glitch] Fix remote reports with comments revealing remote reporter
...
Port SCSS changes from 2d5edf2090
2022-02-26 21:17:22 +01:00
Claire
6c89abe2bb
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-26 21:15:37 +01:00
Claire
2d5edf2090
Fix remote reports with comments revealing remote reporter ( #17652 )
...
* Display username rather than display name in report comment
For consistency with report notes and appeals
* Fix remote reports with comments revealing remote reporter
* Display instance name in placeholder
* Make instance name in report comment a link to the federation admin page
* Normalize i18n file
2022-02-26 21:14:12 +01:00
Eugen Rochko
9d138baa73
Fix status updates not being forwarded like deletes through ActivityPub ( #17648 )
...
Fix #17521
2022-02-26 17:51:59 +01:00
Claire
1c6ab3aba9
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-26 17:27:17 +01:00
Claire
0b41895bbb
Fix error when a MX is shared across blocked domains ( #17650 )
2022-02-26 17:26:28 +01:00
Claire
d646f23e5d
Fix crash in EmailDomainBlockRefreshScheduler ( #17649 )
2022-02-26 16:28:28 +01:00
Claire
7ccf437aad
Add option (on by default) to allow toots with content warnings to trend
2022-02-26 10:46:26 +01:00
Claire
a3c7b8fe2e
Disable notifications for trending links and trending statuses by default
2022-02-26 10:46:26 +01:00
Claire
5fd343c72b
[Glitch] Fix media modal footer's “external link” not being a link
...
Port f75cd229f3
2022-02-26 10:29:53 +01:00
Claire
5dd7d6bc07
[Glitch] Fix reply button on media modal not giving focus to compose form
...
Port cbf951569e
2022-02-26 09:54:48 +01:00
Eugen Rochko
0979110108
[Glitch] Add trending statuses
...
Port SCSS changes from e6d2b07ec1
2022-02-26 09:50:23 +01:00
Claire
17435a8eb6
Adapt view for glitch-soc's theming system
2022-02-26 09:46:13 +01:00
Claire
8e04ac45be
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Not a real conflict, just upstream getting rid of unused constants too close
to glitch-soc-specific contents.
Removed unused constants like upstream did.
- `app/models/trends.rb`:
Conflict because glitch-soc disabled email notifications for trending links.
Upstream has refactored this quite a bit and added trending posts.
Took upstream code, but disabling the extra trending stuff will come in
another commit.
- `app/views/admin/trends/links/index.html.haml`:
Conflict due to glitch-soc's theming system.
Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
MitarashiDango
5c760fa85e
Fix unable to unpin follower-only posts ( #17647 )
2022-02-25 17:04:08 +01:00
Claire
f75cd229f3
Fix media modal footer's “external link” not being a link ( #17561 )
2022-02-25 01:20:41 +01:00
Claire
cbf951569e
Fix reply button on media modal not giving focus to compose form ( #17626 )
...
* Avoid compose form and modal management fighting for focus
* Fix reply button on media modal footer not giving focus to compose form
2022-02-25 00:51:01 +01:00
Eugen Rochko
19b4c36e40
Add explore page to web UI ( #17123 )
...
* Add explore page to web UI
* Fix not removing loaded statuses from trends on mute/block action
2022-02-25 00:34:33 +01:00
Eugen Rochko
e6d2b07ec1
Add trending statuses ( #17431 )
...
* Add trending statuses
* Fix dangling items with stale scores in localized sets
* Various fixes and improvements
- Change approve_all/reject_all to approve_accounts/reject_accounts
- Change Trends::Query methods to not mutate the original query
- Change Trends::Query#skip to offset
- Change follow recommendations to be refreshed in a transaction
* Add tests for trending statuses filtering behaviour
* Fix not applying filtering scope in controller
2022-02-25 00:34:14 +01:00
Eugen Rochko
ea5bf21a1d
Change e-mail domain blocks to block IPs dynamically ( #17635 )
...
* Change e-mail domain blocks to block IPs dynamically
* Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
* Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-24 17:28:23 +01:00
Claire
243d322e5a
Fix publish buttons styling
2022-02-23 22:04:12 +01:00
Claire
b90e5add99
[Glitch] Fix reporting from profile
...
Port 543d13ed7a
2022-02-23 21:46:46 +01:00
Claire
e8d278d3e1
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-23 21:44:09 +01:00
Claire
543d13ed7a
Fix reporting from profile ( #17632 )
...
* Fix reporting from profile
* Clean up dead code
2022-02-23 21:37:02 +01:00
Claire
b9e78f7964
Fetch relationships when opening report modal
...
Relationship with the reported account affect which actions are proposed in
the “thanks” part. Upstream fetches relationships when opening dropdown menus,
but we don't.
2022-02-23 21:12:03 +01:00
Eugen Rochko
c830291a72
[Glitch] Change report modal to include category selection in web UI
...
Port 7e91581be0
2022-02-23 20:25:55 +01:00
Claire
4df1f0e721
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-23 20:05:04 +01:00
Eugen Rochko
7e91581be0
Change report modal to include category selection in web UI ( #17565 )
...
* Change report modal to include category selection in web UI
* Various fixes and improvements
- Change thank you text to be different based on category
- Change starting headline to be different for account and status reports
- Change toggle components to have a checkmark when checked
- Fix report dialog being cut off on small screens
- Fix thank you screen offering mute or block if already muted or blocked
- Refactor toggle components in report dialog into one component
* Change wording on final screen
* Change checkboxes to be square when multiple options are possible
2022-02-23 20:03:46 +01:00
Claire
88b0cb27ec
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-23 19:43:34 +01:00
Claire
7cba68fcc6
Fix new sign-up notification not working because of incorrect type name ( #17629 )
2022-02-23 19:30:13 +01:00
Eugen Rochko
67cecd6563
[Glitch] Add notifications for new sign-ups
...
Port eef9eec5d3
2022-02-23 19:04:09 +01:00
Claire
c58e2f4775
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed the workflow a bit.
Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
Ported the upstream changes while still pushing to ghcr.
2022-02-23 18:13:12 +01:00
noiob
8a11284b42
Fix link in new hashtag notification email ( #17624 )
...
It's currently https://example.org/admin/trends/tags?pending_review=1 but should be https://example.org/admin/trends/tags?status=pending_review
2022-02-23 16:51:09 +01:00
Eugen Rochko
eef9eec5d3
Add notifications for new sign-ups ( #16953 )
2022-02-23 16:45:22 +01:00
Eugen Rochko
bbd1b979e7
New Crowdin updates ( #17593 )
...
* New translations en.json (Catalan)
* New translations en.json (Turkish)
* New translations en.json (Macedonian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Korean)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Lithuanian)
* New translations en.json (Georgian)
* New translations en.json (Slovenian)
* New translations en.json (French)
* New translations en.json (Persian)
* New translations en.json (Occitan)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Norwegian)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (Spanish)
* New translations en.json (Japanese)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Cornish)
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations en.json (Ido)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations en.json (Sardinian)
* New translations en.json (Corsican)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Serbian (Latin))
* New translations en.json (Asturian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Kannada)
* New translations en.json (Sinhala)
* New translations en.json (Marathi)
* New translations en.json (Breton)
* New translations en.json (Malayalam)
* New translations en.json (Tatar)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Uyghur)
* New translations en.json (Esperanto)
* New translations en.json (Welsh)
* New translations en.json (Telugu)
* New translations en.json (Malay)
* New translations en.json (Hindi)
* New translations en.json (Latvian)
* New translations en.json (Estonian)
* New translations en.json (Kazakh)
* New translations en.json (Croatian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Danish)
* New translations en.json (Thai)
* New translations en.yml (Thai)
* New translations en.json (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Thai)
* New translations devise.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Galician)
* New translations en.json (Greek)
* New translations en.json (Polish)
* New translations en.json (Hebrew)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Chinese Traditional)
* New translations en.yml (Russian)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Swedish)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Turkish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Albanian)
* New translations en.json (Vietnamese)
* New translations en.json (Latvian)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Italian)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Finnish)
* New translations en.json (Finnish)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Spanish)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.yml (Basque)
* New translations en.json (Ukrainian)
* New translations en.yml (Indonesian)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Russian)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.json (Hungarian)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Indonesian)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (Galician)
* New translations en.json (French)
* New translations en.json (Russian)
* New translations activerecord.en.yml (Latvian)
* New translations en.yml (French)
* New translations en.yml (French)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-23 22:13:09 +09:00
luzpaz
b97e7364f3
Fix various typos ( #17621 )
...
Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro`
2022-02-22 20:14:17 +01:00
Eugen Rochko
15d69174c0
[Glitch] Fix link colors in report and strike details
...
Port SCSS changes from 8d4b0b255a
2022-02-22 18:10:08 +01:00
Eugen Rochko
41e6b61ea2
[Glitch] Fix wrong styles on strike page
...
Port SCSS changes from 839ad9fa53
2022-02-22 18:09:39 +01:00
Claire
e7ad957447
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/media_attachment.rb`:
Upstream moved hardcoded values around, while in glitch-soc they are
configurable.
Moved them like upstream, but keeping glitch-soc's ability to configure
them through env vars.
2022-02-22 18:06:29 +01:00
Claire
f499f086a9
Fix some media attachments being converted with too high framerates ( #17619 )
...
Video files with variable framerates are converted to constant framerate videos
and the output framerate picked by ffmpeg is based on the original file's
container framerate (which can be different from the average framerate).
This means that an input video with variable framerate with about 30 frames per
second on average, but a maximum of 120 fps will be converted to a constant 120
fps file, which won't be processed by other Mastodon servers.
This commit changes it so that input files with VFR and a maximum framerate
above the framerate threshold are converted to VFR files with the maximum frame
rate enforced.
2022-02-22 17:11:22 +01:00
Eugen Rochko
8d4b0b255a
Fix link colors in report and strike details ( #17616 )
2022-02-22 15:27:25 +01:00
Eugen Rochko
0fbd040aa8
Add caching layer to metrics ( #17617 )
2022-02-22 15:27:08 +01:00
Eugen Rochko
839ad9fa53
Fix wrong styles on strike page ( #17615 )
2022-02-22 06:20:04 +01:00
Claire
ddf6fa684b
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-19 11:33:18 +01:00
dependabot[bot]
823d816c06
Bump pundit from 2.1.1 to 2.2.0 ( #17543 )
...
* Bump pundit from 2.1.1 to 2.2.0
Bumps [pundit](https://github.com/varvet/pundit ) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/main/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/compare/v2.1.1...v2.2.0 )
---
updated-dependencies:
- dependency-name: pundit
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* `include Pundit` is deprecated
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-19 13:30:06 +09:00
Eugen Rochko
2bf51dc42c
New Crowdin updates ( #17514 )
...
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Japanese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Indonesian)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Hebrew)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.yml (German)
* New translations en.yml (Polish)
* New translations en.yml (Turkish)
* New translations en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.yml (Polish)
* New translations en.yml (Turkish)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Swedish)
* New translations en.yml (Swedish)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Polish)
* New translations en.json (Polish)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Russian)
* New translations en.yml (Albanian)
* New translations en.yml (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations en.yml (Icelandic)
* New translations en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Italian)
* New translations en.yml (Italian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Spanish)
* New translations en.yml (Thai)
* New translations en.yml (Spanish)
* New translations en.yml (Thai)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Malay)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Galician)
* New translations en.yml (Hungarian)
* New translations en.yml (Galician)
* New translations en.yml (Catalan)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.yml (Breton)
* New translations en.json (Breton)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Portuguese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Albanian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Italian)
* New translations en.yml (French)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Turkish)
* New translations en.yml (Latvian)
* New translations en.yml (Latvian)
* New translations en.json (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* New translations en.yml (Indonesian)
* New translations en.yml (Galician)
* New translations en.yml (Galician)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* Ran `yarn manage:translations`
* Ran `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-19 13:20:00 +09:00
Eugen Rochko
e3d08a9e28
Change global locale param to lang to avoid conflicts ( #17592 )
2022-02-19 03:12:28 +01:00
helloworldstack
22f110a892
Fix sign in token and warning emails failed to send in some cases ( #17589 )
2022-02-18 20:43:42 +01:00
Claire
bd4fb02bfb
[Glitch] Fix opening the emoji picker scrolling the single-column view to the top
...
Port 5b5b9deebd
2022-02-17 11:05:47 +01:00
Claire
a564a06739
[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden
...
Port ab98d2e539
2022-02-17 11:04:13 +01:00
Claire
5718a2e280
Fix issue with glitch-soc's theming system
2022-02-17 10:59:01 +01:00
Eugen Rochko
394042c91b
[Glitch] Add appeals
...
Port SCSS changes from 82f8d19424
2022-02-17 10:58:57 +01:00
Eugen Rochko
cdd0af5a1c
[Glitch] Fix privacy policy link not being visible on small screens
...
Port 77529aba86
2022-02-17 10:58:53 +01:00
Claire
175446f293
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Conflict due to glitch-soc adding the `content_type` column on status edits
and thus having a different schema version number.
Solved by taking upstream's schema version number, as it is higher than
glitch-soc's.
2022-02-17 10:58:44 +01:00
Claire
49e1162a30
Fix issues when attempting to appeal an old strike ( #17554 )
...
* Display an error when an appeal could not be submitted
* Do not offer users to appeal old strikes
* Fix 500 error when trying to appeal a strike that is too old
* Avoid using an extra translatable string
2022-02-16 22:29:48 +01:00
Claire
5b5b9deebd
Fix opening the emoji picker scrolling the single-column view to the top ( #17579 )
...
Fixes #17577
2022-02-16 21:44:47 +01:00
Claire
ab98d2e539
Fix edge case where settings/admin page sidebar would be incorrectly hidden ( #17580 )
2022-02-16 21:44:19 +01:00
Claire
3b266118a8
Fix toggling sidebar on mobile in admin pages
2022-02-16 16:33:23 +01:00
Claire
efb2377148
Change relays handling to not record boosts ( #17571 )
...
* Change relays handling to not record boosts
* Update tests
2022-02-16 14:36:44 +01:00
Claire
4d49bb4b52
Fix performance of server-side filtering ( #17575 )
...
Fixes #17567
2022-02-16 14:28:45 +01:00
Claire
488c4e1712
Change dasbhoard links for “new users” and “active users” ( #17570 )
...
Make them filter for local accounts by default
2022-02-16 13:17:28 +01:00
Eugen Rochko
82f8d19424
Add appeals ( #17364 )
...
* Add appeals
* Add ability to reject appeals and ability to browse pending appeals in admin UI
* Add strikes to account page in settings
* Various fixes and improvements
- Add separate notification setting for appeals, separate from reports
- Fix style of links in report/strike header
- Change approving an appeal to not restore statuses (due to federation complexities)
- Change style of successfully appealed strikes on account settings page
- Change account settings page to only show unappealed or recently appealed strikes
* Change appealed_at to overruled_at
* Fix missing method error
2022-02-14 21:27:53 +01:00
Jeong Arm
0ad6f982af
Fix admin statuses page order with media ( #17538 )
2022-02-14 16:07:04 +01:00
Jeong Arm
cf8fee1379
Add from: query operator to search syntax ( #16526 )
...
* Add 'by:userhandle' parameter to search api
* Use search syntax for "by" prefix
* Codeclimate
* Use 'from' instead of 'by'
2022-02-14 00:17:09 +01:00
Eugen Rochko
77529aba86
Fix privacy policy link not being visible on small screens ( #17533 )
...
Fix #17482
2022-02-13 02:52:34 +01:00
Eugen Rochko
518ac93f00
Fix duplicate accounts when searching by IP range in admin UI ( #17524 )
2022-02-13 01:58:26 +01:00
Claire
3ff513bd3b
[Glitch] Fix controls for unchangeable properties on status edit not being disabled
...
Port d10eb06cb4
2022-02-12 22:36:39 +01:00
Claire
56442ee90a
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-12 21:36:33 +01:00
Holly
45309f7748
Make the settings button go to settings when opened in a new tab
2022-02-12 20:12:29 +01:00
Claire
e806b2325e
Fix empty batch statuses selection causing a 500 error ( #17532 )
...
* Fix empty batch statuses selection causing a 500 error
* Simplify current_params
2022-02-12 19:52:17 +01:00
Claire
d10eb06cb4
Fix controls for unchangeable properties on status edit not being disabled ( #17531 )
...
Fixes #17520
2022-02-12 19:00:33 +01:00
Claire
89e2e403ce
Fix attempts at distributing Update activities for local-only posts
2022-02-12 15:41:18 +01:00
Eugen Rochko
1c420fca57
[Glitch] Fix layout of the report page on smaller screens in admin UI
...
Port f53e4c250e
2022-02-12 13:15:07 +01:00
Eugen Rochko
e5e6857bd7
[Glitch] Add notifications when a reblogged status has been updated
...
Port front-end changes from 8ffc48ebfa
2022-02-12 13:15:07 +01:00
Claire
7c32406859
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-12 11:12:41 +01:00
Eugen Rochko
f53e4c250e
Fix layout of the report page on smaller screens in admin UI ( #17523 )
...
Fix #17491
2022-02-12 01:08:23 +01:00
Claire
6ec8ae5723
Fix missing javascript in some admin pages
2022-02-12 00:10:28 +01:00
Claire
2846bfddc2
Add support for multiple source files per pack
2022-02-12 00:10:28 +01:00
Jeong Arm
63c1a70f35
Enable domain purge button on suspended domains too ( #17209 )
...
* Enable domain purge button on suspended domains too
* Change unless to if
2022-02-11 22:23:19 +01:00
Eugen Rochko
8ffc48ebfa
Add notifications when a reblogged status has been updated ( #17404 )
...
* Add notifications when a reblogged status has been updated
* Change wording to say "edit" instead of "update" and add missing controls
* Replace previous update notifications with the most up-to-date one
2022-02-11 22:20:19 +01:00
Eugen Rochko
b8f957e5f7
[Glitch] Change actions in reports to require only one click
...
Port SCSS changes from 9b42aad433
2022-02-11 21:56:27 +01:00
Claire
e9a7485dcc
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-11 21:53:20 +01:00
Eugen Rochko
9b42aad433
Change actions in reports to require only one click ( #17487 )
2022-02-11 21:51:57 +01:00
Eugen Rochko
51573dfbc9
Change reblogs to not count towards hashtag trends anymore ( #17501 )
2022-02-11 21:16:23 +01:00
Eugen Rochko
e331119201
Fix deletes not being signed in authorized fetch mode ( #17484 )
...
Fix #17483
2022-02-11 14:52:45 +01:00
Claire
2e551a9c6e
Fix Undo Announce sometimes inlining the originally Announced status ( #17516 )
...
* Change tests to have more specific expectations on sent ActivityPub payloads
* Check that payload doesn't actually contain the contents of the boosted toot
* Fix Undo Announce sometimes inlining the originally Announced status
2022-02-11 14:52:07 +01:00
Eugen Rochko
84bd87e444
New Crowdin updates ( #16858 )
...
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations activerecord.en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* Ran `i18n-tasks normalize`
* Ran `yarn manage:translations`
* Add space
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-11 04:50:27 +01:00
Eugen Rochko
9e57680f64
[Glitch] Chore: Disable menu items for editing statuses in web UI ( #17497 )
...
Port 64a94a889b
2022-02-10 19:10:59 +01:00
Eugen Rochko
838f800808
[Glitch] Add editing for published statuses
...
Port cb76142d9e
2022-02-10 19:10:20 +01:00
Claire
d377c690a4
Add ability to change content-type when editing a toot
...
Content-type defaults to edited toot's content-type to avoid surprising
behaviors when using clients that do not support this feature.
2022-02-10 19:10:14 +01:00
Claire
b7882a75d2
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream moved things around in a place where glitch-soc had support for
an extra parameter (`content_type`).
Follow upstream but reintroduce `content_type`.
2022-02-10 19:09:27 +01:00
Eugen Rochko
64a94a889b
Chore: Disable menu items for editing statuses in web UI ( #17497 )
...
Feature must be unlocked in a separate release for max. compatibility
2022-02-10 15:28:53 +01:00
Claire
c6de53c1a9
Fix NoMethodError in StatusUpdateDistributionWorker ( #17499 )
...
* Add tests
* Fix NoMethodError in StatusUpdateDistributionWorker
* Fix tests
2022-02-10 14:57:10 +01:00
Claire
2e7bc0fbf5
Fix poll votes not being properly reset on poll change ( #17498 )
...
* Fix poll votes not being properly reset on poll change
* Fix and add tests
* Fix poll update handling when the number of options changes
2022-02-10 14:26:54 +01:00
Eugen Rochko
6dfda3670f
Fix outdated iso-639 reference in update status service ( #17496 )
2022-02-10 03:09:44 +01:00
Eugen Rochko
cb76142d9e
Add editing for published statuses ( #17320 )
...
* Add editing for published statuses
* Fix change of multiple-choice boolean in poll not resetting votes
* Remove the ability to update existing media attachments for now
2022-02-10 00:15:30 +01:00
Eugen Rochko
2c9def57b3
Add category and rule_ids params to POST /api/v1/reports ( #17492 )
2022-02-10 00:10:16 +01:00
Claire
c3725e1e19
Add content_type to status_edits
2022-02-09 18:02:31 +01:00
Eugen Rochko
4ffee8156d
[Glitch] Add edit history to web UI
...
Port 948da1a958
2022-02-09 17:51:35 +01:00
Claire
0845bee8d6
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream renamed some helper functions that were used in a part of the
settings page which glitch-soc slightly changed the layout of.
Ported the change.
2022-02-09 17:28:33 +01:00
Claire
e689495a81
Please Codeclimate
2022-02-09 17:15:36 +01:00
Claire
1af75ba990
Rework actions modal to bring it closer to upstream and fix modal stacking issue
2022-02-09 16:40:23 +01:00
Claire
d92bd7c906
Remove unused noModal prop
2022-02-09 16:40:23 +01:00
Claire
952342d251
Some more refactoring
2022-02-09 16:40:23 +01:00
Claire
f14193d3f4
Refactor dropdown and action modal code slightly
...
Simplify it a bit and make it closer to upstream
2022-02-09 13:23:12 +01:00
Eugen Rochko
6732217dd0
Change languages to be listed under standard instead of native name in admin UI ( #17485 )
2022-02-09 04:15:38 +01:00
Eugen Rochko
948da1a958
Add edit history to web UI ( #17390 )
...
* Add edit history to web UI
* Change history reducer to store items per status
* Fix missing loading prop
2022-02-09 01:17:07 +01:00
Eugen Rochko
b0021ca3d5
Fix error in suggestions API due to typo ( #17486 )
...
Regression from #17479
2022-02-08 22:23:04 +01:00
Claire
bab90c9e1b
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-08 18:23:53 +01:00
Eugen Rochko
a44cc7931a
Remove language detection through cld3 ( #17478 )
...
* Remove language detection through cld3
* Update app/helpers/languages_helper.rb
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-02-08 02:41:17 +01:00
Eugen Rochko
1e5989c612
Add global locale param ( #17464 )
...
- Remove the session-based locale stickyness
2022-02-08 02:34:56 +01:00
Eugen Rochko
d979087a98
Fix localization of cold-start follow recommendations ( #17479 )
2022-02-08 01:53:49 +01:00
Claire
edd7dad3e2
Fix Ruby 2.5 incompatibility ( #17465 )
2022-02-07 19:57:06 +01:00
Eugen Rochko
73a585dd64
Fix structured data parsing from links choking on bad data ( #17403 )
...
* Fix structured data parsing from links choking on bad data
- Fix og:url meta tag being prioritized over canonical link tag
- Fix structured data parsing choking on commented-out CDATA declarations
- Fix HTML entities in title, description, provider_name, author_name
- Change structured data parsing to attempt every JSON-LD script tag
* Remove unnecessary slash escapes from CDATA regex pattern
2022-02-07 18:16:31 +01:00
Claire
42fdf52f0c
Fix replies collection incorrectly looping ( #17462 )
...
* Refactor tests
* Add tests
* Fix replies collection incorrectly looping
2022-02-07 17:06:43 +01:00
Claire
621d92114d
Fix errors when multiple Delete are received for a given actor ( #17460 )
2022-02-07 13:14:48 +01:00
Claire
aaace9f1db
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CHANGELOG.md`:
Upstream added newlines.
Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
last security update.
Took upstream's version.
- `app/helpers/context_helper.rb`:
Conflicts because of extra vocabulary in glitch-soc. The conflicts were
actually handled in last security merge.
Kept our version.
2022-02-06 15:34:42 +01:00
Claire
5d53b3c8a7
Fix instance actor not being dereferenceable ( #17457 )
...
* Add tests
* Fix instance actor not being dereferenceable
* Fix tests
* Fix tests for real
2022-02-06 15:31:03 +01:00
Claire
c94ff7c869
Move glitch-soc-specific theming methods to ThemingConcern
2022-02-05 10:58:51 +01:00
Claire
4944068bd0
Make theme-selection fall back to default ones if configured is not found
2022-02-05 10:29:27 +01:00
Eugen Rochko
25d1195a04
Fix error on account relationships page in admin UI ( #17444 )
2022-02-05 05:06:34 +01:00
Claire
b3190c2cd6
Fix compacted JSON-LD possibly causing compatibility issues on forwarding ( #17428 )
2022-02-03 14:09:04 +01:00
Claire
ec8cf0e39b
Fix response_to_recipient? CTE ( #17427 )
2022-02-03 14:07:43 +01:00
Claire
b891d09d2f
Compact JSON-LD signed incoming activities ( #17426 )
...
Co-authored-by: Puck Meerburg <puck@puck.moe>
2022-02-03 14:07:29 +01:00
Claire
eee2c187ee
Fix response_to_recipient? CTE
2022-02-02 19:55:57 +01:00
Claire
77cc434f2b
Fix compacted JSON-LD possibly causing compatibility issues on forwarding
2022-02-02 19:55:57 +01:00
Puck Meerburg
9d92e9204f
Compact JSON-LD signed incoming activities
2022-02-02 16:13:11 +01:00
Claire
2341754c70
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-01 20:59:28 +01:00
Claire
2657ca3b5e
Fix requiring an extra restart after recent post-deployment migrations ( #17422 )
...
Follow-up to #16409
2022-02-01 20:57:39 +01:00
Claire
a2bc2e14c6
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-30 22:33:30 +01:00
Claire
8919f6cf63
Change public profile pages to be disabled for unconfirmed users ( #17385 )
...
Fixes #17382
Note that unconfirmed and unapproved accounts can still be searched for
and their (empty) account retrieved using the REST API.
2022-01-28 14:24:37 +01:00
Claire
de596a03c0
Fix Sidekiq warning when pushing DMs to direct timeline
2022-01-28 09:07:56 +01:00
Claire
daab277c0e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Upstream-updated lib textually too close to glitch-soc-only dep.
Updated like upstream.
2022-01-28 08:58:32 +01:00
Claire
33ea1c9008
Fix Sidekiq warnings about JSON serialization ( #17381 )
...
* Fix Sidekiq warnings about JSON serialization
This occurs on every symbol argument we pass, and every symbol key in hashes,
because Sidekiq expects strings instead.
See https://github.com/mperham/sidekiq/pull/5071
We do not need to change how workers parse their arguments because this has
not changed and we were already converting to symbols adequately or using
`with_indifferent_access`.
* Set Sidekiq to raise on unsafe arguments in test mode
In order to more easily catch issues that would produce warnings in production
code.
2022-01-28 00:43:56 +01:00
Claire
56a49e9334
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream changed a header but we had different default headers.
Applied the same change, and also dropped HSTS headers redundant with
Rails'.
2022-01-26 22:32:21 +01:00
Claire
6e8d231e27
Fix local distribution of edited statuses ( #17380 )
...
Because `FanOutOnWriteService#update?` was broken, edits were considered as new
toots and a regular `update` payload was sent.
2022-01-26 20:53:50 +01:00
Eugen Rochko
b6364cf1ad
Fix poll updates being saved as status edits ( #17373 )
...
Fix #17344
2022-01-26 18:05:39 +01:00
Claire
599b27788a
Add some explanation text on the CAPTCHA confirmation page
2022-01-26 13:24:51 +01:00
Claire
ea32eb89e1
Change CAPTCHA handling to be only on email verification
...
This simplifies the implementation considerably, and while not providing
ideal UX, it's the most flexible approach.
2022-01-25 23:56:57 +01:00
Claire
6988e6ecc3
Add ability to set hCaptcha either on registration form or on e-mail validation
...
Upshot of CAPTCHA on e-mail validation is it does not need to break the in-band
registration API.
2022-01-25 23:09:48 +01:00
Claire
a9faba63f1
Disable registrations flag in /api/v1/instance when CAPTCHA is enabled
...
This is to avoid apps trying and failing at using the registrations API,
which does not let us require a CAPTCHA and cannot be clearly signaled as
unavailable.
2022-01-25 13:58:24 +01:00
Claire
2d4faa5cfd
Disable captcha if registrations are disabled for various reasons
2022-01-24 22:12:57 +01:00
Claire
c209cf5a09
Renew Rails session ID on successful registration
2022-01-24 22:01:05 +01:00
Claire
d36eb0503f
Please CodeClimate
2022-01-24 21:29:50 +01:00
Claire
5c88cb1a67
Add optional hCaptcha support
...
Fixes #1649
This requires setting `HCAPTCHA_SECRET_KEY` and `HCAPTCHA_SITE_KEY`, then
enabling the admin setting at
`/admin/settings/edit#form_admin_settings_captcha_enabled`
Subsequently, a hCaptcha widget will be displayed on `/about` and
`/auth/sign_up` unless:
- the user is already signed-up already
- the user has used an invite link
- the user has already solved the captcha (and registration failed for another
reason)
The Content-Security-Policy headers are altered automatically to allow the
third-party hCaptcha scripts on `/about` and `/auth/sign_up` following the same
rules as above.
2022-01-24 21:22:13 +01:00
Claire
d045ba2add
Fix link_to_login argument handling when a block is passed ( #17345 )
2022-01-24 03:29:03 +01:00
Claire
73eeb58f10
[Glitch] Change percent to rate in retention metrics API
...
Port 41d64ee271
2022-01-23 18:24:40 +01:00
Claire
1800e05513
[Glitch] Fix text being incorrectly pre-selected in composer textarea on /share
...
Port 335049cc33
2022-01-23 18:24:34 +01:00
Claire
67028c4779
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/models/status_spec.rb`:
Upstream added tests too close to glitch-soc-specific tests.
Kept both tests.
2022-01-23 18:24:01 +01:00
Claire
e92ac5b769
Fix error-prone SQL queries ( #15828 )
...
* Fix error-prone SQL queries in Account search
While this code seems to not present an actual vulnerability, one could
easily be introduced by mistake due to how the query is built.
This PR parameterises the `to_tsquery` input to make the query more robust.
* Harden code for Status#tagged_with_all and Status#tagged_with_none
Those two scopes aren't used in a way that could be vulnerable to an SQL
injection, but keeping them unchanged might be a hazard.
* Remove unneeded spaces surrounding tsquery term
* Please CodeClimate
* Move advanced_search_for SQL template to its own function
This avoids one level of indentation while making clearer that the SQL template
isn't build from all the dynamic parameters of advanced_search_for.
* Add tests covering tagged_with, tagged_with_all and tagged_with_none
* Rewrite tagged_with_none to avoid multiple joins and make it more robust
* Remove obsolete brakeman warnings
* Revert "Remove unneeded spaces surrounding tsquery term"
The two queries are not strictly equivalent.
This reverts commit 86f16c537e06c6ba4a8b250f25dcce9f049023ff.
2022-01-23 18:10:10 +01:00
Claire
41d64ee271
Change percent to rate in retention metrics API ( #16910 )
2022-01-23 16:01:25 +01:00
Claire
06f653972a
Add OMNIAUTH_ONLY environment variable to enforce externa log-in ( #17288 )
...
* Remove support for OAUTH_REDIRECT_AT_SIGN_IN
Fixes #15959
Introduced in #6540 , OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form
to instead redirect to the external OmniAuth login provider.
However, it did not prevent the log-in form on /about introduced by #10232 from
appearing, and completely broke with the introduction of #15228 .
As I restoring that previous log-in flow without introducing a security
vulnerability may require extensive care and knowledge of how OmniAuth works,
this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time
being.
* Add OMNIAUTH_ONLY environment variable to enforce external log-in only
* Disable user registration when OMNIAUTH_ONLY is set to true
* Replace log-in links When OMNIAUTH_ONLY is set with exactly one OmniAuth provider
2022-01-23 15:52:58 +01:00
Claire
12bb24ea35
Remove support for OAUTH_REDIRECT_AT_SIGN_IN ( #17287 )
...
Fixes #15959
Introduced in #6540 , OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form
to instead redirect to the external OmniAuth login provider.
However, it did not prevent the log-in form on /about introduced by #10232 from
appearing, and completely broke with the introduction of #15228 .
As I restoring that previous log-in flow without introducing a security
vulnerability may require extensive care and knowledge of how OmniAuth works,
this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time
being.
2022-01-23 15:50:41 +01:00
Claire
8114f4208f
Remove leftover database columns from Devise::Models::Rememberable ( #17191 )
...
* Remove leftover database columns from Devise::Models::Rememberable
* Update fix-duplication maintenance script
* Improve errors/warnings in the fix-duplicates maintenance script
2022-01-23 15:46:30 +01:00
Claire
335049cc33
Fix text being incorrectly pre-selected in composer textarea on /share ( #17339 )
...
Fixes #17295
2022-01-20 20:56:21 +01:00
Claire
68a9057420
Add post edited notice in admin and public UIs ( #17335 )
...
* Add edited toot flag on public pages
* Add toot edit flag to admin pages
2022-01-20 13:37:31 +01:00
Claire
458f232d21
Add content-type to status source in glitch-soc
2022-01-20 00:03:44 +01:00
Eugen Rochko
cb8ec71677
[Glitch] Add support for editing for published statuses
...
Port front-end changes from 06b698a723
2022-01-20 00:03:41 +01:00
Claire
01e495563e
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-19 23:52:53 +01:00
Claire
686eaacbc8
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/activity/create.rb`:
Upstream refactored how `Create` activities are handled and how values are
extracted from `Create`d objects. This conflicted with how glitch-soc
supported the `directMessage` flag to explicitly distinguish between
limited and direct messages.
Ported glitch-soc's changes to latest upstream changes.
- `app/services/fan_out_on_write_service.rb`:
Upstream largely refactored that file and changed some of the logic.
This conflicted with glitch-soc's handling of the direct timeline and
the options to allow replies and boosts in public feeds.
Ported those glitch-soc changes on top of latest upstream changes.
- `app/services/process_mentions_service.rb`:
Upstream refactored to move mention-related ActivityPub deliveries to
`ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check
to not send local-only toots to remote mentioned users.
Took upstream's version, as the check is not needed anymore, since it is
performed at the `ActivityPub::DeliveryWorker` call site already.
- `app/workers/feed_insert_worker.rb`:
Upstream added support for `update` toot events, while glitch-soc had
support for an extra timeline support, `direct`.
Ported upstream changes and extended them to the `direct` timeline.
Additional changes:
- `app/lib/activitypub/parser/status_parser.rb`:
Added code to handle the `directMessage` flag and take it into account
to compute visibility.
- `app/lib/feed_manager.rb`:
Extended upstream's support of `update` toot events to glitch-soc's
`direct` timeline.
2022-01-19 23:52:48 +01:00
Eugen Rochko
a427958026
Fix error when using raw distribution worker ( #17334 )
...
Regression from #16697
2022-01-19 23:05:59 +01:00
Eugen Rochko
bfbfbf5032
Fix error when processing poll updates ( #17333 )
...
Regression from #16697
2022-01-19 22:50:01 +01:00
Eugen Rochko
06b698a723
Add support for editing for published statuses ( #16697 )
...
* Add support for editing for published statuses
* Fix references to stripped-out code
* Various fixes and improvements
* Further fixes and improvements
* Fix updates being potentially sent to unauthorized recipients
* Various fixes and improvements
* Fix wrong words in test
* Fix notifying accounts that were tagged but were not in the audience
* Fix mistake
2022-01-19 22:37:27 +01:00
Claire
6ae170697a
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-19 14:22:59 +01:00
Claire
ad5fd97277
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-19 12:32:44 +01:00
Jeong Arm
be15674215
Fix NameError on ActivityPub::FetchFeaturedCollectionService ( #17326 )
...
Related: #16954
2022-01-19 04:08:46 +01:00
Claire
8904dac905
Merge pull request #1660 from ClearlyClaire/glitch-soc/features/themes-multiple-packs
...
Refactor glitch-soc's theme handling
2022-01-18 00:18:07 +01:00
Claire
5d38a8573c
Please CodeClimate
2022-01-17 13:06:06 +01:00
Claire
a250aefe77
Move controller theming code to concern
2022-01-17 12:50:52 +01:00
Claire
833a5e4e52
Fix pinned attribute not being set for private self-posts ( #17304 )
2022-01-17 11:59:46 +01:00
Eugen Rochko
a5cb48879d
[Glitch] Add notifications for statuses deleted by moderators
...
Port front-end changes from 2fb76550a9
2022-01-17 11:19:44 +01:00
Claire
485cf5c0c1
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/reports/show.html.haml`:
Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
Claire
a10833e909
Fix pinned attribute not being set for private self-posts
2022-01-17 09:52:19 +01:00
Eugen Rochko
2fb76550a9
Add notifications for statuses deleted by moderators ( #17204 )
2022-01-17 09:41:33 +01:00
Claire
b20dafb566
[Glitch] Add support for private pinned posts
...
Port JS changes from 5aade2baac
2022-01-17 08:35:27 +01:00
Claire
de7f936b96
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Upstream introduced support for private pinned toots, but glitch-soc's query
was a bit different as it filtered out local-only toots.
Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
Not a real conflict, but the line below was different in glitch-soc due to
the configurable pinned toots limit.
2022-01-17 08:28:52 +01:00
Claire
5aade2baac
Add support for private pinned posts ( #16954 )
...
* Add support for private pinned toots
* Allow local user to pin private toots
* Change wording to avoid "direct message"
2022-01-17 00:49:55 +01:00
Claire
21828806b3
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-16 22:29:05 +01:00
Claire
91c1fbf714
Fix missing media: 'all' on default skins
2022-01-16 22:26:18 +01:00
Claire
a3a9d4d789
Refactor theming HAML template a bit
2022-01-16 22:26:18 +01:00
Claire
c8973773bc
Refactor theme config loading
2022-01-16 22:26:18 +01:00
Claire
37dadd4512
Refactor some more
2022-01-16 22:26:18 +01:00
Claire
10bef4493c
Refactor glitch-soc's theme handling
2022-01-16 22:12:11 +01:00
Claire
928890bd38
Fix admin interface crash when displaying deleted user ( #17301 )
2022-01-16 20:57:37 +01:00
Jeong Arm
923eda5cd5
[Glitch] Gradually increase retry waiting for media processing
...
Port 52b05dad34
2022-01-16 18:14:33 +01:00
Claire
577c74d422
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added some text, but our README is completely different.
Kept our README unchanged.
2022-01-16 18:11:20 +01:00
Eugen Rochko
7b3972c270
Remove IP tracking columns from users table ( #16409 )
2022-01-16 13:23:50 +01:00
Jeong Arm
52b05dad34
Gradually increase retry waiting for media processing ( #17271 )
2022-01-10 14:25:08 +01:00
Claire
817072e9c7
[Glitch] Fix media descriptions not being used for client-side filtering
...
Port 651e997a98
2022-01-07 19:54:58 +01:00
Claire
338c47b6c6
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-07 19:51:47 +01:00
Jeong Arm
db10cd8d15
Remove custom emojis on domain purge ( #17210 )
2021-12-30 08:41:09 +01:00
Claire
651e997a98
Fix media descriptions not being used for client-side filtering ( #17206 )
...
Fix oversight in #13837
2021-12-28 23:25:50 +01:00
Rens Groothuijsen
5baeb90bd4
[Glitch] Fix tag rendering error in hashtag column settings
...
Port 9d43863426
2021-12-27 15:22:12 +01:00
Claire
2136aa2759
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
We have completely different contents. Kept our version.
- `package.json`:
Not a real conflict, just an upstream dependency udpated
textually too close to a glitch-soc-only dependency.
Updated dependencies like upstream.
- `streaming/index.js`:
Conflict due to code style changes on parts that were
modified in glitch-soc to handle local-only toots.
Changed style according to upstream.
2021-12-27 15:16:18 +01:00
Eugen Rochko
9a8784829f
Fix warnings on Rails boot ( #16946 )
2021-12-27 00:47:20 +01:00
Rens Groothuijsen
9d43863426
Fix tag rendering error in hashtag column settings ( #17184 )
...
* Flatten tags in configuration to regular array before converting to JSON
* Render filter tags using toJS instead of toJSON
2021-12-26 19:22:05 +01:00
Jeong Arm
ba93eb818b
Fix duplicate record on admin/accounts when searching with IP ( #17150 )
2021-12-21 00:17:14 +01:00
Claire
77e23e2005
[Glitch] Change title of retention chart
...
Port 36347cf494
2021-12-18 11:47:54 +01:00
Claire
65987b3956
Merge branch 'main' into glitch-soc/merge-upstream
2021-12-18 11:44:54 +01:00
Claire
d8da1689c1
Add ability for admins to delete canonical email blocks ( #16644 )
...
* Add admin option to remove canonical email blocks from a deleted account
* Add tootctl canonical_email_blocks to inspect and remove canonical email blocks
2021-12-17 23:02:14 +01:00
Claire
44c8b6ff2f
Add ability to purge undeliverable domains from admin interface ( #16686 )
...
* Add ability to purge undeliverable domains from admin interface
* Add tests
2021-12-17 23:01:21 +01:00
Claire
36347cf494
Change title of retention chart ( #16909 )
...
Changes from “Retention” to “User retention rate by month after sign-up”.
This should make it much clearer to people not familiar with retention charts
what it actually means.
2021-12-17 23:00:41 +01:00
Claire
1e34cfabdd
Change list title input styling ( #17092 )
2021-12-17 23:00:05 +01:00
David Sterry
8962f00ec8
[Glitch] ignore hashtag suggestions if they vary only in case
...
Port 65ee707755
2021-12-16 16:48:42 +01:00
Rens Groothuijsen
a5d9a408e3
[Glitch] Show correct error message if chosen password is too long
...
Port 8143d127a4
2021-12-16 16:26:04 +01:00
Eugen Rochko
ee4be446b6
[Glitch] Add batch suspend for accounts in admin UI
...
Port SCSS changes from 65ee707755
2021-12-16 16:25:21 +01:00
Claire
179f1d3a78
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
Removed upstream, while it had glitch-soc-specific changes to accomodate
for glitch-soc's theming system.
Removed the file.
Additional changes:
- `app/views/admin/accounts/index.html.haml':
Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
David Sterry
65ee707755
ignore hashtag suggestions if they vary only in case ( #16460 )
...
* ignore hashtag suggestions if they vary only in case
* remove console.logs and unused args
* consistently add space when dismissing suggestions
* linting
2021-12-15 23:47:19 +01:00
Takeshi Umeda
794d9d267d
Fix follow recommendation biased towards older accounts ( #17126 )
2021-12-13 23:21:14 +01:00
Eugen Rochko
2c6be5dc9a
Change trending hashtags threshold back from 15 to 5 ( #17122 )
2021-12-13 05:32:29 +01:00
heguro
2b292c44bc
Fix redirection when succeeded WebAuthn ( #17098 )
2021-12-05 21:50:12 +01:00
Rens Groothuijsen
8143d127a4
Show correct error message if chosen password is too long ( #17082 )
...
* Add correct error message for exceeding max length on password confirmation field
* Code style fixes
2021-12-05 21:49:50 +01:00
Eugen Rochko
7bf5924339
Add batch suspend for accounts in admin UI ( #17009 )
2021-12-05 21:48:39 +01:00
Claire
4359fa92da
Fix unneeded outline around list name edition input
2021-12-03 21:03:40 +01:00
Claire
efeabec5eb
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-30 12:13:54 +01:00
Eugen Rochko
f3966223bd
Fix error on trending mailer due to missing constant ( #17072 )
2021-11-29 17:39:40 +01:00
Jeong Arm
cb22372cd7
Fix server graph on admin/tags/:id ( #17066 )
2021-11-28 23:13:07 +01:00
Claire
b22b76a571
[Glitch] Fix searching for additional hashtags in hashtag column
...
Port 5305dada6c
2021-11-26 22:58:46 +01:00
Claire
9565dc366d
[Glitch] Fix color of hashtag column settings inputs
...
Port 986391cd19
2021-11-26 22:58:13 +01:00
Claire
759226e116
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
Minor conflict due to glitch-soc's extra “enable_keybase” setting.
Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
Minor conflict due to glitch-soc's extra “enable_keybase” setting.
Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
Minor conflict due to an optimization that wasn't shared between
the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
Jeong Arm
5ac17e3a77
Fix admin statuses order( #16937 ) ( #16969 )
...
* Fix #16937
* Add test for statuses order
2021-11-26 22:12:27 +01:00
Claire
5305dada6c
Fix searching for additional hashtags in hashtag column ( #17054 )
2021-11-26 22:11:09 +01:00
Claire
986391cd19
Fix color of hashtag column settings inputs ( #17058 )
...
Fixes #17057
2021-11-26 22:09:11 +01:00
Claire
ad3668eb5f
Fix opening wrong profile when clicking on username of boosting user in WebUI ( #17060 )
...
Fixes #16799
2021-11-26 22:04:09 +01:00
Jeong Arm
849a007a2c
[Glitch] Port upstream changes about trending links
2021-11-26 11:36:22 +01:00
Eugen Rochko
4375813ea7
Remove Keybase integration ( #17045 )
2021-11-26 05:58:18 +01:00
Claire
aa9e32af3d
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-26 01:15:32 +01:00
Claire
61510d37d4
Revert "Fix trends admin page crashing"
...
This reverts commit 367a3ca2cb
2021-11-26 01:15:29 +01:00
Eugen Rochko
6c1d78b277
Fix error on trending hashtags/links pages in admin UI due to missing constant ( #17044 )
2021-11-26 01:12:39 +01:00
Claire
367a3ca2cb
Fix trends admin page crashing
2021-11-26 00:50:13 +01:00
