d9c3109bb6
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-04 01:07:49 +01:00
2ea754b861
Fix duplicate notifications being possible after poll expiration ( #17697 )
2022-03-04 01:06:33 +01:00
04c3ac896a
Fix infinite re-forwarding of update activities temporarily ( #17698 )
2022-03-04 01:00:13 +01:00
02dbc59c91
Add option to automatically delete toots after one week ( #17691 )
...
Fixes #17658
2022-03-03 16:18:58 +01:00
6d3fa7828e
Redesign /about when already logged in ( #17348 )
...
* Redesign /about when already logged in
* Fix sign up form still showing when OMNIAUTH_ONLY is set
* Fix tests
* Change wording based on suggestions
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-03-03 16:14:44 +01:00
ff43e54a49
Allow editing media attachments for scheduled toots ( #17690 )
...
Fixes #17676
2022-03-03 16:13:58 +01:00
631e495a79
Change `follow` scope to be covered by `read` and `write` scopes in REST API ( #17678 )
...
Deprecate `follow` scope
2022-03-03 16:13:40 +01:00
085f286750
Fix returning empty `<p>` tag for blank account `note` in REST API ( #17687 )
2022-03-03 06:45:46 +01:00
54d4ece743
Remove profile directory link from main navigation panel ( #17688 )
2022-03-03 06:45:30 +01:00
c69d94ef7e
[Glitch] Change visual separation of applications in authorized apps list
...
Port SCSS changes from c0c4b5718d
2022-03-02 20:52:44 +01:00
8743b1ea40
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
c0c4b5718d
Change visual separation of applications in authorized apps list ( #17686 )
2022-03-02 20:28:25 +01:00
9b58fb1ea4
Add descriptions to trending features in admin UI ( #17677 )
2022-03-02 18:57:44 +01:00
e24b14cc74
Fix leak of existence of otherwise inaccessible statuses in REST API ( #17684 )
2022-03-02 18:57:26 +01:00
02b8d63fce
Fix report category not being saved in REST API ( #17682 )
2022-03-02 18:57:08 +01:00
78781793d5
[Glitch] Add ability to mark statuses as sensitive from reports in admin UI
...
Port SCSS changes from 25d3dc4373
2022-03-02 18:08:56 +01:00
7f998ba94d
[Glitch] Change authorized applications page
...
Port SCSS changes from 50ea54b3ed
2022-03-02 18:07:57 +01:00
425a6c90c4
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-02 18:02:48 +01:00
25d3dc4373
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
14919fe11e
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
50ea54b3ed
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
233f7e6174
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
c0a8fb2b59
[Glitch] Fix report submit button not being disabled during submission in web UI
...
Port 0883f05753
2022-03-01 10:01:06 +01:00
c5925756f1
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-01 09:59:18 +01:00
1392741044
Chore: Update translatable strings ( #17495 )
2022-02-28 14:14:52 +01:00
cb2e198d89
Fix not showing loading indicator when searching in web UI ( #17655 )
2022-02-27 07:37:07 +01:00
0883f05753
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
0a5a703a56
[Glitch] Fix remote reports with comments revealing remote reporter
...
Port SCSS changes from 57814a98a9
2022-02-26 21:17:22 +01:00
8158b04d18
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-26 21:15:37 +01:00
57814a98a9
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
0dc57ab6ed
Fix status updates not being forwarded like deletes through ActivityPub ( #17648 )
...
Fix #17521
2022-02-26 17:51:59 +01:00
67c6f37e26
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-26 17:27:17 +01:00
6aef76b5cd
Fix error when a MX is shared across blocked domains ( #17650 )
2022-02-26 17:26:28 +01:00
3d60708508
Fix crash in EmailDomainBlockRefreshScheduler ( #17649 )
2022-02-26 16:28:28 +01:00
756f1b6615
Add option (on by default) to allow toots with content warnings to trend
2022-02-26 10:46:26 +01:00
c6df6686af
Disable notifications for trending links and trending statuses by default
2022-02-26 10:46:26 +01:00
4eed5019a2
[Glitch] Fix media modal footer's “external link” not being a link
...
Port 255748dff4
2022-02-26 10:29:53 +01:00
8e04ba87b7
[Glitch] Fix reply button on media modal not giving focus to compose form
...
Port 2cd31b3177
2022-02-26 09:54:48 +01:00
2e2b8a9a40
[Glitch] Add trending statuses
...
Port SCSS changes from 27965ce5ed
2022-02-26 09:50:23 +01:00
59824aadcd
Adapt view for glitch-soc's theming system
2022-02-26 09:46:13 +01:00
be493b6c0d
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
a5c24d5c4d
Fix unable to unpin follower-only posts ( #17647 )
2022-02-25 17:04:08 +01:00
255748dff4
Fix media modal footer's “external link” not being a link ( #17561 )
2022-02-25 01:20:41 +01:00
2cd31b3177
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
d4592bbfcd
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
27965ce5ed
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
a29a982eaa
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
41ef41b900
Fix publish buttons styling
2022-02-23 22:04:12 +01:00
ae3cd3b84c
[Glitch] Fix reporting from profile
...
Port b7cf11d5a9
2022-02-23 21:46:46 +01:00
fc2c65d79f
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-23 21:44:09 +01:00
Claire