0c727a6790
Fix more import style discrepancies
2023-11-15 17:16:21 +01:00
50eb673494
Fix some markup discrepancies
2023-11-15 17:16:21 +01:00
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
7a877ae3d8
Merge pull request #2467 from ClearlyClaire/glitch-soc/cleanup
...
Misc cleanup and backports
2023-11-15 17:14:14 +01: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
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
f7d3b74e03
Merge pull request #2389 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2023-11-15 09:42:30 +01:00
02582f7e50
Merge pull request #2464 from neatchee/pr/glitch/mobile_singlecolumn_warning_fix
...
Fix recurring "switch to advanced interface" warning by adding missing…
2023-11-15 07:21:16 +01: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
46a28fc41f
New Crowdin translations
2023-11-11 04:27:29 +00:00
59893a4eab
Merge pull request #2449 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 9a3d047f3e
2023-10-27 17:45:19 +02: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
9a3d047f3e
Run `bin/rails app:update` with Rails 7.1 ( #27522 )
2023-10-25 13:56:09 +00: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
fa65c8244f
Fix cache store pool config deprecation warnings ( #27551 )
2023-10-25 12:01:21 +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
f261b6499f
Update dependency node to 20.9 ( #27534 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-25 07:16:19 +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
Claire