349579e318
Fix more code discrepancies
2023-11-15 17:16:21 +01:00
1023c2f90b
Fix more whitespace and comment discrepancies
2023-11-15 17:16:21 +01:00
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
bd575a1dd6
Add banner for forwarded reports made by remote users about remote content ( #27549 )
2023-11-15 14:18:43 +00:00
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
cd3a636b7f
[Glitch] Fix some remote posts getting truncated
...
Port 4d59dfb1c6
2023-11-15 12:59:06 +01:00
6a8623588a
[Glitch] Fix colors and typography on hashtag bar in web UI
...
Port 10b06436d1
2023-11-15 12:56:58 +01:00
c226d00490
Fix interaction between CWs and hashtag bars
2023-11-15 12:56:58 +01:00
7ae45676c8
Fix hashtag bar styling
2023-11-15 12:56:58 +01:00
45690b01d1
[Glitch] Change hashtag bar tags to be de-emphasized
...
Port 613cfd625c
2023-11-15 12:56:58 +01:00
fc514fa8c6
[Glitch] Better hashtag normalization when processing a post
...
Port 58acaa9ae6
2023-11-15 12:56:58 +01:00
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
2ce03420d6
[Glitch] Fix case-insensitive comparison of hashtags to do case-folding
...
Port 3ed2bf92d0
2023-11-15 12:56:58 +01:00
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
a81ed84453
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
2023-11-15 12:56:58 +01:00
3b210e093a
Fix more code style discrepancies
2023-11-15 12:53:21 +01:00
542d95c2bc
Fix import style discrepancy
2023-11-15 12:53:21 +01:00
8b24a9a507
Fix missed relative import discrepancy
2023-11-15 12:53:21 +01:00
b1f0457cb8
Fix whitespace and comment discrepancies
2023-11-15 12:53:21 +01:00
08ac91c40b
[Glitch] Fix follow relationships not loading after notifications fetch
...
Port 4f7f6b3922
2023-11-15 12:53:21 +01:00
103c0ca4f7
[Glitch] Hide loading bar on status interactions
...
Port eb2425b53b
2023-11-15 12:53:21 +01:00
21653beb30
Reduce more unwarranted differences with upstream
2023-11-15 12:53:21 +01:00
7b922c2d90
Reduce unwarranted differences with upstream
...
Ports part of 0758b00bfd897199910f
2023-11-15 12:53:21 +01:00
2f61b65b1e
Remove dead code
2023-11-15 12:53:11 +01:00
9bbb0f13e0
Fix inconsistent React imports in JSX files ( #2466 )
2023-11-15 12:52:30 +01:00
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
2023-11-15 11:13:53 +00:00
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
d8074128f9
New Crowdin Translations (automated) ( #27866 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-15 09:41:24 +00:00
922f086253
Fix open status on media modal ( #27867 )
2023-11-15 09:29:10 +00:00
f7d3b74e03
Merge pull request #2389 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2023-11-15 09:42:30 +01:00
2b038b4f89
Added Thai diacritics and tone marks in HASHTAG_INVALID_CHARS_RE ( #26576 )
2023-11-14 15:33:59 +00:00
7e1a77ea51
Add base class for `api/v1/timelines/*` controllers ( #27840 )
2023-11-14 14:53:31 +00:00
d562fb8459
Specs for minimal CSP policy in `Api::` controllers ( #27845 )
2023-11-14 14:34:30 +00:00
c1e071f634
New Crowdin Translations (automated) ( #27848 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-14 10:53:47 +00:00
1f8173ac5a
Extract private methods in api/v1/instances/domain_blocks ( #27844 )
2023-11-14 10:31:59 +00:00
4aa06cbdbf
Fix "Hide these posts from home" list setting not refreshing when switching lists ( #27763 )
2023-11-14 00:39:54 +00:00
b7807f3d84
Use `normalizes` to prepare `Webhook#events` value ( #27605 )
2023-11-13 22:47:44 +00:00
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
bac9e0b55d
Add variable delay before link verification of remote account links ( #27774 )
2023-11-13 16:17:05 +00:00
0945e25b8f
Add `Api::V1::Statuses::BaseController` base controller class ( #27794 )
2023-11-13 14:53:22 +00:00
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
ed79713f3a
Fix modal content not being selectable ( #27813 )
2023-11-13 13:27:50 +00:00
07a4059901
Add support for invite codes in the registration API ( #27805 )
2023-11-13 13:27:00 +00:00
e5a7b73ef4
New Crowdin Translations (automated) ( #27815 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-13 13:21:02 +00:00
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
2023-11-13 09:58:28 +00:00
46a28fc41f
New Crowdin translations
2023-11-11 04:27:29 +00:00
ac62b995ef
New Crowdin Translations (automated) ( #27804 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-10 13:07:04 +00:00
43e2f763b2
Extract crutches_active_mentions from FeedManager ( #27785 )
2023-11-10 12:47:38 +00:00
ac69f90098
Add `Api::V1::Instances::BaseController` base controller class ( #27797 )
2023-11-10 12:46:00 +00:00
7840c6b75b
Do not try to update an undefined video element ( #27798 )
2023-11-09 22:35:53 +00:00
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
548bb30b2a
Consolidate html page title output logic into helper ( #27563 )
2023-11-09 13:05:57 +00:00
9b06c0f24a
Fix Web UI not displaying appropriate explanation when a user hides their follows/followers ( #27791 )
2023-11-09 12:58:02 +00:00
ce1bd81c85
Reduce complexity in `StatusCacheHydrator` ( #27783 )
2023-11-09 09:53:44 +00:00
13c3e59601
Use helper method to build batched status edits in `admin/statuses/show` ( #27739 )
2023-11-08 13:04:52 +00:00
5c328ae674
New Crowdin Translations (automated) ( #27768 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-08 12:40:09 +00:00
7d6bcc0615
Remove unmatched `rubocop:enable` declaration ( #27769 )
2023-11-08 12:02:09 +00:00
d3cd37d73e
Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )
2023-11-07 23:37:58 +00:00
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
58f01a5c9a
Add volume saving/reuse to video player ( #27488 )
2023-11-07 18:15:38 +00:00
f476d9dab2
Fix the `notificationsUpdate` call ( #27758 )
2023-11-07 14:18:59 +00:00
45770c9306
Fix `Performance/MapMethodChain` cop ( #27744 )
2023-11-07 13:01:09 +00:00
bbad5b6456
Remove false positive cop detection ( #27457 )
2023-11-07 10:44:15 +00:00
1b28ab7263
New Crowdin Translations (automated) ( #27687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-07 09:03:59 +00:00
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
2023-11-06 16:25:40 +00:00
0c4e7c06dc
Fix `Rails/FindEach` cop ( #26886 )
2023-11-06 15:53:29 +00:00
fe26f33e0a
Fix `Rails/RedundantActiveRecordAllMethod` cop ( #26885 )
2023-11-06 15:51:52 +00:00
e4e752c26e
Adjust transform origin for favorite star ( #27700 )
2023-11-06 11:14:46 +00:00
c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )
2023-11-06 09:28:14 +00:00
6712bf86cd
Fixes website not loading for unlogged users ( #27698 )
2023-11-04 21:52:56 +00:00
3bf2a7296e
Use Immutable `Record` for accounts in Redux state ( #26559 )
2023-11-03 15:00:03 +00:00
2d548e273e
New Crowdin Translations (automated) ( #27646 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-11-03 10:10:13 +00:00
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
2023-11-02 14:58:37 +00:00
ac8e4ed38d
Fix inserting emojis from emoji picker fails with TypeError ( #27647 )
2023-11-01 07:22:02 +00:00
277e6968f5
Use helpers to check environment in frontend ( #27633 )
2023-10-31 16:05:44 +00:00
0e3401bc1c
Improve Babel configuration and automatically load polyfills ( #27333 )
2023-10-31 10:55:13 +00:00
9c8891b39a
Rewrite `AutosuggestTextarea` as Functional Component ( #27618 )
2023-10-31 10:17:37 +00:00
d649bbf28f
Add some more tests and clean up domain block controller ( #27469 )
2023-10-31 09:40:30 +00:00
e5b7ae9576
New Crowdin Translations (automated) ( #27630 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-31 08:43:17 +00:00
6c52f8286b
Fix posts from force-sensitized accounts being able to trend ( #27620 )
2023-10-30 22:32:25 +00:00
a918208ec6
New Crowdin Translations (automated) ( #27596 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-30 14:19:25 +00:00
33f8c1c5eb
Remove version check from update cache_concern.rb ( #27592 )
2023-10-30 14:04:12 +00:00
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
2023-10-27 16:20:40 +00:00
1cc512909c
Have `Follow` activities bypass availability ( #27586 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-27 14:55:00 +00:00
93e4cdc31b
Fix hashtag matching pattern matching some URLs ( #27584 )
2023-10-27 14:04:51 +00:00
08bdd5751e
Fix account click on detailed status ( #27587 )
2023-10-27 14:03:21 +00:00
13d310e64d
Simplify column headers ( #27557 )
2023-10-27 13:21:07 +00:00
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
2023-10-27 09:57:16 +00:00
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
8f998cd96a
Handle featured collections without items ( #27581 )
2023-10-27 02:36:22 +00:00
fa7e64df1d
Fix various icon styles in web UI ( #27579 )
2023-10-26 23:37:58 +00:00
12550a6a28
Use `Rails.env.local?` shorthand method to check env ( #27519 )
2023-10-26 21:20:41 +00:00
2d8f759a34
Add HTML lang attribute to preview card descriptions ( #27503 )
2023-10-26 20:34:15 +00:00
d2f52f7f64
Fix report processing notice not mentioning the report number when performing a custom action ( #27442 )
2023-10-26 17:03:31 +00:00
ba8dcb50fe
Issue 26048: swap "muting" and "blocking" list options in settings -> Data Exports ( #26088 )
2023-10-26 14:08:25 +00:00
75255c01fc
Fix error when trying to delete already-deleted file with OpenStack Swift ( #27569 )
2023-10-26 13:09:48 +00:00
3427b51d63
New Crowdin Translations (automated) ( #27567 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-26 11:05:47 +00:00
537442853f
Use a context to propagate column-related Props, and remove `forceUpdate` usage ( #27548 )
2023-10-26 11:00:10 +00:00
3ca974e101
Use `next` keyword in field loop in admin/accounts/index view ( #27559 )
2023-10-26 10:52:14 +00:00
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
2023-10-25 21:33:44 +00:00
36c8570e50
Fix HAML linting issue
2023-10-25 20:01:51 +02:00
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
2023-10-25 19:59:17 +02:00
235a4cfdc8
Fix batch attachment deletion when using OpenStack Swift ( #27554 )
2023-10-25 13:55:57 +00:00
a4e6fe36cb
Add missing ban icons ( #27555 )
2023-10-25 12:47:37 +00:00
70dbf84b9b
Solve simplest haml-lint `Rubocop` lints ( #27529 )
2023-10-25 12:38:01 +00:00
c926f5fd67
Fix haml-lint `UnnecessaryStringOutput` for views ( #27531 )
2023-10-25 12:01:00 +00:00
85d4846d8a
[Glitch] Fix `<ColumnBackButtonSlim>`
...
Port cb92cdf9af
2023-10-25 12:22:59 +02:00
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
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
c85e0a6b04
New Crowdin Translations (automated) ( #27544 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-25 07:36:07 +00:00
cec7f0ed72
Remove unused `#error_explanation` id from error partials ( #27536 )
2023-10-25 07:12:32 +00:00
cb92cdf9af
Fix `<ColumnBackButtonSlim>` ( #27540 )
2023-10-24 20:43:55 +00:00
f08ca3f042
Fix missing icon props ( #27539 )
2023-10-24 20:43:06 +00:00
bc3afb6311
Update `rails/ujs` delegate method usage ( #27538 )
2023-10-24 20:38:19 +00:00
b19d4eb43d
Fix HAML linting issues
2023-10-24 20:53:58 +02:00
8123e86623
[Glitch] Fix double scroll bars in some columns in advanced interface
...
Port 37bbd3c106
2023-10-24 20:46:11 +02:00
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
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
8a131fb7bc
Fix `@rails/ujs` imports
2023-10-24 20:23:31 +02:00
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
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-10-24 17:45:08 +00:00
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
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
e6c3d3c744
Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
2023-10-24 19:21:01 +02:00
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
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
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
2023-10-24 19:03:16 +02:00
9325cb5759
[Glitch] Convert `<Button>` to Typescript
...
Port 9d45a444f9
2023-10-24 19:03:16 +02:00
1138d44c7d
[Glitch] Fix missing background behind dismissable banner in web UI
...
Port 33bd8eccd5
2023-10-24 18:46:08 +02:00
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
15182d1e5e
Fix history handling not properly handling states after update to react-router v5 ( #27526 )
2023-10-24 13:24:57 +00:00
714e3ae5b5
Use Rails 7.1 `normalizes` feature ( #27521 )
2023-10-24 10:06:10 +00:00
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-24 09:51:34 +00:00
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
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )
2023-10-23 15:46:21 +00:00
d9503a1965
Fix explore page reloading when you navigate back to it in web UI ( #27489 )
2023-10-23 17:07:13 +02:00
8b770ce811
Add warnings to report action logs ( #27425 )
2023-10-23 14:30:46 +02:00
99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain ( #27150 )
2023-10-23 14:27:57 +02:00
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
2023-10-23 14:19:38 +02:00
0ad66175bf
Fix incorrect proptypes from react-router-v5 update ( #27507 )
2023-10-23 11:39:53 +02:00
70fd819935
New Crowdin Translations (automated) ( #27490 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-23 10:04:54 +02:00
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
2023-10-23 09:50:02 +02:00
9d45a444f9
Convert `<Button>` to Typescript ( #27492 )
2023-10-23 09:43:00 +02:00
d6eacb79c6
[Glitch] Upgrade to react-router v5
...
Port 1b70d7ed7c
2023-10-21 22:14:24 +02:00
245513d630
Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream
2023-10-21 14:33:33 +02:00
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
2023-10-20 15:32:16 +02:00
13688539bc
Fix processing LDSigned activities from actors with unknown public keys ( #27474 )
2023-10-20 10:45:46 +02:00
284c719f64
New Crowdin Translations (automated) ( #27480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-20 10:11:40 +02:00
33bd8eccd5
Fix missing background behind dismissable banner in web UI ( #27479 )
2023-10-20 04:08:13 +02:00
5d9df170cf
[Glitch] Do not display the navigation banner in the logo container
...
Port 126cd7705d
2023-10-19 20:50:44 +02:00
cc000c8859
Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream
2023-10-19 20:48:22 +02:00
1a3248dc90
[Glitch] Consider shown and pending status in explore prompt calculation
...
Port f76e5111f0
2023-10-19 20:23:08 +02:00
41f58e945c
[Glitch] The `class` props should be `className`
...
Port 10df97c542
2023-10-19 20:23:08 +02:00
1b70d7ed7c
Upgrade to react-router v5 ( #25047 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-19 19:44:55 +02:00
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
2023-10-19 19:36:08 +02:00
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
68401fc426
[Glitch] Support "in:public" search filter
...
Port ad44d832b8
2023-10-19 18:56:18 +02:00
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
2023-10-19 17:25:54 +02:00
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
2023-10-19 16:55:06 +02:00
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-19 14:31:25 +02:00
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
10df97c542
The `class` props should be `className` ( #27462 )
2023-10-19 13:22:44 +02:00
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
2023-10-18 14:10:07 +02:00
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-18 11:08:10 +02:00
63a2a4b074
Fix `Performance/DeletePrefix` cop ( #27448 )
2023-10-18 10:32:09 +02:00
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
8bbbd012d4
[Glitch] Fix missing redirections to make sure /home redirect to the advanced UI
...
Port 935d54124e
2023-10-17 21:48:36 +02:00
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
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
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
ad44d832b8
Support "in:public" search filter ( #26976 )
2023-10-17 16:12:03 +02:00
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
2023-10-17 14:59:07 +02:00
19900f647e
Add coverage for `UnreservedUsernameValidator` ( #25590 )
2023-10-17 13:05:28 +02:00
33b073f77d
Extract partials from `admin/reports/show` view ( #27427 )
2023-10-16 18:07:17 +02:00
8d0f12f776
Extract partials from `admin/accounts/show` view ( #27428 )
2023-10-16 18:02:15 +02:00
08a376cbcb
Fix `Style/CombinableLoops` cop ( #27429 )
2023-10-16 16:36:28 +02:00
c91c0175db
Extract `card` partial from `disputes/strikes/show` view ( #27426 )
2023-10-16 16:04:29 +02:00
f5bc1f20e2
Add coverage for `ExistingUsernameValidator` ( #25592 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-16 15:41:23 +02:00
299aa71c8f
Fix handling of `inLanguage` attribute in preview card processing ( #27423 )
2023-10-16 15:24:14 +02:00
13456efd7b
New Crowdin Translations (automated) ( #27410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-16 11:31:52 +02:00
45bdd60f3c
Fix when unfollow a tag, my post also disappears from the home timeline ( #27391 )
2023-10-13 11:15:47 +02:00
773d25e8df
New Crowdin Translations (automated) ( #27388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-13 11:01:40 +02:00
c86ad45660
Change PWA start URL from `/home` to `/` ( #27377 )
2023-10-12 16:47:18 +02:00
c348b904a5
New Crowdin Translations (automated) ( #27376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-12 10:07:40 +02:00
d4c2dca874
Fix haml-lint `InstanceVariables` rule for auth/sessions/two_factor/o… ( #27372 )
2023-10-12 09:44:20 +02:00
d7a8f6b658
Fix haml-lint `InstanceVariables` rule for relationships/account ( #27342 )
2023-10-11 17:06:26 +02:00
f1ae72ba46
New Crowdin Translations (automated) ( #27364 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-11 16:37:01 +02:00
f9abe700e7
Fix haml-lint `InstanceVariables` rule for auth/registrations/status ( #27341 )
2023-10-11 16:20:26 +02:00
66becf9a1e
Fix haml-lint `InstanceVariables` rule for admin/reports/actions ( #27339 )
2023-10-11 15:58:33 +02:00
7d2cd7195b
Add variable delay before link verification of remote account links ( #27351 )
2023-10-11 15:14:18 +02:00
99c72830bc
[Glitch] Fix scroll position in thread view reseting when closing a modal
...
Port 9d1c3d0678
2023-10-10 19:53:59 +02:00
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
2023-10-10 19:53:41 +02:00
27e84c0691
Fix duplicate reports being sent when reporting some remote posts ( #27355 )
2023-10-10 16:00:50 +02:00
9d1c3d0678
Fix scroll position in thread view reseting when closing a modal ( #27350 )
2023-10-10 11:35:32 +02:00
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-10 10:06:37 +02:00
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
8ef1a95b1c
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
2023-10-09 21:14:57 +02:00
7b325aa81b
[Glitch] Autofix missing comma and indentation in JS files
...
Port 774e1189d2
2023-10-09 21:14:25 +02:00
4a9cdfb928
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
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
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
2023-10-09 21:10:47 +02:00
4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread ( #27338 )
2023-10-09 16:46:09 +02:00
774e1189d2
Change `eslint` config to autofix missing comma and indentation in JS files ( #26711 )
2023-10-09 13:38:29 +02:00
c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread ( #27331 )
2023-10-09 12:21:02 +02:00
89b48681cf
New Crowdin Translations (automated) ( #27321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-09 10:32:06 +02:00
967bd543bb
[Glitch] Fix auto-loading-more when not scrolled
...
Port 2b98e2ecd6
2023-10-08 17:34:10 +02:00
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
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
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
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
2023-10-08 17:10:39 +02:00
8eb09c6f72
[Glitch] Keep version string displayed without breakpoints in UI
...
Port 5a437edc7f
2023-10-08 17:09:02 +02:00
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
2023-10-08 17:05:40 +02:00
e83059fd9d
[Glitch] Fix explore prompt appearing because of posts being received out of order
...
Port d80a819fc6
2023-10-08 17:03:40 +02:00
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
2023-10-08 16:53:05 +02:00
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
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
cfc0da77ac
[Glitch] Fix retention dashboard not displaying correct month
...
Port 7fddeca190
2023-10-08 16:33:37 +02:00
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
3262d1f1b6
Fix incorrect serialization of regional languages in `contentMap` ( #27207 )
2023-10-06 17:46:04 +02:00
3171afc36a
Add Elasticsearch index size to Admin dashboard ( #27301 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-06 17:02:55 +02:00
340c390849
Fix crash when filtering for “dormant” relationships ( #27306 )
2023-10-06 12:58:16 +02:00
4d59dfb1c6
Fix some remote posts getting truncated ( #27307 )
2023-10-06 12:58:02 +02:00
e0b54ed3e1
New Crowdin Translations (automated) ( #27304 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-06 11:49:09 +02:00
2b98e2ecd6
Fix auto-loading-more when not scrolled ( #27286 )
2023-10-05 16:33:54 +02:00
32ab474472
New Crowdin Translations (automated) ( #27277 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-05 13:13:14 +02:00
3c13d70600
Add mention of YJIT in admin dashboard if enabled ( #27283 )
2023-10-05 13:10:17 +02:00
40ba6e119b
Fix Vary headers not being set on some redirects ( #27272 )
2023-10-05 09:50:08 +02:00
8e4251f9e7
New Crowdin Translations (automated) ( #27270 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-04 10:53:04 +02:00
68ec1d180a
Fix language sorting in settings ( #27158 )
2023-10-04 09:23:50 +02:00
c676bc91e9
Dont match mention in url query string ( #25656 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-03 17:01:45 +02:00
2f8f92df48
Fix Elastic check deprecation warning about gem version ( #27262 )
2023-10-03 15:52:47 +02:00
e715da6d25
Fix haml-lint Rubocop `Rails/*` cops ( #26042 )
2023-10-03 15:00:40 +02:00
37bbd3c106
Fix double scroll bars in some columns in advanced interface ( #27187 )
2023-10-03 13:12:39 +02:00
ceb365c419
Fix boosts of local users being filtered in account timelines ( #27204 )
2023-10-03 12:21:42 +02:00
4e55001e65
Add a short-lived lock to trend refresh scheduler ( #27253 )
2023-10-03 12:21:32 +02:00
5a437edc7f
Keep version string displayed without breakpoints in UI ( #26986 )
2023-10-03 11:52:21 +02:00
6320c52630
Change min age of backup policy from 1 week to 6 days ( #27200 )
2023-10-03 11:48:57 +02:00
770fd993ec
Fix importer returning negative row estimates ( #27258 )
2023-10-03 10:47:50 +02:00
e95d25e101
New Crowdin Translations (automated) ( #27260 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-03 10:47:28 +02:00
5e56f3db65
Change some worker lock TTLs ( #27246 )
2023-10-03 10:09:00 +02:00
7e7d6e695b
Fix incorrectly keeping outdated update notices absent from the API endpoint ( #27021 )
2023-10-02 16:42:52 +02:00
1e2d4975cf
Fix import progress not updating on certain failures ( #27247 )
2023-10-02 16:20:04 +02:00
ee866ec0e0
New Crowdin Translations (automated) ( #27220 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-02 13:35:29 +02:00
c2f13769cd
Add PWA shortcut to `/explore` page ( #27235 )
2023-10-02 13:18:16 +02:00
d80a819fc6
Fix explore prompt appearing because of posts being received out of order ( #27211 )
2023-09-29 15:51:36 +02:00
695e42de0d
New Crowdin Translations (automated) ( #27202 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-29 10:04:18 +02:00
340f1a68be
Simplify instance presenter view access ( #26046 )
2023-09-28 16:52:37 +02:00
Claire
Matt Jankowski
Eugen Rochko
Renaud Chaput
github-actions[bot]
Jeong Arm
ppnplus
Brian Holley
neatchee
pajowu
GitHub Actions
Aleks Xhuvani
João Pedro Marques
Jasmin Johal
zunda
mogaminsk
Ricardo Trindade
Jonathan de Jong
SouthFox
Simon Rapilly
Mark T. Tomczak
たいち ひ
Brian Campbell
Emelia Smith
Stanislas Signoud
KMY（雪あすか）
Michael Stanclift
gunchleoc
David Aaron
Jakob Gillich
Jake Anto