Claire
fe8d9f6221
[Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
...
Port f0862bcf98
2023-11-15 12:56:58 +01:00
Claire
a81ed84453
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
2023-11-15 12:56:58 +01:00
Claire
3b210e093a
Fix more code style discrepancies
2023-11-15 12:53:21 +01:00
Claire
542d95c2bc
Fix import style discrepancy
2023-11-15 12:53:21 +01:00
Claire
8b24a9a507
Fix missed relative import discrepancy
2023-11-15 12:53:21 +01:00
Claire
b1f0457cb8
Fix whitespace and comment discrepancies
2023-11-15 12:53:21 +01:00
Eugen Rochko
08ac91c40b
[Glitch] Fix follow relationships not loading after notifications fetch
...
Port 4f7f6b3922
2023-11-15 12:53:21 +01:00
Eugen Rochko
103c0ca4f7
[Glitch] Hide loading bar on status interactions
...
Port eb2425b53b
2023-11-15 12:53:21 +01:00
Claire
21653beb30
Reduce more unwarranted differences with upstream
2023-11-15 12:53:21 +01:00
Claire
7b922c2d90
Reduce unwarranted differences with upstream
...
Ports part of 0758b00bfd897199910f
2023-11-15 12:53:21 +01:00
Claire
2f61b65b1e
Remove dead code
2023-11-15 12:53:11 +01:00
Claire
9bbb0f13e0
Fix inconsistent React imports in JSX files ( #2466 )
2023-11-15 12:52:30 +01:00
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
Claire
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
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
Essem
5526ded863
Refactor react services
2023-11-12 21:00:00 -06:00
GitHub Actions
46a28fc41f
New Crowdin translations
2023-11-11 04:27:29 +00:00
Essem
050212c35d
Fix reblog reactions
2023-11-10 17:37:22 -06:00
Essem
5222d41546
Add notification emails for reactions
2023-11-10 15:16:29 -06:00
Essem
19f2dabbba
Count gifvs as videos in attachment counts
2023-11-09 23:04:57 -06:00
Essem
5cf7306ed5
Merge remote-tracking branch 'plastikmensch/fix-onboarding-modal-opening-page-two'
2023-11-09 18:27:45 -06:00
Essem
1483b2b13d
More cleanup
2023-11-05 22:29:44 -06:00
Essem
c774bf9204
Merge branch 'feature/gif-picker'
2023-11-05 21:18:58 -06:00
Essem
3370394510
Add Tenor GIF picker
...
Co-authored-by: koyu <me@koyu.space>
2023-11-05 21:09:26 -06:00
Essem
4200584ff3
A bit of cleanup
2023-11-05 20:10:42 -06:00
Essem
759ab62c7b
Quick hotfix for mastomodern buttons?
2023-11-05 19:37:47 -06:00
Essem
bc5d74cc16
Fix advanced toggle banner visibility on mobile
2023-11-05 15:17:15 -06:00
Essem
1b64242fa5
Update to mastomodern upstream
2023-11-01 22:42:03 -05:00
Essem
c2033b5a86
Fix large icons in vanilla mastomodern
2023-11-01 17:33:45 -05:00
Essem
0868c11651
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-10-30 14:42:53 -05:00
Claire
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
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
Matt Jankowski
9a3d047f3e
Run bin/rails app:update with Rails 7.1 ( #27522 )
2023-10-25 13:56:09 +00: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
Claire
fa65c8244f
Fix cache store pool config deprecation warnings ( #27551 )
2023-10-25 12:01:21 +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
renovate[bot]
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
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
