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
9bbb0f13e0
Fix inconsistent React imports in JSX files ( #2466 )
2023-11-15 12:52:30 +01: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
Claire
f7d3b74e03
Merge pull request #2389 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2023-11-15 09:42:30 +01: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
GitHub Actions
46a28fc41f
New Crowdin translations
2023-11-11 04:27:29 +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
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
