Renaud Chaput
d6609635cb
[Glitch] Add a version comment to the emoji preval-ed file so it is regenerated
...
Port 383be173af
2024-01-13 12:39:09 +01:00
Essem
ca31b4de3a
[Glitch] Add new emojis from jdecked/twemoji 15.0
...
Port b6e353537b
2024-01-13 12:39:09 +01:00
Claire
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
Claire
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
2024-01-12 20:16:48 +00:00
Essem
f436a11c4e
Merge remote-tracking branch 'upstream/main'
2024-01-12 11:21:43 -06:00
Claire
1070804a1a
Fix RedownloadMediaWorker not being called on transient S3 failure ( #28714 )
2024-01-12 17:00:17 +00:00
MitarashiDango
2c05b8a60d
Fix Undo Announce activity is not sent, when not followed by the reblogged post author ( #18482 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-12 15:58:28 +00:00
Matt Jankowski
a90c134850
Move followable by logic to suggestion class ( #28710 )
2024-01-12 13:09:33 +00:00
Renaud Chaput
608f66f978
Change icon SVG imports to use a default import ( #28709 )
2024-01-12 10:31:24 +00:00
Renaud Chaput
c6684aa1e3
Use the assets pipeline to load inert.css ( #28701 )
2024-01-12 09:32:45 +00:00
Matt Jankowski
a90696011e
Add coverage/bugfix for invalid appeal submission ( #28703 )
2024-01-12 09:21:00 +00:00
Matt Jankowski
7801db7ba4
Spec coverage for custom css endpoint ( #28706 )
2024-01-12 09:19:25 +00:00
github-actions[bot]
b86083f0dc
New Crowdin Translations (automated) ( #28708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-12 09:17:10 +00:00
Matt Jankowski
575ab085be
Disable Rails/ApplicationController for HealthController ( #28705 )
2024-01-12 09:08:17 +00:00
Renaud Chaput
383be173af
Add a version comment to the emoji preval-ed file so it is regenerated ( #28700 )
2024-01-12 03:39:11 +00:00
Essem
843725b25b
Merge remote-tracking branch 'upstream/main'
2024-01-11 20:51:45 -06:00
Claire
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
Essem
b6e353537b
Add new emojis from jdecked/twemoji 15.0 ( #28404 )
2024-01-11 16:15:08 +00:00
Matt Jankowski
b68f185573
Reduce LineLength for react_component helper in views/admin ( #28694 )
2024-01-11 13:14:24 +00:00
Claire
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
Claire
5dcb8d92c3
Fix lint issue in glitch-soc-only setting form
2024-01-11 13:22:39 +01:00
Claire
63acdebc5d
Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because of a code style fix, while some changed lines are
absent from glitch-soc.
Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
Claire
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
github-actions[bot]
e5b97eadd5
New Crowdin Translations (automated) ( #2502 )
...
* New Crowdin translations
* Update no.yml
* Update simple_form.no.yml
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-11 12:56:56 +01:00
Matt Jankowski
87097a227c
Clean up settings/featured_tags/index view ( #28688 )
2024-01-11 10:45:26 +00:00
Matt Jankowski
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
2024-01-11 10:36:27 +00:00
github-actions[bot]
204bbf49d2
New Crowdin Translations (automated) ( #28692 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-11 10:08:49 +00:00
Matt Jankowski
6daa69327b
Fix LineLength haml-lint in t usage ( #28686 )
2024-01-11 09:32:32 +00:00
Claire
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
Renaud Chaput
09376a8207
[Glitch] Upgrade Redux packages
...
Port a0e237a96f
2024-01-10 18:34:23 +01:00
Claire
51d2d98174
Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream
2024-01-10 18:26:47 +01:00
Claire
7cd88ae2f4
[Glitch] Fix scrolling to detailed status not always working
...
Port d0fd14f851
2024-01-10 18:02:37 +01:00
Claire
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
Claire
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
2024-01-10 15:05:46 +00:00
Matt Jankowski
543d7890fd
Use normalizes to prepare User values ( #28650 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
Matt Jankowski
a71e918e95
Fix LineLength haml-lint in media/player view ( #28667 )
2024-01-10 09:35:01 +00:00
Matt Jankowski
eed4eef39a
Fix LineLength haml-lint in app/views/auth area ( #28664 )
2024-01-09 16:03:16 +00:00
Matt Jankowski
09ab073f0c
Fix LineLength haml-lint in app/views/settings area ( #28663 )
2024-01-09 15:28:56 +00:00
Claire
10203bd57a
Clean up Setting model and remove dead code ( #28661 )
2024-01-09 14:01:53 +00:00
Jean Boussier
1781849884
Inline what remains of the rails-settings-cached gem ( #28618 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 11:50:21 +00:00
gunchleoc
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 10:56:13 +00:00
Matt Jankowski
68f06f1fd4
Fix haml-lint LineLength cop for settings/preferences/notifications/show ( #28655 )
2024-01-09 09:31:32 +00:00
github-actions[bot]
8e7d5fe2ac
New Crowdin Translations (automated) ( #28658 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-09 09:30:33 +00:00
Matt Jankowski
cd4b4d4734
Replace unused by_recent_sign_in scope ( #28616 )
2024-01-08 15:31:13 +00:00
Matt Jankowski
e677eb164c
Remove unused Announcement#time_range? ( #28648 )
2024-01-08 15:26:30 +00:00
Matt Jankowski
3e43cd095c
Remove unused scope Announcement.without_muted ( #28645 )
2024-01-08 15:26:14 +00:00
Matt Jankowski
9322396e58
Use normalizes to prepare Account#username value ( #28646 )
2024-01-08 13:48:31 +00:00
Matt Jankowski
cd58e37b25
Remove unused DomainBlock#affected_accounts_count method ( #28642 )
2024-01-08 13:38:52 +00:00
Matt Jankowski
3e7a9266ea
Remove unused EmojiFormatter#count_tag_nesting method ( #28643 )
2024-01-08 13:36:47 +00:00
Matt Jankowski
4ccba94489
Remove unused *_silenced_accounts scopes on Status ( #28644 )
2024-01-08 13:35:53 +00:00
Matt Jankowski
c52a593a30
Remove unused scope User.emailable ( #28647 )
2024-01-08 13:33:45 +00:00
Matt Jankowski
e827c4692c
Use Arel matches method in CustomEmoji search ( #28615 )
2024-01-08 13:26:12 +00:00
github-actions[bot]
cc67943df2
New Crowdin Translations (automated) ( #28627 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-08 12:46:25 +00:00
Matt Jankowski
1bc5a52139
Extract SQL heredoc method for Announcement scopes ( #28613 )
2024-01-08 11:22:16 +00:00
Matt Jankowski
aa6d07dbd9
Use normalizes to prepare CustomEmoji domain value ( #28624 )
2024-01-08 11:20:59 +00:00
Matt Jankowski
202951e6d9
Use Arel in_order_of method to generate CASE for DomainBlock.by_severity ( #28617 )
2024-01-08 11:15:36 +00:00
Matt Jankowski
57f49c8191
Use Arel nulls_first method in ordering CustomEmojiFilter scope ( #28614 )
2024-01-08 11:09:50 +00:00
Renaud Chaput
a0e237a96f
Upgrade Redux packages ( #28585 )
2024-01-08 10:57:40 +00:00
Essem
3553a71aa7
Expose poll media support in instance api endpoint
2024-01-06 23:28:58 -06:00
Essem
34db0c743b
Expose conversation_id on statuses
2024-01-06 19:50:01 -06:00
Jean Boussier
5a6d533c53
Enable Rails 7.1 Marshalling format ( #28609 )
2024-01-05 21:57:47 +00:00
Matt Jankowski
12bed81187
Add validation specs to CustomFilter model ( #28600 )
2024-01-05 15:13:59 +00:00
github-actions[bot]
43d800ada6
New Crowdin Translations (automated) ( #28604 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-05 11:29:19 +00:00
Claire
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs ( #28607 )
2024-01-05 11:07:57 +00:00
Claire
5f4643b895
Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used ( #28561 )
2024-01-05 10:45:36 +00:00
Claire
d0fd14f851
Fix scrolling to detailed status not always working ( #28577 )
2024-01-04 14:17:38 +00:00
Claire
419c659bc4
Add fallback redirection when getting a webfinger query WEB_DOMAIN@WEB_DOMAIN ( #28592 )
2024-01-04 14:14:46 +00:00
github-actions[bot]
bdf4750633
New Crowdin Translations (automated) ( #28590 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-04 09:24:13 +00:00
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
Essem
84d1e8c0fd
Merge remote-tracking branch 'upstream/main'
2024-01-03 17:22:43 -06:00
Essem
70cedf5c0e
Merge remote-tracking branch 'upstream/main'
2024-01-03 17:21:22 -06:00
Claire
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
Michael Stanclift
195b89d336
Fix .opus file uploads being misidentified by Paperclip ( #28580 )
2024-01-03 19:02:53 +00:00
Matt Jankowski
e12d8893f4
Fix intermittent failure from unspecified order in export_domain_blocks controller spec ( #28562 )
2024-01-03 13:06:15 +00:00
Claire
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
2024-01-03 12:38:49 +01:00
Claire
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
2024-01-03 11:29:26 +00:00
github-actions[bot]
7cce2a41f2
New Crowdin Translations (automated) ( #28573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-03 09:19:46 +00:00
Essem
36e09fbd6d
Merge remote-tracking branch 'upstream/main'
2024-01-02 15:37:44 -06:00
Claire
48c9192b47
[Glitch] Fix loading local accounts with extraneous domain part in WebUI
...
Port 65ea097f1d
2024-01-02 18:16:57 +01:00
Claire
f685c953e5
Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream
2024-01-02 18:12:28 +01:00
Claire
65ea097f1d
Fix loading local accounts with extraneous domain part in WebUI ( #28559 )
2024-01-02 15:02:25 +00:00
Michael Stanclift
0cd497ba7d
[Glitch] Fix OCR when using S3/CDN for assets
...
Port fdec8d7ffb
2024-01-02 13:37:04 +01:00
Claire
b3542ac57b
Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our README.
2024-01-02 13:35:11 +01:00
Claire
1184887b01
Fix streaming API redirection ignoring the port of streaming_api_base_url ( #28558 )
2024-01-02 12:27:51 +00:00
github-actions[bot]
0374e11091
New Crowdin Translations (automated) ( #28529 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-02 09:11:53 +00:00
Michael Stanclift
fdec8d7ffb
Fix OCR when using S3/CDN for assets ( #28551 )
2024-01-02 09:09:54 +00:00
Essem
174f1e7c2c
Merge remote-tracking branch 'upstream/main'
2023-12-30 13:56:14 -06:00
Essem
978cd69dd4
Merge remote-tracking branch 'upstream/main'
2023-12-29 12:50:42 -06:00
Claire
eb342a6082
Fix media attachments not being hidden in report modal in glitch flavor
2023-12-29 17:47:30 +01:00
Cal Moody
df43bb124c
[Glitch] Fix destructive actions in dropdowns not using error color in light theme
...
Port 3599622b5b
2023-12-29 17:43:53 +01:00
Claire
35b6583371
Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream
2023-12-29 17:40:57 +01:00
Claire
6374358357
Change media to be hidden/blurred by default in report modal ( #28522 )
2023-12-29 16:34:13 +00:00
Claire
fcfdeadc04
Fix random NoMethodError errors on cached CustomFilter objects ( #28521 )
2023-12-29 16:23:07 +00:00
Cal Moody
3599622b5b
Fix destructive actions in dropdowns not using error color in light theme ( #28484 )
2023-12-29 11:32:40 +00:00
Matt Jankowski
ba5f659bb3
Use shorter attribute query methods in Announcement ( #28474 )
2023-12-29 10:55:50 +00:00
github-actions[bot]
7df9c4f6f3
New Crowdin Translations (automated) ( #28481 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-29 10:39:10 +00:00
Matt Jankowski
128c5b7db3
Fix Performance/StringIdentifierArgument cop ( #28508 )
2023-12-29 10:23:30 +00:00
Santiago Kozak
1cba91d6d1
Fix reply icon display in picture-in-picture footer ( #28519 )
2023-12-29 09:48:27 +00:00
Claire
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
Claire
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
2023-12-27 09:54:05 +01:00
Essem
99e37ec353
Check for content attribute in Misskey likes
2023-12-26 19:00:13 -06:00
Essem
8860d937ce
Merge remote-tracking branch 'upstream/main'
2023-12-22 16:07:42 -06:00
Claire
ea6c187fca
Fix media attachment order of remote posts ( #28469 )
2023-12-22 18:45:36 +01:00
Claire
72ff0d30d8
Fix submitting post from content warning field not working properly ( #2538 )
2023-12-22 17:23:15 +01:00
Claire
2bf84b93d4
Fix media attachment order of remote posts ( #28469 )
2023-12-22 15:10:39 +00:00
github-actions[bot]
e70a65761a
New Crowdin Translations (automated) ( #28467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-22 07:58:20 +00:00
Renaud Chaput
1c041356a1
Fix error on viewing a profile when unlogged ( #28465 )
2023-12-21 20:19:18 +00:00
Claire
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
2023-12-21 19:42:13 +01:00
Claire
30ee7339d3
Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream changed code style change, including on a line modified by glitch-soc.
Kept glitch-soc's line but with the code style change applied.
2023-12-21 19:31:12 +01:00
Claire
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
Claire
7a0be26367
[Glitch] Fix empty column explainer getting cropped under certain conditions
...
Port 3f1ec16377
2023-12-21 19:08:43 +01:00
Claire
a60b9acf3c
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream
2023-12-21 19:04:20 +01:00
Claire
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
Eugen Rochko
5976d3702f
Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI ( #28452 )
2023-12-21 09:44:09 +00:00
github-actions[bot]
9e5ddc1745
New Crowdin Translations (automated) ( #28451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-21 09:09:00 +00:00
Eugen Rochko
01f0a6ca4f
Fix profile setup showing default avatar in web UI ( #28453 )
2023-12-21 08:32:25 +00:00
Claire
9ac13bbc9c
Fix glitch-only HAML linting issue
2023-12-20 22:27:29 +01:00
Matt Jankowski
01e77a0f34
[Glitch] Enable the eslint react/no-unknown-property rule
...
Port ee83d5c760
2023-12-20 22:24:40 +01:00
Claire
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
Claire
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
Essem
5fdd18ead1
Merge remote-tracking branch 'upstream/main'
2023-12-20 15:01:05 -06:00
Claire
5de551002d
[Glitch] Fix onboarding step descriptions being truncated on narrow screens
...
Port b20af17a2c
2023-12-20 21:59:58 +01:00
Claire
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
Claire
b41af99673
[Glitch] Change dismissed banners to be stored server-side
...
Port 7faa27e17d
2023-12-20 20:40:47 +01:00
Claire
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
Renaud Chaput
a4a728b01d
[Glitch] Fix the loading bar with the new Redux actions
...
Port 8b1eeb2f90
2023-12-20 19:49:44 +01:00
Claire
93c71e2c7c
[Glitch] Fix notification sounds
...
Port f3864db409
2023-12-20 19:49:44 +01:00
Claire
70652e49eb
[Glitch] Fix error when muting users from Web UI
...
Port 32319187ee
2023-12-20 19:49:44 +01:00
Renaud Chaput
e94fecdcc8
[Glitch] Fix the notificationsUpdate call
...
Port f476d9dab2
2023-12-20 19:49:44 +01:00
Renaud Chaput
79678cf841
[Glitch] Fixes website not loading for unlogged users
...
Port 6712bf86cd
2023-12-20 19:49:44 +01:00
Renaud Chaput
7fe5623a27
[Glitch] Use Immutable Record for accounts in Redux state
...
Port 3bf2a7296e
2023-12-20 19:49:44 +01:00
Renaud Chaput
3b7caa00e2
[Glitch] Add Typescript types for some API objects
...
Port 57f592fed5
2023-12-20 19:49:44 +01:00
Claire
a3a58c041e
Merge pull request #2527 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 8ebc94dd22
2023-12-20 19:48:45 +01:00
Claire
d29b1cca2e
Fix friends_of_friends sometimes suggesting already-followed accounts ( #28433 )
2023-12-20 14:35:59 +00:00
github-actions[bot]
fecc07856c
New Crowdin Translations (automated) ( #28439 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-20 09:15:30 +00:00
Essem
b7cb17fecf
Fix the poll option add button attempting to submit a form ( #2530 )
2023-12-20 08:24:28 +01:00
Essem
724ea24a5d
Fix the poll option add button attempting to submit a form
2023-12-19 23:35:48 -06:00
Essem
cc676636f4
Merge remote-tracking branch 'upstream/main'
2023-12-19 15:24:52 -06:00
Claire
9bfb699c4c
[Glitch] Change search popout to not list unusable search options when logged out
...
Port 6e70819840
2023-12-19 21:25:55 +01:00
Claire
b135b6ba8f
Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
Claire
2e786e13cb
Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/status_pin_validator.rb`:
Upstream refactored that file, while glitch-soc had configurable limits for
pinned statuses.
Updated the code with upstream's refactor, while keeping glitch-soc's
configurability.
2023-12-19 20:51:37 +01:00
Claire
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
Claire
7db68e2dca
[Glitch] Fix upper border radius of onboarding columns
...
Port 0a6ec048a8
2023-12-19 20:26:22 +01:00
Claire
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
Jeong Arm
94c4c7f330
[Glitch] Fix open status on media modal
...
Port 922f086253
2023-12-19 20:17:45 +01:00
Claire
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
Claire
8afd313807
Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
- `yarn.lock`:
Upstream split some dependencies, including `express`, to
`streaming/package.json`.
However, glitch-soc had extra dependencies textually close to `express`.
Kept the extra dependencies and moved `express` to streaming.
2023-12-19 20:06:32 +01:00
Claire
cd1e3ac2c7
Merge commit '7e1a77ea51e6dc4aecbf678f8928aa96698fa072' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/timelines/public_controller.rb`:
Upstream refactored this code, the conflict was because of an extra supported
parameter, `allow_local_only`.
Updated the controller to follow upstream's refactor, and moved the extra
parameter definition accordingly.
2023-12-19 19:51:40 +01:00
Eugen Rochko
b5ac61b2c5
Change algorithm of follow recommendations ( #28314 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 10:59:43 +00:00
Matt Jankowski
c28976d89e
Handle negative offset param in api/v2/search ( #28282 )
2023-12-19 10:55:39 +00:00
Renaud Chaput
7b1d390734
Fixes dropdown target without a buttonRef (edit history) ( #28427 )
2023-12-19 10:47:53 +00:00
github-actions[bot]
fa987db738
New Crowdin Translations (automated) ( #28423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-19 09:40:37 +00:00
Claire
3598c2e1db
Revert "Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )" ( #28251 )
2023-12-19 05:08:52 +00:00
Essem
1807bdbb4d
Fix locales
2023-12-18 20:03:10 -06:00
Essem
fe768435d6
Fix jsdoc
2023-12-18 19:55:34 -06:00
Essem
a5a5437a29
Remove "disabled" prop from emoji dropdown on vanilla flavor
2023-12-18 19:45:34 -06:00
Essem
f84f397807
Remove post reactions from vanilla flavor
...
This is mainly for cleanup and parity with the current PR. Not much reason to modify something that should be "vanilla" anyways.
2023-12-18 19:42:35 -06:00
Essem
59e8b9faa5
Linting fixes
2023-12-18 18:29:39 -06:00
Essem
f628ebad02
Merge remote-tracking branch 'upstream/main'
2023-12-18 18:05:23 -06:00
Renaud Chaput
8b1eeb2f90
Fix the loading bar with the new Redux actions ( #28422 )
2023-12-18 23:19:27 +00:00
Matt Jankowski
7cfc078198
Fix rails mailer preview not honouring locale ( #28418 )
2023-12-18 21:49:17 +00:00
Brian Holley
4259f4a4aa
[Glitch] Fix "Hide these posts from home" list setting not refreshing when switching lists
...
Port 4aa06cbdbf
2023-12-18 20:59:33 +01:00
Claire
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
2023-12-18 20:47:27 +01:00
pajowu
6261db2a26
[Glitch] Fix modal content not being selectable
...
Port ed79713f3a
2023-12-18 19:15:57 +01:00
Claire
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
Claire
60eb57ce1b
Fix HAML listing issue
2023-12-18 19:07:15 +01:00
Claire
f5de9fe99a
[Glitch] Allow viewing and severing relationships with suspended accounts
...
Port c451bbe249
2023-12-18 18:49:48 +01:00
Aleks Xhuvani
dee28c3fbf
[Glitch] Do not try to update an undefined video element
...
Port 7840c6b75b
2023-12-18 18:42:30 +01:00
Aleks Xhuvani
372c455218
[Glitch] Add volume saving/reuse to video player
...
Port 58f01a5c9a
2023-12-18 18:42:07 +01:00
Claire
b474cbbd28
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
We differed by listing suspended users when requesting relationships.
Updated to upstream's code.
2023-12-18 18:40:58 +01:00
Claire
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
Claire
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
Claire
7d9b209fe8
Fix call to inefficient delete_matched cache method in domain blocks ( #28374 )
2023-12-18 16:14:43 +00:00
Claire
3d3fa75c81
Reduce composer differences with upstream and simplify code ( #2518 )
2023-12-18 13:20:08 +01:00
Matt Jankowski
1820bad646
Fix Performance/StringIdentifierArgument cop ( #28399 )
2023-12-18 10:26:09 +00:00
Matt Jankowski
2bd8d343cf
Fix Style/SoleNestedConditional and Style/IfInsideElse cops, regenerate haml todo ( #28384 )
2023-12-18 10:06:42 +00:00
Matt Jankowski
0e5b8fc46b
Fix Style/RedundantReturn cop ( #28391 )
2023-12-18 09:50:51 +00:00
github-actions[bot]
f99e05710e
New Crowdin Translations (automated) ( #28373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-18 08:25:21 +00:00
Essem
bbf2dbaf56
Merge remote-tracking branch 'upstream/main'
2023-12-17 19:48:56 -06:00
hazycora
2dde7a25a4
allow dashes in emoji shortcodes
2023-12-17 17:42:15 -06:00
hazycora
2eab76cbcc
allow side-by-side emoji
...
(Let's see how this goes :woozycat:)
2023-12-17 17:42:15 -06:00
Claire
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
mogaminsk
cc265f760e
[Glitch] Fix inserting emojis from emoji picker fails with TypeError
...
Port ac8e4ed38d
2023-12-17 18:03:22 +01:00
Claire
bb4fa0c374
[Glitch] Rewrite AutosuggestTextarea as Functional Component
...
Port 9c8891b39a
2023-12-17 17:59:33 +01:00
Renaud Chaput
e22c3cd768
[Glitch] Improve Babel configuration and automatically load polyfills
...
Port 0e3401bc1c
2023-12-17 17:50:31 +01:00
Claire
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
Claire
f62bafc7a1
Fix HAML linting issue
2023-12-17 16:37:11 +01:00
Claire
1474318691
Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream fixed a bug in the trending post condition.
Glitch-soc's condition is different because we potentially allow CWed content
to trend.
Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
Kept our version for now, we will switch to upstream later down the road.
2023-12-17 15:32:29 +01:00
Essem
dfe6628e4b
Add new emojis from jdecked/twemoji 15.0
2023-12-16 16:25:22 -06:00
Matt Jankowski
b1dec09d20
Fix Style/InverseMethods cop ( #28377 )
2023-12-15 15:52:00 +00:00
Matt Jankowski
e17faedffb
Move default meta options from InitialStateSerializer to private method (AbcSize reduction) ( #28355 )
2023-12-14 14:04:55 +00:00
github-actions[bot]
b2f915b31a
New Crowdin Translations (automated) ( #28344 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-13 09:52:37 +00:00
Claire
dcc24db793
Fix N+1s because of association preloaders not actually getting called ( #28339 )
2023-12-13 07:47:32 +00:00
Essem
1ef832e0dc
Allow polls with one option
2023-12-12 20:52:01 -06:00
Essem
00dae881c5
Merge remote-tracking branch 'upstream/main'
2023-12-12 20:30:34 -06:00
Claire
3f1ec16377
Fix empty column explainer getting cropped under certain conditions ( #28337 )
2023-12-12 14:31:37 +00:00
github-actions[bot]
14e64bc880
New Crowdin Translations (automated) ( #28334 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-12 11:45:10 +00:00
Claire
89a496b42f
Fix status edits not always being streamed to mentioned users ( #28324 )
2023-12-12 10:39:21 +00:00
Claire
a8a5c6514f
Fix LinkCrawlWorker error when encountering empty OEmbed response ( #28268 )
2023-12-12 08:29:46 +00:00
Matt Jankowski
2c6369918c
Fix Style/RedundantArgument cop ( #28321 )
2023-12-11 14:58:29 +00:00
Claire
f3864db409
Fix notification sounds ( #28316 )
2023-12-11 14:23:30 +00:00
github-actions[bot]
79a81da69c
New Crowdin Translations (automated) ( #28291 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-11 08:22:52 +00:00
Michael Stanclift
afc8550b63
Change preview card deletes to be done using batch method ( #28183 )
2023-12-11 07:49:10 +00:00
Essem
ce1c652623
Merge remote-tracking branch 'upstream/main'
2023-12-10 23:28:41 -06:00
Claire
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Claire
df5c64fe57
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
cc1d68ace8
[Glitch] Show announcements in reverse chronological order
...
Port f1f0400adc8e2530ea16
2023-12-09 21:19:43 +01:00
Claire
4b2ddaf106
Further reduce differences with upstream
2023-12-09 21:19:43 +01:00
Claire
408d4710ed
Further reduce differences with upstream
2023-12-09 20:58:50 +01:00
Claire
a27abb4802
Further reduce code differences with upstream ( #2509 )
2023-12-09 20:29:23 +01:00
Claire
1ddf2012ee
Fix status avatar size discrepancies ( #2510 )
...
Follow-up to #2508
2023-12-09 20:29:15 +01:00
Claire
b2647bc3f2
[Glitch] Update Avatar, AvatarComposite, and AvatarOverlay components ( #2508 )
...
Various ports including 8dfe5179eed1de7fb7fa9f8d34620b
2023-12-09 18:33:42 +01:00
github-actions[bot]
ca1b7efb06
New Crowdin Translations (automated) ( #28275 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-08 09:52:32 +00:00
Matt Jankowski
3918dc68c7
Use composite primary key for PreviewCardsStatus model ( #28208 )
2023-12-07 14:49:05 +00:00
Michael Stanclift
da3d8aff79
Error handling for attachment batch delete process ( #28184 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-07 14:40:44 +00:00
github-actions[bot]
e0dacf6b4c
New Crowdin Translations (automated) ( #28264 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-07 09:38:44 +00:00
Claire
7593465c23
Fix error when processing link preview with an array as inLanguage ( #28252 )
2023-12-07 09:05:08 +00:00
Matt Jankowski
ee83d5c760
Enable the eslint react/no-unknown-property rule ( #28217 )
2023-12-06 13:42:12 +00:00
github-actions[bot]
954169966b
New Crowdin Translations (automated) ( #28245 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-12-06 08:52:55 +00:00
github-actions[bot]
4238ec844d
New Crowdin Translations (automated) ( #28120 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-05 16:07:53 +00:00
Jonathan de Jong
d0a5ebf914
Fix error when encountering malformed Tag objects from Kbin ( #28235 )
2023-12-05 13:59:15 +00:00
Essem
9002a71161
Merge remote-tracking branch 'upstream/main'
2023-12-04 11:38:50 -06:00
Claire
9fcf5d4192
[Glitch] Fix emoji picker button scrolling with textarea content in single-column view ( #2501 )
...
Port bbea052935
2023-12-04 13:30:27 +01:00
Essem
a46b6af1d6
Fix constant redirects to onboarding page ( #2505 )
2023-12-04 13:30:17 +01:00
Claire
a2bcfeb887
Fix Style/HashEachMethods cop in HAML files ( #28178 )
2023-12-04 09:09:43 +00:00
Essem
c898e29623
Fix constant redirects to onboarding page
2023-12-04 00:28:52 -06:00
Essem
8f2327095e
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-12-03 21:12:22 -06:00
Claire
23ee393fdd
Merge pull request #2499 from ClearlyClaire/glitch-soc/port-toasts
...
Port upstream's toast changes
2023-12-03 20:57:42 +01:00
Eugen Rochko
cede2f533c
[Glitch] Fix toast saying "published" instead of "saved" after editing post in web UI
...
Port 71641766f2
2023-12-03 19:39:08 +01:00
Renaud Chaput
9ac73a1fbf
[Glitch] Change eslint config to autofix missing comma and indentation in JS files
...
Partial port of 774e1189d2
2023-12-03 16:44:40 +01:00
Christian Schmidt
ea004108b8
[Glitch] Make notification respect reduce-motion
...
Port 6d0767558a
2023-12-03 16:38:41 +01:00
Stanislas Signoud
811b8b200e
[Glitch] Use invariant colors on notification toasts
...
Port ca955ada0b
2023-12-03 16:38:41 +01:00
Eugen Rochko
3bbe39f233
[Glitch] Add toast with option to open post after publishing in web UI
...
Port a7ca33ad96
2023-12-03 16:38:41 +01:00
Claire
046cb408b7
[Glitch] Fix front-end bug when processing relationship-related account actions
...
Port 287520453c
2023-12-03 13:19:10 +01:00
Renaud Chaput
c3a0d5aca3
[Glitch] Fix Redux types
...
Port 0712cc2b99
2023-12-03 13:19:10 +01:00
Renaud Chaput
6fb5fafd28
[Glitch] Convert actions/account_notes into Typescript
...
Port bd06c13204
2023-12-03 13:19:10 +01:00
Claire
ee58f680e8
[Glitch] Fix autocomplete suggestions being cut off in compose form
...
Port 6833732852
2023-12-03 11:23:12 +01:00
Claire
6269a5336f
[Glitch] Change composer highlight border size to be more noticeable
...
Port aa4c9730f6
2023-12-03 11:23:12 +01:00
Claire
204fe83fcc
[Glitch] Fix compose textarea scroll behavior
...
Port 746979f75d
2023-12-03 11:23:12 +01:00
Claire
a8f6a5b40f
Update translation strings
2023-12-03 11:23:12 +01:00
Claire
786b42e2b5
Fix SCSS and JS linting issues
2023-12-03 11:23:12 +01:00
Claire
a0943b8f6d
Remove glitch-soc's old onboarding modal
2023-12-03 11:23:12 +01:00
Renaud Chaput
6dc812dd51
[Glitch] Upgrade to react-router v5 in onboarding code
...
Port 1b70d7ed7c
2023-12-03 11:23:12 +01:00
Eugen Rochko
06e819537b
[Glitch] Change labels and styles on the onboarding screen in web UI
...
Port a985d587e1
2023-12-03 11:23:12 +01:00
Eugen Rochko
d5bad93460
[Glitch] Change "Follow 7 people" to "Find at least 7 people to follow" in web UI
...
Port 4a5464f360
2023-12-03 11:23:12 +01:00
たいち ひ
c2c25122e8
[Glitch] Rewrite <Check /> as FC
...
Port 6fdbee240c
2023-12-03 11:23:12 +01:00
Renaud Chaput
a1667ba796
[Glitch] Upgrade react-intl usage in onboarding code
...
Port remaining of 44cd88adc4
2023-12-03 11:23:12 +01:00
Claire
e47c582283
Fix import order
2023-12-03 11:23:12 +01:00
Renaud Chaput
ba4c8a9b41
[Glitch] Use the new JSX transform in onboarding code
...
Port the remaining of 8f66126b10
2023-12-03 11:23:12 +01:00
Steven Munn
6e4497ab2d
[Glitch] Fix spelling of "Lets" on the onboarding page after clicking the confirmation email
...
Port 52d36f0f98
2023-12-03 11:23:12 +01:00
Emelia Smith
1cb8df655b
[Glitch] Fix Onboarding Errors
...
Port b8a2430642
2023-12-03 11:23:12 +01:00
Renaud Chaput
0b1556b7f7
[Glitch] Enforce stricter rules for Typescript files
...
Port c8181eb0a4
2023-12-03 11:23:12 +01:00
Eugen Rochko
542f2fb1e0
[Glitch] Add default post text to onboarding flow in web UI
...
Port 8979b70975
2023-12-03 11:23:12 +01:00
Eugen Rochko
e0b401e295
[Glitch] Add more tips to onboarding flow in web UI
...
Port c35e3cb6ac
2023-12-03 11:23:12 +01:00
Eugen Rochko
4537b4b961
[Glitch] Add new onboarding flow to web UI
...
Port 0461f83320
2023-12-03 11:23:12 +01:00
Claire
335cfab32f
Change account note design to match upstream's ( #2495 )
2023-12-03 11:22:38 +01:00
Claire
f1241b4a3a
Fix translation string for status.favourite not having been changed everywhere ( #2494 )
2023-12-03 09:51:29 +01:00
Claire
edd96ce786
Merge pull request #2492 from ClearlyClaire/glitch-soc/painful-backports
...
Port account rows design change from upstream
2023-12-03 09:51:07 +01:00
Claire
21df2a68ac
Hide followers count when hidden by instance or user
2023-12-02 17:38:07 +01:00
Claire
09062d393f
Fix more styling issues
2023-12-02 17:38:07 +01:00
Claire
28d4f3ab70
Fix account component styling wrt. upstream
2023-12-02 17:05:54 +01:00
fusagiko / takayamaki
dc917cfcdf
[Glitch] Fix account.jsx imports ( #25541 )
...
Port remaining part of e0d230fb3720e85c0e839d45a444f9
2023-12-02 16:59:40 +01:00
Eugen Rochko
17372a3ec0
[Glitch] Change labels and styles on the onboarding screen in Account component
...
Partial port of a985d587e1
2023-12-02 16:59:40 +01:00
Eugen Rochko
0421b44f22
[Glitch] Change follow button in account row to be more obvious in web UI ( #24956 )
...
Port 0ddc895282
2023-12-02 16:59:40 +01:00
Claire
f1691eca55
[Glitch] Fix overflow behavior of account rows
...
Port 5fae2de454
2023-12-02 16:59:40 +01:00
Renaud Chaput
98a7b95058
[Glitch] Update inconsistent defaultMessage in Account component
...
Partial port of e58c36d308
2023-12-02 16:59:40 +01:00
Claire
b047b981cd
[Glitch] Enforce import order with ESLint
...
Port d27216dc46
2023-12-02 16:59:40 +01:00
Emelia Smith
b8cbaba283
[Glitch] Split EmptyAccount out of Account component
...
Partial port of b8a2430642
2023-12-02 16:59:40 +01:00
Claire
32ec0d2472
[Glitch] Fix verified badge in account lists potentially including rel="me" links
...
Port 55e7c08a83
2023-12-02 16:59:40 +01:00
Renaud Chaput
e7ec2641a0
[Glitch] Fix linting issues with VerifiedBadge component
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
fusagiko / takayamaki
2efb22f455
[Glitch] Rewrite VerifiedBadge component as function component
...
Port 140aa6b054
2023-12-02 16:59:40 +01:00
Eugen Rochko
00db5c8ade
[Glitch] Split VerifiedBadge from Account component
...
Partial port of 0461f83320
2023-12-02 16:59:40 +01:00
Eugen Rochko
e0aba64a64
[Glitch] Fix regressions from change in account row design in web UI
...
Port 46483ae849
2023-12-02 16:59:40 +01:00
Eugen Rochko
a262f990f8
Change design of account rows in web UI ( #24247 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-02 16:59:40 +01:00
Claire
73a94c3b3f
Fix self-destruct page not using theme styles ( #2490 )
2023-12-02 14:54:35 +01:00
Plastikmensch
5b0382abc5
Remove redundant asset preload ( #2488 )
...
* Remove redundant asset preload
preloading these is already handled by glitch-soc theming system, meaning glitch packs get preloaded and if the user is signed in, vanilla packs.
The theming system preloads these unconditionally though.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove preload of getting started
This matches upstreams preloads
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-12-02 14:54:26 +01:00
Matt Jankowski
3bc437b99a
Fix Style/RedundantParentheses cop ( #28176 )
2023-12-01 16:00:44 +00:00
Matt Jankowski
5631f139c1
Fix Lint/SymbolConversion cop ( #28175 )
2023-12-01 15:53:35 +00:00
Matt Jankowski
d83d01eb1e
Fix Lint/RedundantSafeNavigation cop ( #28172 )
2023-12-01 15:52:56 +00:00
Matt Jankowski
f70f39dd04
Add explicit dependent: nil to associations ( #28169 )
2023-12-01 15:52:47 +00:00
Matt Jankowski
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00
Claire
963354978a
Add Account#unavailable? and Account#permanently_unavailable? aliases ( #28053 )
2023-11-30 15:43:26 +00:00
Matt Jankowski
35deaaf90b
Reduce AbcSize complexity in InitialStateSerializer ( #27782 )
2023-11-30 15:41:26 +00:00
Matt Jankowski
1f1c75bba5
File cleanup/organization in controllers/concerns ( #27846 )
2023-11-30 14:39:41 +00:00
Matt Jankowski
e7c340a634
Spec coverage for missing q param and error conditions in api/v2/search controller ( #27842 )
2023-11-30 13:59:46 +00:00
Claire
b20af17a2c
Fix onboarding step descriptions being truncated on narrow screens ( #28021 )
2023-11-30 13:47:07 +00:00
Claire
85662a5a57
Change img-src and media-src CSP directives to not include https: ( #28025 )
2023-11-30 13:47:01 +00:00
Matt Jankowski
bb0efe16e6
Remove default_scope from MediaAttachment class ( #28043 )
2023-11-30 13:30:35 +00:00
Claire
7faa27e17d
Change dismissed banners to be stored server-side ( #27055 )
2023-11-30 11:45:54 +00:00
Matt Jankowski
e48ecd2929
Remove default_scope from Admin::ActionLog ( #28026 )
2023-11-29 10:39:59 +00:00
Matt Jankowski
291dc04e67
Remove un-needed action and template options to render in controllers ( #28022 )
2023-11-29 10:38:05 +00:00
Matt Jankowski
72b7cd349c
Extract helper methods for form label in admin/ area views ( #27575 )
2023-11-29 10:06:19 +00:00
Matt Jankowski
9b47c5d53c
Extract helper methods for labels from filters/_filter_fields ( #27574 )
2023-11-29 10:02:59 +00:00
Matt Jankowski
186895fc88
Refactor, lint fix, and bug fix on admin/roles/form partial ( #27558 )
2023-11-29 10:00:52 +00:00
Emelia Smith
603b245cc6
Add VAPID public key to instance serializer ( #28006 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-29 08:34:36 +00:00
Essem
e797b43a32
Allow posting media alongside polls
2023-11-28 23:33:17 -06:00
Matt Jankowski
6b46bf9953
Handle scenario when webfinger response subject is missing host value ( #28088 )
2023-11-28 18:37:54 +00:00
Josh Goldberg ✨
3a7f10c3f1
Converted hashtag.jsx to TypeScript ( #27872 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-28 18:20:10 +00:00
Josh Goldberg ✨
1142f4c79e
Converted app/javascript/mastodon/utils/ folder to TypeScript ( #27895 )
2023-11-28 17:47:55 +00:00
Matt Jankowski
baf3b71e3b
Extract path_without_format private methd in accounts controller ( #28091 )
2023-11-28 09:17:26 +00:00
github-actions[bot]
af02484714
New Crowdin Translations (automated) ( #28096 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-28 08:59:48 +00:00
Matt Jankowski
9072896ae5
Avoid unnecessary i-var for account rss page url generation ( #28092 )
2023-11-28 08:19:08 +00:00
Matt Jankowski
dfc7154767
Remove unused cached_filtered_status_page method from accounts controller ( #28090 )
2023-11-28 07:43:16 +00:00
Matt Jankowski
2d536bb05f
Use admin_mailer layout with initial salutation ( #28085 )
2023-11-28 07:41:26 +00:00
6543
10b879bd5e
nodeinfo: add instance name and description ( #28079 )
2023-11-28 00:51:22 +00:00
Essem
570a8c00a2
Vertical status buttons fix
2023-11-27 10:31:51 -06:00
Essem
6aafe6c541
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-11-27 10:22:34 -06:00
Claire
f1657e6d62
Clamp dates when serializing to Elasticsearch API ( #28081 )
2023-11-27 13:25:54 +00:00
Matt Jankowski
9b8ba9b350
Remove unused plain_mailer layout ( #28065 )
2023-11-27 10:40:03 +00:00
June
97e677f993
Fix not all legal images showing in file picker when uploading custom emoji ( #28076 )
2023-11-27 10:06:48 +00:00
github-actions[bot]
fad9343bab
New Crowdin Translations (automated) ( #28069 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-27 10:06:35 +00:00
Essem
7a638e3225
Update mastomodern
2023-11-25 20:27:38 -06:00
Jeong Arm
b3581d1e2f
Fix @rails/ujs import on public.jsx ( #2482 )
...
Related: 8a131fb7bc
2023-11-24 17:40:31 +01:00
github-actions[bot]
8521238677
New Crowdin Translations (automated) ( #28060 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-24 10:25:39 +00:00
Claire
3a24754229
Change GIF max matrix size error to explicitly mention GIF files ( #27927 )
2023-11-24 09:31:28 +00:00
Claire
6e70819840
Change search popout to not list unusable search options when logged out ( #27918 )
2023-11-24 09:27:54 +00:00
Kevin Bongart
7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )
2023-11-23 10:00:09 +00:00
github-actions[bot]
c810b197ad
New Crowdin Translations (automated) ( #28050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-23 09:34:50 +00:00
Matt Jankowski
4be12791e6
Remove default_scope from StatusEdit class ( #28042 )
2023-11-23 09:26:11 +00:00
github-actions[bot]
d3ed03fd6b
New Crowdin Translations (automated) ( #28036 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-22 15:48:12 +00:00
Matt Jankowski
9742bccbe7
Add coverage for api/v2/media endpoint ( #28027 )
2023-11-22 15:39:34 +00:00
Eugen Rochko
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-22 11:38:07 +00:00
Essem
6dd12b9cd2
Merge remote-tracking branch 'upstream/main'
2023-11-21 19:38:13 -06:00
Claire
32319187ee
Fix error when muting users from Web UI ( #28016 )
2023-11-21 11:16:16 +00:00
Matt Jankowski
6d51ac246b
Update partials for the AdminMailer.new_trends mailer ( #28011 )
2023-11-21 10:52:20 +00:00
github-actions[bot]
3c3e0c25ef
New Crowdin Translations (automated) ( #28015 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-21 10:35:02 +00:00
Claire
f00fcda785
Reduce differences with upstream in Account component
2023-11-20 13:24:02 +01:00
Claire
9ab1aa15e9
Change ReplyIndicator implementation and markup to match upstream's
2023-11-20 13:24:02 +01:00
Matt Jankowski
876f5b1d12
Convert /instances/* controller specs to request specs ( #27988 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-20 11:05:28 +00:00
Matt Jankowski
d2aacea8da
Reduce .times usage in AccountSearch spec, use constant for default limit ( #27946 )
2023-11-20 09:08:22 +00:00
Matt Jankowski
00c6ebd86f
Reduce .times usage in StatusPin and add PIN_LIMIT constant in validator ( #27945 )
2023-11-20 09:07:25 +00:00
github-actions[bot]
8ceae2bce6
New Crowdin Translations (automated) ( #27966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-20 08:47:34 +00:00
Eugen Rochko
0e9801443f
Change to single opt-in during profile setup in onboarding in web UI ( #27876 )
2023-11-17 10:37:04 +00:00
github-actions[bot]
9c68741f46
New Crowdin Translations (automated) ( #27914 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-17 09:16:12 +00:00
Essem
97317db66c
[Glitch] Fix open status on media modal
2023-11-16 19:11:26 -06:00
Jeong Arm
7ed31b511a
Fix open status on media modal ( #27867 )
2023-11-16 19:10:31 -06:00
Essem
8d611ef932
Merge remote-tracking branch 'upstream/main'
2023-11-16 18:12:13 -06:00
Claire
d3ae5b21d2
Reduce code and markup discrepancies on reply indicator
2023-11-16 18:33:16 +01:00
Claire
e023acfd00
Remove unnecessary proptype discrepancy
2023-11-16 17:57:13 +01:00
Claire
0a6ec048a8
Fix upper border radius of onboarding columns ( #27890 )
2023-11-16 13:43:02 +00:00
Claire
c94bedf4e6
Use container queries to hide profile share button ( #27889 )
2023-11-16 11:59:45 +00:00
Eugen Rochko
87696ea26e
Add prominent share/copy button on profiles in web UI ( #27865 )
2023-11-16 10:23:14 +00:00
github-actions[bot]
7232d4750d
New Crowdin Translations (automated) ( #27884 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-16 10:08:22 +00:00
Claire
36f25ea067
Fix more import discrepancies
2023-11-15 22:50:23 +01:00
Claire
4101057b9a
Fix various code discrepancies
2023-11-15 22:50:23 +01:00
Claire
09a5a78527
Fix discrepancy for autosuggest-emoji class
2023-11-15 22:50:23 +01:00
Claire
f69f1e9429
Fix code discrepancies with upstream
2023-11-15 21:52:19 +01:00
Claire
d358a3cc61
Merge pull request #2468 from ClearlyClaire/glitch-soc/cleanup
...
Clean up some more and reduce unwarranted differences with upstream further
2023-11-15 21:49:50 +01:00
Essem
19def877be
Merge remote-tracking branch 'upstream/main'
2023-11-15 11:04:05 -06:00
Claire
0d877a3076
[Glitch] Change compose form checkbox to native input with appearance: none
...
Port d3b4d4d4f3
2023-11-15 17:20:44 +01:00
Claire
e7b3598f04
No need to have a separate localStorage key for home instance
2023-11-15 17:16:21 +01:00
Claire
0c727a6790
Fix more import style discrepancies
2023-11-15 17:16:21 +01:00
Claire
50eb673494
Fix some markup discrepancies
2023-11-15 17:16:21 +01:00
Claire
349579e318
Fix more code discrepancies
2023-11-15 17:16:21 +01:00
Claire
1023c2f90b
Fix more whitespace and comment discrepancies
2023-11-15 17:16:21 +01:00
Claire
7e5d00720b
Merge pull request #2391 from ClearlyClaire/glitch-soc/port-upstream-hashtags
...
Port upstream's hashtag handling to glitch-soc
2023-11-15 17:15:21 +01:00
Claire
bd575a1dd6
Add banner for forwarded reports made by remote users about remote content ( #27549 )
2023-11-15 14:18:43 +00:00
Matt Jankowski
fe58ac8d9f
Improve spec coverage for api/web/push_subscriptions controller ( #27858 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-15 13:14:51 +00:00
Claire
cd3a636b7f
[Glitch] Fix some remote posts getting truncated
...
Port 4d59dfb1c6
2023-11-15 12:59:06 +01:00
Eugen Rochko
6a8623588a
[Glitch] Fix colors and typography on hashtag bar in web UI
...
Port 10b06436d1
2023-11-15 12:56:58 +01:00
Claire
c226d00490
Fix interaction between CWs and hashtag bars
2023-11-15 12:56:58 +01:00
Claire
7ae45676c8
Fix hashtag bar styling
2023-11-15 12:56:58 +01:00
Claire
45690b01d1
[Glitch] Change hashtag bar tags to be de-emphasized
...
Port 613cfd625c
2023-11-15 12:56:58 +01:00
Renaud Chaput
fc514fa8c6
[Glitch] Better hashtag normalization when processing a post
...
Port 58acaa9ae6
2023-11-15 12:56:58 +01:00
Renaud Chaput
18462ee4b6
[Glitch] Remove hashtags from the last line of a status if it only contains hashtags
...
Port 061fd66ee6
2023-11-15 12:56:58 +01:00
Claire
2ce03420d6
[Glitch] Fix case-insensitive comparison of hashtags to do case-folding
...
Port 3ed2bf92d0
2023-11-15 12:56:58 +01:00
Claire
fe8d9f6221
[Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
...
Port f0862bcf98
2023-11-15 12:56:58 +01:00
Claire
a81ed84453
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
2023-11-15 12:56:58 +01:00
Claire
3b210e093a
Fix more code style discrepancies
2023-11-15 12:53:21 +01:00
Claire
542d95c2bc
Fix import style discrepancy
2023-11-15 12:53:21 +01:00
Claire
8b24a9a507
Fix missed relative import discrepancy
2023-11-15 12:53:21 +01:00
Claire
b1f0457cb8
Fix whitespace and comment discrepancies
2023-11-15 12:53:21 +01:00
Eugen Rochko
08ac91c40b
[Glitch] Fix follow relationships not loading after notifications fetch
...
Port 4f7f6b3922
2023-11-15 12:53:21 +01:00
Eugen Rochko
103c0ca4f7
[Glitch] Hide loading bar on status interactions
...
Port eb2425b53b
2023-11-15 12:53:21 +01:00
Claire
21653beb30
Reduce more unwarranted differences with upstream
2023-11-15 12:53:21 +01:00
Claire
7b922c2d90
Reduce unwarranted differences with upstream
...
Ports part of 0758b00bfd897199910f
2023-11-15 12:53:21 +01:00
Claire
2f61b65b1e
Remove dead code
2023-11-15 12:53:11 +01:00
Claire
9bbb0f13e0
Fix inconsistent React imports in JSX files ( #2466 )
2023-11-15 12:52:30 +01:00
Eugen Rochko
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
2023-11-15 11:13:53 +00:00
Claire
a97b722ad5
Reduce differences with upstream due to import style ( #2465 )
...
Fix relative / VS absolute style imports, and fix whitespace discrepancies
2023-11-15 12:01:51 +01:00
github-actions[bot]
d8074128f9
New Crowdin Translations (automated) ( #27866 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-15 09:41:24 +00:00
Jeong Arm
922f086253
Fix open status on media modal ( #27867 )
2023-11-15 09:29:10 +00:00
Claire
f7d3b74e03
Merge pull request #2389 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2023-11-15 09:42:30 +01:00
ppnplus
2b038b4f89
Added Thai diacritics and tone marks in HASHTAG_INVALID_CHARS_RE ( #26576 )
2023-11-14 15:33:59 +00:00
Matt Jankowski
7e1a77ea51
Add base class for api/v1/timelines/* controllers ( #27840 )
2023-11-14 14:53:31 +00:00
Matt Jankowski
d562fb8459
Specs for minimal CSP policy in Api:: controllers ( #27845 )
2023-11-14 14:34:30 +00:00
github-actions[bot]
c1e071f634
New Crowdin Translations (automated) ( #27848 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-14 10:53:47 +00:00
Matt Jankowski
1f8173ac5a
Extract private methods in api/v1/instances/domain_blocks ( #27844 )
2023-11-14 10:31:59 +00:00
Brian Holley
4aa06cbdbf
Fix "Hide these posts from home" list setting not refreshing when switching lists ( #27763 )
2023-11-14 00:39:54 +00:00
Matt Jankowski
b7807f3d84
Use normalizes to prepare Webhook#events value ( #27605 )
2023-11-13 22:47:44 +00:00
neatchee
bd6da814b5
Fix recurring "switch to advanced interface" warning by adding missing class to the navigation-panel__banner element
2023-11-13 13:20:51 -08:00
Claire
bac9e0b55d
Add variable delay before link verification of remote account links ( #27774 )
2023-11-13 16:17:05 +00:00
Matt Jankowski
0945e25b8f
Add Api::V1::Statuses::BaseController base controller class ( #27794 )
2023-11-13 14:53:22 +00:00
Eugen Rochko
7e3c10dec6
Add icons for private and disabled boost in web UI ( #27817 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-13 14:39:45 +00:00
pajowu
ed79713f3a
Fix modal content not being selectable ( #27813 )
2023-11-13 13:27:50 +00:00
Claire
07a4059901
Add support for invite codes in the registration API ( #27805 )
2023-11-13 13:27:00 +00:00
github-actions[bot]
e5a7b73ef4
New Crowdin Translations (automated) ( #27815 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-13 13:21:02 +00:00
Eugen Rochko
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
2023-11-13 09:58:28 +00:00
Essem
5526ded863
Refactor react services
2023-11-12 21:00:00 -06:00
GitHub Actions
46a28fc41f
New Crowdin translations
2023-11-11 04:27:29 +00:00
Essem
050212c35d
Fix reblog reactions
2023-11-10 17:37:22 -06:00
Essem
5222d41546
Add notification emails for reactions
2023-11-10 15:16:29 -06:00
github-actions[bot]
ac62b995ef
New Crowdin Translations (automated) ( #27804 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-10 13:07:04 +00:00
Matt Jankowski
43e2f763b2
Extract crutches_active_mentions from FeedManager ( #27785 )
2023-11-10 12:47:38 +00:00
Matt Jankowski
ac69f90098
Add Api::V1::Instances::BaseController base controller class ( #27797 )
2023-11-10 12:46:00 +00:00
Essem
19f2dabbba
Count gifvs as videos in attachment counts
2023-11-09 23:04:57 -06:00
Essem
5cf7306ed5
Merge remote-tracking branch 'plastikmensch/fix-onboarding-modal-opening-page-two'
2023-11-09 18:27:45 -06:00
Aleks Xhuvani
7840c6b75b
Do not try to update an undefined video element ( #27798 )
2023-11-09 22:35:53 +00:00
Claire
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
Matt Jankowski
548bb30b2a
Consolidate html page title output logic into helper ( #27563 )
2023-11-09 13:05:57 +00:00
Claire
9b06c0f24a
Fix Web UI not displaying appropriate explanation when a user hides their follows/followers ( #27791 )
2023-11-09 12:58:02 +00:00
Matt Jankowski
ce1bd81c85
Reduce complexity in StatusCacheHydrator ( #27783 )
2023-11-09 09:53:44 +00:00
Matt Jankowski
13c3e59601
Use helper method to build batched status edits in admin/statuses/show ( #27739 )
2023-11-08 13:04:52 +00:00
github-actions[bot]
5c328ae674
New Crowdin Translations (automated) ( #27768 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-08 12:40:09 +00:00
Matt Jankowski
7d6bcc0615
Remove unmatched rubocop:enable declaration ( #27769 )
2023-11-08 12:02:09 +00:00
João Pedro Marques
d3cd37d73e
Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )
2023-11-07 23:37:58 +00:00
Jasmin Johal
27cbdc6f22
Change alt text to empty string for avatars ( #21875 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-07 21:46:08 +00:00
Aleks Xhuvani
58f01a5c9a
Add volume saving/reuse to video player ( #27488 )
2023-11-07 18:15:38 +00:00
Renaud Chaput
f476d9dab2
Fix the notificationsUpdate call ( #27758 )
2023-11-07 14:18:59 +00:00
Matt Jankowski
45770c9306
Fix Performance/MapMethodChain cop ( #27744 )
2023-11-07 13:01:09 +00:00
Matt Jankowski
bbad5b6456
Remove false positive cop detection ( #27457 )
2023-11-07 10:44:15 +00:00
github-actions[bot]
1b28ab7263
New Crowdin Translations (automated) ( #27687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-07 09:03:59 +00:00
Matt Jankowski
d6f50839e1
Fix RSpec/SpecFilePathFormat cops ( #27730 )
2023-11-06 16:25:40 +00:00
Matt Jankowski
0c4e7c06dc
Fix Rails/FindEach cop ( #26886 )
2023-11-06 15:53:29 +00:00
Matt Jankowski
fe26f33e0a
Fix Rails/RedundantActiveRecordAllMethod cop ( #26885 )
2023-11-06 15:51:52 +00:00
zunda
e4e752c26e
Adjust transform origin for favorite star ( #27700 )
2023-11-06 11:14:46 +00:00
Claire
c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )
2023-11-06 09:28:14 +00:00
Essem
1483b2b13d
More cleanup
2023-11-05 22:29:44 -06:00
Essem
c774bf9204
Merge branch 'feature/gif-picker'
2023-11-05 21:18:58 -06:00
Essem
3370394510
Add Tenor GIF picker
...
Co-authored-by: koyu <me@koyu.space>
2023-11-05 21:09:26 -06:00
Essem
4200584ff3
A bit of cleanup
2023-11-05 20:10:42 -06:00
Essem
759ab62c7b
Quick hotfix for mastomodern buttons?
2023-11-05 19:37:47 -06:00
Essem
bc5d74cc16
Fix advanced toggle banner visibility on mobile
2023-11-05 15:17:15 -06:00
Renaud Chaput
6712bf86cd
Fixes website not loading for unlogged users ( #27698 )
2023-11-04 21:52:56 +00:00
Renaud Chaput
3bf2a7296e
Use Immutable Record for accounts in Redux state ( #26559 )
2023-11-03 15:00:03 +00:00
github-actions[bot]
2d548e273e
New Crowdin Translations (automated) ( #27646 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-03 10:10:13 +00:00
Claire
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
2023-11-02 14:58:37 +00:00
Essem
1b64242fa5
Update to mastomodern upstream
2023-11-01 22:42:03 -05:00
Essem
c2033b5a86
Fix large icons in vanilla mastomodern
2023-11-01 17:33:45 -05:00
mogaminsk
ac8e4ed38d
Fix inserting emojis from emoji picker fails with TypeError ( #27647 )
2023-11-01 07:22:02 +00:00
Renaud Chaput
277e6968f5
Use helpers to check environment in frontend ( #27633 )
2023-10-31 16:05:44 +00:00
Renaud Chaput
0e3401bc1c
Improve Babel configuration and automatically load polyfills ( #27333 )
2023-10-31 10:55:13 +00:00
Claire
9c8891b39a
Rewrite AutosuggestTextarea as Functional Component ( #27618 )
2023-10-31 10:17:37 +00:00
Claire
d649bbf28f
Add some more tests and clean up domain block controller ( #27469 )
2023-10-31 09:40:30 +00:00
github-actions[bot]
e5b7ae9576
New Crowdin Translations (automated) ( #27630 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-31 08:43:17 +00:00
Claire
6c52f8286b
Fix posts from force-sensitized accounts being able to trend ( #27620 )
2023-10-30 22:32:25 +00:00
Essem
0868c11651
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-30 14:42:53 -05:00
github-actions[bot]
a918208ec6
New Crowdin Translations (automated) ( #27596 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-30 14:19:25 +00:00
Ricardo Trindade
33f8c1c5eb
Remove version check from update cache_concern.rb ( #27592 )
2023-10-30 14:04:12 +00:00
Matt Jankowski
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
2023-10-27 16:20:40 +00:00
Jonathan de Jong
1cc512909c
Have Follow activities bypass availability ( #27586 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-27 14:55:00 +00:00
Claire
93e4cdc31b
Fix hashtag matching pattern matching some URLs ( #27584 )
2023-10-27 14:04:51 +00:00
SouthFox
08bdd5751e
Fix account click on detailed status ( #27587 )
2023-10-27 14:03:21 +00:00
Renaud Chaput
13d310e64d
Simplify column headers ( #27557 )
2023-10-27 13:21:07 +00:00
Matt Jankowski
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
2023-10-27 09:57:16 +00:00
Claire
bbf46cc418
Fix error and incorrect URLs in /api/v1/accounts/:id/featured_tags for remote accounts ( #27459 )
2023-10-27 08:35:21 +00:00
Jeong Arm
8f998cd96a
Handle featured collections without items ( #27581 )
2023-10-27 02:36:22 +00:00
Eugen Rochko
fa7e64df1d
Fix various icon styles in web UI ( #27579 )
2023-10-26 23:37:58 +00:00
Matt Jankowski
12550a6a28
Use Rails.env.local? shorthand method to check env ( #27519 )
2023-10-26 21:20:41 +00:00
Simon Rapilly
2d8f759a34
Add HTML lang attribute to preview card descriptions ( #27503 )
2023-10-26 20:34:15 +00:00
Claire
d2f52f7f64
Fix report processing notice not mentioning the report number when performing a custom action ( #27442 )
2023-10-26 17:03:31 +00:00
Mark T. Tomczak
ba8dcb50fe
Issue 26048: swap "muting" and "blocking" list options in settings -> Data Exports ( #26088 )
2023-10-26 14:08:25 +00:00
Claire
75255c01fc
Fix error when trying to delete already-deleted file with OpenStack Swift ( #27569 )
2023-10-26 13:09:48 +00:00
github-actions[bot]
3427b51d63
New Crowdin Translations (automated) ( #27567 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-26 11:05:47 +00:00
Renaud Chaput
537442853f
Use a context to propagate column-related Props, and remove forceUpdate usage ( #27548 )
2023-10-26 11:00:10 +00:00
Matt Jankowski
3ca974e101
Use next keyword in field loop in admin/accounts/index view ( #27559 )
2023-10-26 10:52:14 +00:00
Claire
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
2023-10-25 21:33:44 +00:00
Claire
36c8570e50
Fix HAML linting issue
2023-10-25 20:01:51 +02:00
Claire
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
2023-10-25 19:59:17 +02:00
Claire
235a4cfdc8
Fix batch attachment deletion when using OpenStack Swift ( #27554 )
2023-10-25 13:55:57 +00:00
Renaud Chaput
a4e6fe36cb
Add missing ban icons ( #27555 )
2023-10-25 12:47:37 +00:00
Matt Jankowski
70dbf84b9b
Solve simplest haml-lint Rubocop lints ( #27529 )
2023-10-25 12:38:01 +00:00
Matt Jankowski
c926f5fd67
Fix haml-lint UnnecessaryStringOutput for views ( #27531 )
2023-10-25 12:01:00 +00:00
Renaud Chaput
85d4846d8a
[Glitch] Fix <ColumnBackButtonSlim>
...
Port cb92cdf9af
2023-10-25 12:22:59 +02:00
Claire
6e9f89e5b6
Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc8a131fb7bc
2023-10-25 12:18:45 +02:00
Claire
ba527c071f
Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream changed how icons are handled, including on a line modified by
glitch-soc to bump the number of poll options.
Applied upstream's change, while keeping the increased number of poll
options.
2023-10-25 12:14:24 +02:00
github-actions[bot]
c85e0a6b04
New Crowdin Translations (automated) ( #27544 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-25 07:36:07 +00:00
Matt Jankowski
cec7f0ed72
Remove unused #error_explanation id from error partials ( #27536 )
2023-10-25 07:12:32 +00:00
Renaud Chaput
cb92cdf9af
Fix <ColumnBackButtonSlim> ( #27540 )
2023-10-24 20:43:55 +00:00
Renaud Chaput
f08ca3f042
Fix missing icon props ( #27539 )
2023-10-24 20:43:06 +00:00
Matt Jankowski
bc3afb6311
Update rails/ujs delegate method usage ( #27538 )
2023-10-24 20:38:19 +00:00
Claire
b19d4eb43d
Fix HAML linting issues
2023-10-24 20:53:58 +02:00
Claire
8123e86623
[Glitch] Fix double scroll bars in some columns in advanced interface
...
Port 37bbd3c106
2023-10-24 20:46:11 +02:00
Claire
b73e4b59fc
[Glitch] Fix history handling not properly handling states after update to react-router v5
...
Port 15182d1e5e
2023-10-24 20:34:30 +02:00
たいち ひ
c6f990997d
[Glitch] Rewrite emoji_unicode_mapping_light to TS
...
Port 9482810703
2023-10-24 20:33:55 +02:00
Claire
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
2023-10-24 20:31:20 +02:00
Claire
8a131fb7bc
Fix @rails/ujs imports
2023-10-24 20:23:31 +02:00
Claire
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
Eugen Rochko
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-10-24 17:45:08 +00:00
Claire
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
2023-10-24 19:31:14 +02:00
Eugen Rochko
69ea596e55
[Glitch] Fix explore page reloading when you navigate back to it in web UI
...
Port d9503a1965
2023-10-24 19:22:39 +02:00
Claire
e6c3d3c744
Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
2023-10-24 19:21:01 +02:00
Claire
57c0de949b
Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream changed how asset host CSP directives are used, and glitch-soc has
a pretty different CSP file.
It may be worth reconsidering the differences between upstream and glitch-soc
but for now, just port the change.
2023-10-24 19:17:20 +02:00
Claire
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
2023-10-24 19:05:18 +02:00
Claire
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
2023-10-24 19:03:16 +02:00
Renaud Chaput
9325cb5759
[Glitch] Convert <Button> to Typescript
...
Port 9d45a444f9
2023-10-24 19:03:16 +02:00
Eugen Rochko
1138d44c7d
[Glitch] Fix missing background behind dismissable banner in web UI
...
Port 33bd8eccd5
2023-10-24 18:46:08 +02:00
Claire
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
2023-10-24 18:41:20 +02:00
Essem
a2e88f3544
[Glitch] Fix some remote posts getting truncated
...
Port 4d59dfb
2023-10-24 10:19:12 -05:00
Essem
27c641a848
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-24 10:16:17 -05:00
Claire
15182d1e5e
Fix history handling not properly handling states after update to react-router v5 ( #27526 )
2023-10-24 13:24:57 +00:00
Matt Jankowski
714e3ae5b5
Use Rails 7.1 normalizes feature ( #27521 )
2023-10-24 10:06:10 +00:00
github-actions[bot]
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-24 09:51:34 +00:00
Matt Jankowski
e923bb9ec9
Use ENV.fetch in views, fixes rubocop haml-lint issue ( #27527 )
2023-10-24 09:30:14 +00:00
たいち ひ
9482810703
Rewrite emoji_unicode_mapping_light to TS ( #25444 )
...
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
2023-10-24 08:06:14 +00:00
Matt Jankowski
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
Claire
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )
2023-10-23 15:46:21 +00:00
Eugen Rochko
d9503a1965
Fix explore page reloading when you navigate back to it in web UI ( #27489 )
2023-10-23 17:07:13 +02:00
Claire
8b770ce811
Add warnings to report action logs ( #27425 )
2023-10-23 14:30:46 +02:00
Claire
99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain ( #27150 )
2023-10-23 14:27:57 +02:00
Claire
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
2023-10-23 14:19:38 +02:00
Claire
0ad66175bf
Fix incorrect proptypes from react-router-v5 update ( #27507 )
2023-10-23 11:39:53 +02:00
github-actions[bot]
70fd819935
New Crowdin Translations (automated) ( #27490 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-23 10:04:54 +02:00
Matt Jankowski
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
2023-10-23 09:50:02 +02:00
Renaud Chaput
9d45a444f9
Convert <Button> to Typescript ( #27492 )
2023-10-23 09:43:00 +02:00
Renaud Chaput
d6eacb79c6
[Glitch] Upgrade to react-router v5
...
Port 1b70d7ed7c
2023-10-21 22:14:24 +02:00
Claire
245513d630
Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream
2023-10-21 14:33:33 +02:00
Essem
c10194fc82
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-20 11:48:03 -05:00
Matt Jankowski
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
2023-10-20 15:32:16 +02:00
Claire
13688539bc
Fix processing LDSigned activities from actors with unknown public keys ( #27474 )
2023-10-20 10:45:46 +02:00
github-actions[bot]
284c719f64
New Crowdin Translations (automated) ( #27480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-20 10:11:40 +02:00
Eugen Rochko
33bd8eccd5
Fix missing background behind dismissable banner in web UI ( #27479 )
2023-10-20 04:08:13 +02:00
Renaud Chaput
5d9df170cf
[Glitch] Do not display the navigation banner in the logo container
...
Port 126cd7705d
2023-10-19 20:50:44 +02:00
Claire
cc000c8859
Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream
2023-10-19 20:48:22 +02:00
Brian Campbell
1a3248dc90
[Glitch] Consider shown and pending status in explore prompt calculation
...
Port f76e5111f0
2023-10-19 20:23:08 +02:00
Renaud Chaput
41f58e945c
[Glitch] The class props should be className
...
Port 10df97c542
2023-10-19 20:23:08 +02:00
Renaud Chaput
1b70d7ed7c
Upgrade to react-router v5 ( #25047 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-19 19:44:55 +02:00
Renaud Chaput
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
2023-10-19 19:36:08 +02:00
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Jeong Arm
68401fc426
[Glitch] Support "in:public" search filter
...
Port ad44d832b8
2023-10-19 18:56:18 +02:00
Essem
7d7d8e0c82
Fix mastomodern bottom bar
2023-10-19 11:13:52 -05:00
Matt Jankowski
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
2023-10-19 17:25:54 +02:00
Matt Jankowski
bcd0171e5e
Fix Lint/UselessAssignment cop ( #27472 )
2023-10-19 16:55:06 +02:00
github-actions[bot]
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-19 14:31:25 +02:00
Brian Campbell
f76e5111f0
Consider shown and pending status in explore prompt calculation ( #27466 )
...
Co-authored-by: Brian Campbell <brcampbell@beta.team>
2023-10-19 14:25:57 +02:00
Renaud Chaput
10df97c542
The class props should be className ( #27462 )
2023-10-19 13:22:44 +02:00
Emelia Smith
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
2023-10-18 14:10:07 +02:00
github-actions[bot]
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-18 11:08:10 +02:00
Matt Jankowski
63a2a4b074
Fix Performance/DeletePrefix cop ( #27448 )
2023-10-18 10:32:09 +02:00
Claire
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
Stanislas Signoud
8bbbd012d4
[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI
...
Port 935d54124e
2023-10-17 21:48:36 +02:00
Claire
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
Claire
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
2023-10-17 21:35:07 +02:00
Claire
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
2023-10-17 20:59:18 +02:00
Jeong Arm
ad44d832b8
Support "in:public" search filter ( #26976 )
2023-10-17 16:12:03 +02:00
Stanislas Signoud
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
2023-10-17 14:59:07 +02:00
Matt Jankowski
19900f647e
Add coverage for UnreservedUsernameValidator ( #25590 )
2023-10-17 13:05:28 +02:00
Matt Jankowski
33b073f77d
Extract partials from admin/reports/show view ( #27427 )
2023-10-16 18:07:17 +02:00
Matt Jankowski
8d0f12f776
Extract partials from admin/accounts/show view ( #27428 )
2023-10-16 18:02:15 +02:00
Matt Jankowski
08a376cbcb
Fix Style/CombinableLoops cop ( #27429 )
2023-10-16 16:36:28 +02:00
Matt Jankowski
c91c0175db
Extract card partial from disputes/strikes/show view ( #27426 )
2023-10-16 16:04:29 +02:00
Matt Jankowski
f5bc1f20e2
Add coverage for ExistingUsernameValidator ( #25592 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-16 15:41:23 +02:00
Claire
299aa71c8f
Fix handling of inLanguage attribute in preview card processing ( #27423 )
2023-10-16 15:24:14 +02:00
github-actions[bot]
13456efd7b
New Crowdin Translations (automated) ( #27410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-16 11:31:52 +02:00
KMY（雪あすか）
45bdd60f3c
Fix when unfollow a tag, my post also disappears from the home timeline ( #27391 )
2023-10-13 11:15:47 +02:00
github-actions[bot]
773d25e8df
New Crowdin Translations (automated) ( #27388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-13 11:01:40 +02:00
Essem
9990da927b
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-12 13:42:12 -05:00
Claire
c86ad45660
Change PWA start URL from /home to / ( #27377 )
2023-10-12 16:47:18 +02:00
github-actions[bot]
c348b904a5
New Crowdin Translations (automated) ( #27376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-12 10:07:40 +02:00
Matt Jankowski
d4c2dca874
Fix haml-lint InstanceVariables rule for auth/sessions/two_factor/o… ( #27372 )
2023-10-12 09:44:20 +02:00
Essem
9c0a4a6937
Update mastomodern to 1.8.1
2023-10-11 11:09:27 -05:00
Essem
84ea1a19fa
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-11 11:07:33 -05:00
Matt Jankowski
d7a8f6b658
Fix haml-lint InstanceVariables rule for relationships/account ( #27342 )
2023-10-11 17:06:26 +02:00
github-actions[bot]
f1ae72ba46
New Crowdin Translations (automated) ( #27364 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-11 16:37:01 +02:00
Matt Jankowski
f9abe700e7
Fix haml-lint InstanceVariables rule for auth/registrations/status ( #27341 )
2023-10-11 16:20:26 +02:00
Matt Jankowski
66becf9a1e
Fix haml-lint InstanceVariables rule for admin/reports/actions ( #27339 )
2023-10-11 15:58:33 +02:00
Claire
7d2cd7195b
Add variable delay before link verification of remote account links ( #27351 )
2023-10-11 15:14:18 +02:00
Claire
99c72830bc
[Glitch] Fix scroll position in thread view reseting when closing a modal
...
Port 9d1c3d0678
2023-10-10 19:53:59 +02:00
Claire
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
2023-10-10 19:53:41 +02:00
Essem
9b73910346
Revert "Update mastomodern to 1.8.0"
...
This reverts commit 0aea24cfb7
2023-10-10 12:25:47 -05:00
Essem
29f2a7d9f4
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-10 12:24:32 -05:00
Claire
27e84c0691
Fix duplicate reports being sent when reporting some remote posts ( #27355 )
2023-10-10 16:00:50 +02:00
Claire
9d1c3d0678
Fix scroll position in thread view reseting when closing a modal ( #27350 )
2023-10-10 11:35:32 +02:00
github-actions[bot]
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-10 10:06:37 +02:00
Claire
05159d2f94
[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread
...
Port 4c2aca777f
2023-10-09 21:15:59 +02:00
Claire
8ef1a95b1c
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
2023-10-09 21:14:57 +02:00
Renaud Chaput
7b325aa81b
[Glitch] Autofix missing comma and indentation in JS files
...
Port 774e1189d2
2023-10-09 21:14:25 +02:00
Claire
4a9cdfb928
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
Claire
b63d526590
[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread
...
Port c310374a2f
2023-10-09 21:11:44 +02:00
Claire
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
2023-10-09 21:10:47 +02:00
Claire
4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread ( #27338 )
2023-10-09 16:46:09 +02:00
Renaud Chaput
774e1189d2
Change eslint config to autofix missing comma and indentation in JS files ( #26711 )
2023-10-09 13:38:29 +02:00
Claire
c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread ( #27331 )
2023-10-09 12:21:02 +02:00
github-actions[bot]
89b48681cf
New Crowdin Translations (automated) ( #27321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-09 10:32:06 +02:00
Claire
967bd543bb
[Glitch] Fix auto-loading-more when not scrolled
...
Port 2b98e2ecd6
2023-10-08 17:34:10 +02:00
Claire
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
Claire
86c9c5afa0
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
Upstream changed the order of Action Controller filters for web app
controllers.
Glitch-soc has an extra filter due to its theming system.
Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to an extra newline in glitch-soc.
Removed that newline and applied upstream's changes.
2023-10-08 17:26:43 +02:00
Claire
ac2370778a
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
2023-10-08 17:21:12 +02:00
Claire
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
2023-10-08 17:10:39 +02:00
Michael Stanclift
8eb09c6f72
[Glitch] Keep version string displayed without breakpoints in UI
...
Port 5a437edc7f
2023-10-08 17:09:02 +02:00
Claire
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
2023-10-08 17:05:40 +02:00
Claire
e83059fd9d
[Glitch] Fix explore prompt appearing because of posts being received out of order
...
Port d80a819fc6
2023-10-08 17:03:40 +02:00
Claire
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
2023-10-08 16:53:05 +02:00
Claire
702d162998
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +02:00
Claire
d7fcd70023
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/cors.rb`:
Upstream refactored this file, and glitch-soc had local changes.
I could not find the rationale for the glitch-soc changes, so I
used upstream's version.
2023-10-08 16:41:56 +02:00
Michael Stanclift
cfc0da77ac
[Glitch] Fix retention dashboard not displaying correct month
...
Port 7fddeca190
2023-10-08 16:33:37 +02:00
Claire
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
Essem
eef26a5066
Revert "Change score half-life for trending posts from 2 hours to 1 hour ( #26915 )"
...
This reverts commit fc6825055b
2023-10-06 23:02:38 -05:00
Essem
0aea24cfb7
Update mastomodern to 1.8.0
2023-10-06 17:39:27 -05:00
Claire
3262d1f1b6
Fix incorrect serialization of regional languages in contentMap ( #27207 )
2023-10-06 17:46:04 +02:00
