Claire
03ccbb053b
Add role badges to the WebUI ( #25649 )
2023-07-27 16:05:24 +02:00
github-actions[bot]
4a9961e904
New Crowdin Translations (automated) ( #26072 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-26 13:46:16 +02:00
Matt Jankowski
b23699709a
Extract private methods in StatusCacheHydrator ( #26177 )
2023-07-26 09:50:48 +02:00
Matt Jankowski
430f87e554
Reformat large hash in ContextHelper module ( #26180 )
2023-07-26 09:46:11 +02:00
Christian Schmidt
aa8d37c422
Fix missing GIF badge in account gallery ( #26166 )
2023-07-26 03:33:31 +02:00
Christian Schmidt
28eb5e8f4c
Preserve translation on status re-import ( #26168 )
2023-07-25 20:29:31 +02:00
Claire
1d29569d89
Revert poll colors to green outside of compose form ( #26164 )
2023-07-25 15:32:59 +02:00
Eugen Rochko
ca6ff4f9a1
Add published_at attribute to preview cards ( #26153 )
2023-07-25 13:40:35 +02:00
Trevor Wolf
e6475f79d7
fix poll input active style ( #26162 )
2023-07-25 13:39:15 +02:00
Matt Jankowski
2a0b6be46a
Coverage for Auth::OmniauthCallbacks controller ( #26147 )
2023-07-25 09:46:57 +02:00
Eugen Rochko
b977a84e19
Add published date and author to news on the explore screen in web UI ( #26155 )
2023-07-25 00:57:15 +02:00
Christian Schmidt
6ac7dcf180
Fix lang for UI texts in link preview ( #26149 )
2023-07-24 23:01:31 +02:00
Eugen Rochko
a90d7ac141
Fix missing action label on sensitive videos and embeds in web UI ( #26135 )
2023-07-24 22:04:38 +02:00
Eugen Rochko
5db70fc514
Fix missing border on error screen in light theme in web UI ( #26152 )
2023-07-24 19:53:33 +02:00
gol-cha
633071d1d5
Fix UI Overlap with the loupe icon in the Explore Tab ( #26113 )
2023-07-24 17:56:20 +02:00
Claire
b5d8462fa8
Fix LinkCrawlWorker crashing on null created_at ( #26151 )
2023-07-24 17:55:36 +02:00
Vyr Cossont
e60eb89958
Add report.updated webhook ( #24211 )
2023-07-24 17:37:38 +02:00
Claire
783676dd10
Fix unexpected redirection to /explore after sign-in ( #26143 )
2023-07-24 16:06:32 +02:00
Christian Schmidt
bfa1f2a86f
Add lang attribute to trending links ( #26111 )
2023-07-24 13:48:23 +02:00
Trevor Wolf
d5a4ef8459
change poll form element colors to fit with the rest of the ui ( #26139 )
2023-07-24 13:48:09 +02:00
Eugen Rochko
9015e5b194
Change design of link previews in web UI ( #26136 )
2023-07-24 13:47:28 +02:00
Eugen Rochko
1c28a202fe
Remove 16:9 cropping from web UI ( #26132 )
2023-07-24 13:46:55 +02:00
Plastikmensch
6fb2982ec0
Apply padding to all notifications in notif-cleaning mode ( #2325 )
...
* Add missing padding to notif-cleaning for admin-sign-up
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Apply padding to all notification types instead
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-23 18:50:24 +02:00
Eugen Rochko
e7dec5699c
Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )
2023-07-23 17:55:20 +02:00
Eugen Rochko
5a5d8a9757
Fix focus and hover styles in web UI ( #26125 )
2023-07-23 17:55:13 +02:00
Nick Schonning
bb8b1b7c25
Update haml-lint 0.49.1 ( #26118 )
2023-07-23 17:48:16 +02:00
Plastikmensch
21fed4601f
Fix CW icon being on wrong side in app settings in RTL languages ( #2324 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-23 17:19:09 +02:00
Jeong Arm
15561ace1b
Fix relationship-tag background color ( #2322 )
2023-07-23 14:40:37 +02:00
github-actions[bot]
d6e767559c
New Crowdin translations ( #2319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-23 14:31:38 +02:00
Claire
cf9d76d4a1
Fix glitch local settings navigation items not being proper buttons ( #2320 )
2023-07-23 14:31:16 +02:00
Claire
1eed0d1bb7
Annotate doodle parameters to please eslint ( #2321 )
2023-07-23 14:31:05 +02:00
Claire
b255abbb75
Fix incorrect connect timeout in outgoing requests ( #26116 )
2023-07-22 20:42:31 +02:00
Claire
8933e41b19
Fix “Open in advanced web interface” being shown on mobile view ( #2318 )
...
Fixes #2307
2023-07-22 17:22:04 +02:00
github-actions[bot]
9279c388c5
New Crowdin translations ( #2317 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-22 09:53:26 +02:00
наб
1c6232f0da
Favourits -> Favorites ( #26109 )
2023-07-21 21:13:20 +02:00
gunchleoc
257fadcec4
Replace 'favourite' by 'favorite' for American English ( #26009 )
2023-07-21 19:09:13 +02:00
Claire
4cf27100c0
Use username as display name for suspended users or users with blank display names ( #25276 )
2023-07-21 13:20:53 +02:00
Trevor Wolf
e1c5bed7b4
change focus ui for keyboard only input ( #25935 )
2023-07-21 13:20:14 +02:00
Claire
70b4eb5baa
Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )
2023-07-21 13:14:30 +02:00
Claire
f3127af389
Clean up unused application records ( #24871 )
2023-07-21 13:13:16 +02:00
Claire
d6fae56d3f
Fix replica being used even if not explicitly defined ( #26074 )
2023-07-21 11:30:53 +02:00
Renaud Chaput
f31a9bd78e
Fix the crossorigin attribute ( #26096 )
2023-07-21 11:14:26 +02:00
github-actions[bot]
356f2fc4c5
New Crowdin translations ( #2314 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-21 09:26:08 +02:00
Claire
58b52b7a33
Add stricter protocol fields validation for accounts ( #25937 )
2023-07-20 18:23:48 +02:00
Matt Jankowski
549518a1a2
Fix haml-lint Rubocop Lint/UnusedBlockArguments cop ( #26039 )
2023-07-20 17:03:39 +02:00
Matt Jankowski
a4f826d4a8
Fix haml-lint Rubocop Style/NumericPredicate cop ( #26040 )
2023-07-20 15:13:06 +02:00
Stanislas Signoud
cf170761e7
Fix a missing redirection on getting-started in multi column mode ( #26070 )
2023-07-20 14:46:02 +02:00
Misty De Méo
9e19cfdb05
Paperclip: add support for Azure blob storage ( #23607 )
2023-07-19 09:02:49 +02:00
Christian Schmidt
540cced981
Wrong count in response when removing favourite/reblog ( #24365 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-19 09:02:30 +02:00
Matt Jankowski
4be315f0ae
Cleanup unused portions of statuses/status partial ( #26045 )
2023-07-19 08:44:16 +02:00
Claire
d315c684e4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream entirely refactored this, while we changed the docker repository
to upload to and disabled the “latest” tag.
Applied the repository change to `.github/workflows/build-*.yml`, as well
as disabling native ARMv64 builds.
- `README.md`:
We have a completely different README.
Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
Upstream refactored, we had an extra item.
Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
Upstream deleted this file, to be replaced by a request spec at
`spec/requests/api/v1/timelines/public_spec.rb`.
We had an extra bit about enabling the public timelines because we have
different defaults than upstream.
Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
Claire
4c50463116
New Crowdin updates ( #2306 )
...
* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (French, Quebec)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
2023-07-19 07:05:33 +02:00
github-actions[bot]
33a41a214a
New Crowdin Translations (automated) ( #26054 )
...
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 21:13:25 +02:00
Claire
e77bbcc463
Change request timeout handling to use a longer deadline ( #26055 )
2023-07-18 20:51:20 +02:00
Matt Jankowski
630744563f
Fix haml-lint InstanceVariables rule for auth/registrations/edit ( #26061 )
2023-07-18 18:10:52 +02:00
Matt Jankowski
d2e79d0df9
Fix haml-lint Rubocop Style/SymbolProc cop ( #26059 )
2023-07-18 17:43:04 +02:00
Matt Jankowski
fb30fb4d89
Fix haml-lint Rubocop Style/WordArray cop ( #26058 )
2023-07-18 17:25:41 +02:00
Matt Jankowski
359255c799
Fix haml-lint rubocop style negation cops ( #26057 )
2023-07-18 17:02:02 +02:00
Matt Jankowski
b9c408b344
Fix haml-lint ConsecutiveSilentScripts rule ( #26043 )
2023-07-18 09:25:37 +02:00
Claire
87d2e00e66
[Glitch] Fix “Back” button sometimes redirecting out of Mastodon
...
Port 80fa2baa3d
2023-07-17 19:12:09 +02:00
Claire
cb70bb8665
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Matt Jankowski
4bbb68d888
Fix haml-lint Rubocop Style/SlicingWithRange cop ( #25947 )
2023-07-17 18:18:13 +02:00
Claire
80fa2baa3d
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
2023-07-17 17:32:46 +02:00
Matt Jankowski
65d52af3e7
Fix haml-lint Rubocop Style/StringLiterals cop ( #25948 )
2023-07-17 16:57:18 +02:00
Jeong Arm
90a68ac5b5
Check if json body is null on Activitipub::ProcessingWorker ( #26021 )
2023-07-17 15:51:30 +02:00
Matt Jankowski
a522b40507
Fix haml-lint Rubocop Style/MinMaxComparison cop ( #25974 )
2023-07-17 15:38:04 +02:00
Matt Jankowski
af05a88ea8
Fix haml-lint Rubocop lambda cop ( #25946 )
2023-07-17 15:07:29 +02:00
Matt Jankowski
84c5baf149
Fix haml lint Rubocop Style/RedundantStringCoercion cop ( #25975 )
2023-07-17 14:08:56 +02:00
Claire
e8631f8e90
Remove unfollowed hashtag posts from home feed ( #26028 )
2023-07-17 13:56:28 +02:00
Michael Stanclift
df2d18c52a
[Glitch] Fix for "follows you" indicator in light web UI not readable
...
Port 40e20d687a
2023-07-17 13:01:47 +02:00
Terence Eden
d2500a89fc
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port 82b0cfce7e
2023-07-17 13:01:07 +02:00
Claire
0ef1efbe71
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-17 12:52:15 +02:00
Claire
a75c14ffc0
Fix ArgumentError in mailers when a user's timezone is blank ( #26025 )
2023-07-17 12:10:50 +02:00
Michael Stanclift
40e20d687a
Fix for "follows you" indicator in light web UI not readable ( #25993 )
2023-07-17 11:51:00 +02:00
Eugen Rochko
45a7291d2c
Fix not actually connecting to the configured replica ( #25977 )
2023-07-17 08:26:52 +02:00
Claire
84c0f759d3
Reduce dropdown menu margin and padding ( #2301 )
...
* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency
2023-07-16 18:23:07 +02:00
Terence Eden
82b0cfce7e
Prevent split line between icon and number on reposts & favourites ( #26004 )
2023-07-16 10:06:33 +02:00
Claire
37e01f530b
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
...
Port 528a8d0cbe
2023-07-14 13:01:31 +02:00
Stanislas Signoud
160af03565
[Glitch] Change links in multi-column mode so tabs are open in single-column mode
...
Port 663e9484e2
2023-07-14 13:01:31 +02:00
Claire
6a458a9baf
Remove layout glitch-soc settings
2023-07-14 13:01:31 +02:00
Eugen Rochko
37e80ae4c8
[Glitch] Fix dropdowns being disabled for logged out users in web UI
...
Port 3df957104a
2023-07-14 13:01:31 +02:00
Claire
8d5e9e02e9
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 618eb10d18
2023-07-13 22:42:15 +02:00
Claire
efa6d4416c
Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
Plastikmensch
7714478818
Fix notifications not loading when slow mode active ( #2292 )
...
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in f1de5093fb
2023-07-13 21:36:15 +02:00
Claire
b27efe7c22
Fix home timeline's regexp field
2023-07-13 19:33:58 +02:00
Claire
528a8d0cbe
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
2023-07-13 17:59:15 +02:00
Stanislas Signoud
663e9484e2
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
2023-07-13 17:18:09 +02:00
Claire
618eb10d18
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
Matt Jankowski
ecf7aa0fb3
Refactor Status.tagged_with_all for brakeman SQL injection warning ( #25941 )
2023-07-13 15:52:37 +02:00
Claire
c1bd8248c4
[Glitch] Fix follow link style in embeds
...
Port fc6d89573c
2023-07-13 14:52:36 +02:00
Renaud Chaput
e5f09f145a
[Glitch] Upgrade to typescript-eslint v6
...
Port a09ed92a77
2023-07-13 14:51:24 +02:00
Claire
90a0f97140
Fix incorrect types in DisplayName
2023-07-13 14:51:24 +02:00
Claire
3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Renaud Chaput
0e07aadfda
[Glitch] Convert Home timeline components to Typescript
...
Port f8302ec345
2023-07-13 14:21:08 +02:00
Claire
794ee87771
Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream
2023-07-13 14:02:28 +02:00
Claire
385eb83893
[Glitch] Upgrade to Prettier 3
...
Port 9094a65fd4
2023-07-13 14:01:40 +02:00
Claire
268e955aef
Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
Claire
c6212d89f8
Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
Claire
fc6d89573c
Fix follow link style in embeds ( #25965 )
2023-07-13 12:58:56 +02:00
Renaud Chaput
a09ed92a77
Upgrade to typescript-eslint v6 ( #25904 )
2023-07-13 11:49:16 +02:00
renovate[bot]
789459cea3
Update dependency rubocop-rails to v2.20.1 ( #25493 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-07-13 11:44:02 +02:00
Renaud Chaput
f8302ec345
Convert Home timeline components to Typescript ( #25583 )
2023-07-13 11:28:55 +02:00
Renaud Chaput
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
Michael Stanclift
9e5862608f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
2023-07-13 11:12:51 +02:00
Nick Schonning
1b1f9dff10
Update rubocop to v1.54.1 ( #25627 )
2023-07-13 11:11:55 +02:00
Matt Jankowski
5cdc196e44
Rails 7.0 update ( #25668 )
2023-07-13 09:36:07 +02:00
Claire
bd06bdf164
Fix various CSS issues
2023-07-12 19:13:31 +02:00
Eugen Rochko
8bc36b5084
Change markers API to use a replica ( #25851 )
2023-07-12 18:57:40 +02:00
Eugen Rochko
315002c1be
Change notifications API to use a replica ( #25874 )
2023-07-12 17:06:00 +02:00
Claire
1399e9d863
Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
Stanislas Signoud
3890b5c5fd
[Glitch] Fix sounds not being loaded from assets host
...
Port 01b9ee2b81
2023-07-12 16:00:20 +02:00
Claire
9af6f6db1a
Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
2023-07-12 15:54:58 +02:00
Trevor Wolf
7e3d2d3b4f
[Glitch] fix buttons showing inconsistent styles
...
Port 29c29410d2
2023-07-12 15:50:56 +02:00
Claire
05c57b674f
[Glitch] Fix filters not applying to explore tab
...
Port 047d44611b
2023-07-12 15:48:13 +02:00
Claire
e91c424b7c
[Glitch] Add forward_to_domains parameter to POST /api/v1/reports
...
Port 66693177ff
2023-07-12 15:47:43 +02:00
Claire
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
Eugen Rochko
70c0ba7e5b
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 7496c1b655
2023-07-12 15:43:10 +02:00
Claire
54b6b035a7
Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
2023-07-12 15:38:35 +02:00
Eugen Rochko
c2a5484268
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port 9f5eab728b
2023-07-12 15:34:12 +02:00
Claire
63ca7222d6
Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
fusagiko / takayamaki
f9042a3d40
[Glitch] simplify counters
...
Port 4106a801a0
2023-07-12 15:18:41 +02:00
alfe
4781c1f7eb
[Glitch] Rewrite <ShortNumber /> as FC and TS
...
Port b5c5e2bf36
2023-07-12 15:17:18 +02:00
Renaud Chaput
5a6f556541
[Glitch] Convert <DismissableBanner> to Typescript
...
Port 9203ab410c
2023-07-12 15:09:14 +02:00
Renaud Chaput
5cd9e85fbb
[Glitch] Fix translate button position
...
Port 7ff696d848
2023-07-12 15:05:24 +02:00
Claire
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
a64181f28b
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
Matt Jankowski
1b1ecf8ee2
Refactor Trends::Query to avoid brakeman sql injection warnings ( #25881 )
2023-07-12 14:19:20 +02:00
Renaud Chaput
8d20afe0aa
Update Stylelint ( #25819 )
2023-07-12 12:31:23 +02:00
Matt Jankowski
08421e7b90
Fix Naming/MemoizedInstanceVariableName cop ( #25928 )
2023-07-12 10:08:51 +02:00
Matt Jankowski
399a738c85
Fix Naming/AccessorMethodName cop ( #25924 )
2023-07-12 10:03:19 +02:00
Matt Jankowski
d98717ceef
Fix Style/SlicingWithRange cop ( #25923 )
2023-07-12 10:03:06 +02:00
Nick Schonning
96a8aa32ad
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
Stanislas Signoud
01b9ee2b81
Fix sounds not being loaded from assets host ( #25931 )
2023-07-12 03:02:32 +02:00
Stanislas Signoud
d36859f37e
Use invariant colors on notification toasts ( #25919 )
2023-07-11 23:30:21 +02:00
Trevor Wolf
29c29410d2
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
jsgoldstein
c6ac835588
Change searching with # to include account index ( #25638 )
2023-07-10 20:58:13 +02:00
Claire
047d44611b
Fix filters not applying to explore tab ( #25887 )
2023-07-10 19:33:07 +02:00
Claire
de3b86a5f8
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
2023-07-10 18:42:19 +02:00
Claire
66693177ff
Add forward_to_domains parameter to POST /api/v1/reports ( #25866 )
2023-07-10 18:26:56 +02:00
Matt Jankowski
482071a976
Refactor NotificationMailer to use parameterization ( #25718 )
2023-07-10 03:06:22 +02:00
Eugen Rochko
896f4ef2f6
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
2023-07-10 03:06:09 +02:00
Eugen Rochko
b945f16ddf
Fix trend calculation working on too many items at a time ( #25835 )
2023-07-08 20:16:48 +02:00
Eugen Rochko
7496c1b655
Change label and design of sensitive and unavailable media in web UI ( #25712 )
2023-07-08 20:05:33 +02:00
Matt Jankowski
6555c33503
Admin mailer parameterization ( #25759 )
2023-07-08 20:03:38 +02:00
Renaud Chaput
e75e734ac2
Remove unused missed_update state ( #25832 )
2023-07-08 20:02:14 +02:00
Eugen Rochko
703ff75549
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Eugen Rochko
3df957104a
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
Eugen Rochko
9f5eab728b
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
Eugen Rochko
6894f5c114
Add forwarding of reported replies to servers being replied to ( #25341 )
2023-07-08 20:00:02 +02:00
Kurtis Rainbolt-Greene
a27f2686ca
First pass at multi-database for read replica using Rails native adapter ( #25693 )
...
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
2023-07-08 19:45:36 +02:00
Renaud Chaput
9203ab410c
Convert <DismissableBanner> to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
alfe
b5c5e2bf36
Rewrite <ShortNumber /> as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
fusagiko / takayamaki
4106a801a0
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
Renaud Chaput
7ff696d848
Fix translate button position ( #25807 )
2023-07-08 00:12:31 +02:00
Claire
9ba89aeeb5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
2023-07-07 19:59:43 +02:00
Claire
9a0cbecd67
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
2023-07-07 18:10:17 +02:00
Claire
0b9ced4b0c
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
Claire
4c1f5cd847
Fix incorrect secondary button size ( #2276 )
2023-07-07 09:50:06 +02:00
Claire
3581e4be49
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
Claire
dab0be5aed
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
Claire
d7ed682130
Merge pull request from GHSA-9pxv-6qvf-pjwc
...
* Fix timeout handling of outbound HTTP requests
* Use CLOCK_MONOTONIC instead of Time.now
2023-07-06 15:06:23 +02:00
Claire
3445bdfa45
Merge pull request from GHSA-9928-3cp5-93fm
...
* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged
2023-07-06 15:05:05 +02:00
Claire
96dcfa9745
Merge pull request from GHSA-ccm4-vgcc-73hp
...
* Tighten allowed HTML in oEmbed-based preview cards
* Sanitize preview cards at render time
* Add `sandbox` attribute to preview card iframes
2023-07-06 15:03:33 +02:00
Eugen Rochko
3676bc46da
[Glitch] Fix regression of icon button colors in web UI
...
Port 12c6337c96
2023-07-05 13:31:26 +02:00
Trevor Wolf
fa02ad3b8c
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 5f31104e1f
2023-07-05 13:30:52 +02:00
Eugen Rochko
c66faebe43
[Glitch] Add button to see results for polls in web UI
...
Port 5b05451744
2023-07-05 12:42:24 +02:00
Eugen Rochko
7747947353
[Glitch] Add canonical link tags in web UI
...
Port 90911f4396
2023-07-05 12:41:52 +02:00
mogaminsk
0003a22bc1
[Glitch] Fix local live feeds does not expand
...
Port f3ca8aede9
2023-07-05 12:39:46 +02:00
forsamori
136ed77764
[Glitch] Add at-symbol prepended to mention span title
...
Port 7731fbbba7
2023-07-05 12:38:54 +02:00
Eugen Rochko
5b328d07e6
[Glitch] Change labels of live feeds tabs in web UI
...
Port 80fee1403f
2023-07-05 12:37:37 +02:00
Claire
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Eugen Rochko
90911f4396
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
Eugen Rochko
5b05451744
Add button to see results for polls in web UI ( #25726 )
2023-07-05 10:32:04 +02:00
Claire
cac4f7fdd7
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
2023-07-04 18:58:23 +02:00
Claire
1aa9197efd
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
2023-07-04 18:36:24 +02:00
Trevor Wolf
b34a0ff011
fix read more button overlapping thread line bug ( #25706 )
2023-07-04 14:57:46 +02:00
mogaminsk
f3ca8aede9
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
forsamori
7731fbbba7
Add at-symbol prepended to mention span title ( #25684 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-03 22:58:10 +02:00
Eugen Rochko
80fee1403f
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
Daniel M Brasil
2b877ad937
Fix /api/v2/search not working with following query param ( #25681 )
2023-07-03 18:06:57 +02:00
Eugen Rochko
12c6337c96
Fix regression of icon button colors in web UI ( #25679 )
2023-07-03 16:51:04 +02:00
Plastikmensch
bd0986e5d7
Add regex filter back to firehose ( #2266 )
...
* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 15:41:50 +02:00
Trevor Wolf
5f31104e1f
Change button colors to increase hover/focus contrast and consistency ( #25677 )
2023-07-03 11:32:31 +02:00
Plastikmensch
cd902b7fd4
Fix showing local only toots in "All" ( #2265 )
...
* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-03 07:00:38 +02:00
Claire
c33c8bc048
Show local-only posts in “All” by default, and add back option to toggle it
2023-07-02 20:28:02 +02:00
Claire
4885232358
Add users index on unconfirmed_email ( #25672 )
2023-07-02 19:41:35 +02:00
Claire
fe1735f409
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
2023-07-02 16:08:58 +02:00
mogaminsk
db90f2b456
[Glitch] Prevent duplicate concurrent calls of /api/*/instance in web UI
...
Port ee22b32aef
2023-07-02 12:00:03 +02:00
Eugen Rochko
f3140305f9
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port f504aded26
2023-07-02 11:59:31 +02:00
Claire
95da88be87
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port 6ca66c8cad
2023-07-02 11:58:51 +02:00
Renaud Chaput
bb5fddd588
[Glitch] Use an Immutable Record as the root state
...
Port 2751a6d716
2023-07-02 11:55:34 +02:00
Claire
f6ede7b089
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 1408b62211
2023-07-02 11:55:08 +02:00
Claire
34dd555a1c
[Glitch] Remove the search button from UI header when logged out
...
Port 7a47a52cd3
2023-07-02 11:54:47 +02:00
Claire
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
Eugen Rochko
edb6aab974
Revert "Rails 7 update" ( #25667 )
2023-07-02 11:14:22 +02:00
mogaminsk
ee22b32aef
Prevent duplicate concurrent calls of /api/*/instance in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
Eugen Rochko
f504aded26
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
Matt Jankowski
5cadbaa296
Rails 7 update ( #24241 )
2023-07-02 10:38:53 +02:00
Daniel M Brasil
2f17abc686
Fix HTTP 500 in /api/v1/emails/check_confirmation ( #25595 )
2023-07-02 00:05:44 +02:00
Claire
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
Vivianne
6c6857f7ad
Fixing an issue with a missing argument ( #2261 )
...
undefined
2023-07-01 22:55:43 +02:00
Matt Jankowski
843448c7d9
Fix rails rewhere deprecation warning in directories api controller ( #25625 )
2023-07-01 21:48:16 +02:00
Renaud Chaput
2751a6d716
Use an Immutable Record as the root state ( #25584 )
2023-06-30 17:03:25 +02:00
Claire
1408b62211
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
Claire
85dc0869a5
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
2023-06-29 14:48:54 +02:00
jsgoldstein
5d75bf9846
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-06-29 13:05:21 +02:00
Claire
7a47a52cd3
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
Renaud Chaput
bbe08e28cd
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ff9ed824db
2023-06-27 13:25:21 +02:00
Eugen Rochko
5e3d6a3433
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 66c513511c
2023-06-27 13:21:55 +02:00
Eugen Rochko
fa093eef89
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 1924660c5b
2023-06-27 13:21:14 +02:00
Claire
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
Claire
92fbaae7b6
Fix suspending an already-limited domain ( #25603 )
2023-06-27 12:32:51 +02:00
Claire
1569b36e28
Fix batch attachment deletion leaving empty directories ( #25587 )
2023-06-27 09:36:11 +02:00
S.H
2c6f88ad71
Remove media attachment only when file was exist ( #25586 )
2023-06-26 16:38:19 +02:00
Eugen Rochko
bcee25e36c
Change files to be deleted in batches instead of one-by-one ( #23302 )
2023-06-26 14:17:41 +02:00
Renaud Chaput
ff9ed824db
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
Claire
1164011bad
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
2023-06-26 12:30:35 +02:00
Eugen Rochko
65b5808421
Change header backgrounds to use fewer different colors in web UI ( #25577 )
2023-06-26 05:27:07 +02:00
Eugen Rochko
66c513511c
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
Eugen Rochko
1924660c5b
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Claire
a4e2d81804
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 7acdf21c77
2023-06-25 17:40:01 +02:00
Eugen Rochko
5660204731
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port ad92c48d71
2023-06-25 17:40:01 +02:00
Claire
7cd1b2d753
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port 9a27d4ec36
2023-06-25 17:40:01 +02:00
mogaminsk
34310c3924
[Glitch] Fix custom signup URL may not loaded
...
Port e87a2c676c
2023-06-25 14:27:46 +02:00
Ian
e7905c8b32
[Glitch] Change emoji picker icon
...
Port a56475866f
2023-06-25 14:27:46 +02:00
たいち ひ
f0999de66f
[Glitch] Rewrite <AutosuggestHashtag /> as FC and TS
...
Port 6c4a6bd115
2023-06-25 14:27:46 +02:00
Claire
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
Claire
3d50947e62
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
2023-06-24 17:24:31 +02:00
Eugen Rochko
1caf3a3933
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Claire
7acdf21c77
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
Eugen Rochko
ad92c48d71
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Claire
3406cb0427
Add POST /api/v1/conversations/:id/unread ( #25509 )
2023-06-22 18:46:43 +02:00
Claire
9a27d4ec36
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
Claire
d0144d2be3
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
2023-06-22 14:56:14 +02:00
Claire
c1c87fe7b9
Add finer permission requirements for managing webhooks ( #25463 )
2023-06-22 14:52:25 +02:00
mogaminsk
e87a2c676c
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
Ian
a56475866f
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00
Claire
5e5af7a0fe
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
2023-06-20 18:32:26 +02:00
Claire
ba5c12974a
Fix missing validation on default_privacy setting ( #25513 )
2023-06-20 18:32:14 +02:00
Claire
923dde8e6c
Fix wrong view being displayed when a webhook fails validation ( #25464 )
2023-06-20 18:15:35 +02:00
Claire
4e861795a4
Add translate="no" to outgoing mentions and links ( #25524 )
2023-06-20 18:10:19 +02:00
Emelia Smith
71d3100038
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
2023-06-20 18:04:35 +02:00
Claire
ecf17008e8
Fix user settings not getting validated ( #25508 )
2023-06-19 14:06:06 +01:00
たいち ひ
6c4a6bd115
Rewrite <AutosuggestHashtag /> as FC and TS ( #25481 )
2023-06-19 14:11:46 +02:00
Matt Jankowski
d05a68a12e
Reduce sleep time in request pool spec ( #25470 )
2023-06-19 13:48:25 +02:00
Matt Jankowski
eb10ac2b3e
Remove unused picture_hint helper method ( #25485 )
2023-06-19 09:04:15 +02:00
Daniel M Brasil
498e3231b6
Fix incorrect pagination headers in /api/v2/admin/accounts ( #25477 )
2023-06-19 08:53:05 +02:00
Claire
4e889e478f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
2023-06-18 16:14:29 +02:00
Claire
85f74ed0a7
Fix cross-origin loading of locales ( #25498 )
2023-06-18 15:47:04 +02:00
Claire
d5a295f8c0
[Glitch] Fix non-interactive upload container being given a button role and tabIndex
...
Port 7c70237d7e
2023-06-18 14:10:49 +02:00
Claire
7066e3d5ce
Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
Eugen Rochko
85041b74fb
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 239ee4f5d1
2023-06-18 12:11:58 +02:00
たいち ひ
5a38d538a0
[Glitch] Rewrite emoji_mart_data_light as TS
...
Port 6e0c48cbe8
2023-06-18 12:11:19 +02:00
alfe
7e24689b7d
[Glitch] Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
...
Port 293cf44626
2023-06-18 12:10:37 +02:00
Renaud Chaput
0e43f4d4fc
[Glitch] Add missing report category translation
...
Port b51a10a066
2023-06-18 10:43:07 +02:00
alfe
8cbdffe2c7
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port 569ff79fb8
2023-06-18 10:42:04 +02:00
Eugen Rochko
1ce44ec36e
[Glitch] Change "bot" label to "automated"
...
Port 272e099bce
2023-06-18 10:40:56 +02:00
Claire
f101b67a45
Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
Claire
7c70237d7e
Fix non-interactive upload container being given a button role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
Daniel M Brasil
4a994e5b50
Fix ArgumentError in /api/v1/admin/accounts/:id/action ( #25386 )
2023-06-14 15:21:36 +02:00
Eugen Rochko
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
Claire
a424076226
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
Eugen Rochko
989a8758e3
Change edit profile page ( #25413 )
2023-06-14 04:38:07 +02:00
Eugen Rochko
239ee4f5d1
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
2023-06-13 22:30:40 +02:00
たいち ひ
6e0c48cbe8
Rewrite emoji_mart_data_light as TS ( #25138 )
2023-06-13 19:28:31 +02:00
alfe
293cf44626
Rewrite <LoadingIndicator/> as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
Renaud Chaput
b51a10a066
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
Eugen Rochko
94ef94c5ea
Add unsubscribe link to e-mails ( #25378 )
2023-06-12 14:22:46 +02:00
Plastikmensch
a804371e21
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 868d478b1b
2023-06-11 13:33:45 +02:00
alfe
569ff79fb8
Rewrite <LoadPending /> as FC and TS ( #25363 )
2023-06-11 04:47:18 +02:00
Eugen Rochko
272e099bce
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
Claire
f49b12e06d
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
Claire
1c25f35ddf
Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
Claire
14788cf0ce
Switch to using a common runtime chunk rather than locales
2023-06-10 17:43:13 +02:00
Claire
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
Eugen Rochko
b5872b0686
[Glitch] Change design of dropdowns in web UI
...
Port 7abfddd8a5
2023-06-10 17:10:06 +02:00
alfe
ee6682e48d
[Glitch] Rewrite <LoadMore /> as FC and TS
...
Port f9c819e8db
2023-06-10 16:59:25 +02:00
Claire
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
Claire
29e63ef4d5
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 21f904b344
2023-06-10 16:38:03 +02:00
S.H
00307189bc
[Glitch] Fix not shown announcements in hometimeline.
...
Port 94f9888d57
2023-06-10 16:37:20 +02:00
Claire
3dd186bbf1
[Glitch] Fix design issues with recent react-intl upgrade
...
Port 4c2503d36c
2023-06-10 16:36:54 +02:00
Darius Kazemi
46b4268007
[Glitch] Add exclusive lists
...
Port 6debddcf89
2023-06-10 16:36:15 +02:00
Claire
60762fb8ba
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from c7a8838bd7
2023-06-10 16:30:36 +02:00
Jed Fox
2877b12754
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port 2d2750c6a9
2023-06-10 16:29:48 +02:00
Claire
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
2023-06-10 16:22:14 +02:00
Renaud Chaput
333c28ce6d
[Glitch] Fix /share and cleanup and reorganize frontend locale loading
...
Port 29851c83bd
2023-06-10 16:18:01 +02:00
Claire
3b87fe21fa
Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
S.H
7ccf99b652
[Glitch] Fix using Date.now() instead of intl.now()
...
Port 4e28b89f51
2023-06-10 15:21:04 +02:00
Claire
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
Claire
fd0b9c9881
[Glitch] Add a confirmation screen when suspending a domain
...
Port 8ee98cfd2b
2023-06-10 15:10:24 +02:00
Claire
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
Renaud Chaput
5715cd6b8a
[Glitch] Fix prev/next buttons color in media viewer
...
Port 40e756f291
2023-06-10 14:48:41 +02:00
Christian Schmidt
8b958c0858
[Glitch] Translate CW, poll options and media descriptions
...
Port 971eafc709
2023-06-10 14:48:41 +02:00
Claire
447b44a5d6
Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
2023-06-10 14:38:04 +02:00
Renaud Chaput
b428d82286
[Glitch] Upgrade react-intl
...
Port 76960f128a
2023-06-10 14:37:08 +02:00
Claire
c22b032483
Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
Eugen Rochko
1dd243cc09
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
Matt Jankowski
8b5680fd9a
Remove unused redis_info method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
jsgoldstein
975914e0a6
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
Eugen Rochko
66a5173629
Add legal as report category ( #23941 )
2023-06-06 23:41:59 +02:00
