c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
1 year ago
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`.
1 year ago
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.
1 year ago
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
1 year ago
13456efd7b
New Crowdin Translations (automated) ( #27410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
773d25e8df
New Crowdin Translations (automated) ( #27388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
c348b904a5
New Crowdin Translations (automated) ( #27376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
f1ae72ba46
New Crowdin Translations (automated) ( #27364 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
99c72830bc
[Glitch] Fix scroll position in thread view reseting when closing a modal
...
Port 9d1c3d0678
1 year ago
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
1 year ago
9d1c3d0678
Fix scroll position in thread view reseting when closing a modal ( #27350 )
1 year ago
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
05159d2f94
[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread
...
Port 4c2aca777f
1 year ago
8ef1a95b1c
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
1 year ago
7b325aa81b
[Glitch] Autofix missing comma and indentation in JS files
...
Port 774e1189d2
1 year ago
4a9cdfb928
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
1 year ago
b63d526590
[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread
...
Port c310374a2f
1 year ago
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
1 year ago
4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread ( #27338 )
1 year ago
774e1189d2
Change `eslint` config to autofix missing comma and indentation in JS files ( #26711 )
1 year ago
c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread ( #27331 )
1 year ago
89b48681cf
New Crowdin Translations (automated) ( #27321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
967bd543bb
[Glitch] Fix auto-loading-more when not scrolled
...
Port 2b98e2ecd6
1 year ago
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
1 year ago
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.
1 year ago
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
1 year ago
8eb09c6f72
[Glitch] Keep version string displayed without breakpoints in UI
...
Port 5a437edc7f
1 year ago
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
1 year ago
e83059fd9d
[Glitch] Fix explore prompt appearing because of posts being received out of order
...
Port d80a819fc6
1 year ago
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
1 year ago
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.
1 year ago
cfc0da77ac
[Glitch] Fix retention dashboard not displaying correct month
...
Port 7fddeca190
1 year ago
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
1 year ago
4d59dfb1c6
Fix some remote posts getting truncated ( #27307 )
1 year ago
e0b54ed3e1
New Crowdin Translations (automated) ( #27304 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
2b98e2ecd6
Fix auto-loading-more when not scrolled ( #27286 )
1 year ago
32ab474472
New Crowdin Translations (automated) ( #27277 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
8e4251f9e7
New Crowdin Translations (automated) ( #27270 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
37bbd3c106
Fix double scroll bars in some columns in advanced interface ( #27187 )
1 year ago
5a437edc7f
Keep version string displayed without breakpoints in UI ( #26986 )
1 year ago
e95d25e101
New Crowdin Translations (automated) ( #27260 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
ee866ec0e0
New Crowdin Translations (automated) ( #27220 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
d80a819fc6
Fix explore prompt appearing because of posts being received out of order ( #27211 )
1 year ago
695e42de0d
New Crowdin Translations (automated) ( #27202 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
1da3c588ca
Fix link handling of mentions in user profiles when logged out ( #27185 )
1 year ago
b93ce7d8b3
New Crowdin Translations (automated) ( #27168 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
6d0767558a
Make notification respect reduce-motion ( #27178 )
1 year ago
7fddeca190
Fix retention dashboard not displaying correct month ( #27180 )
1 year ago
1eeaa0d84f
[Glitch] Fix width of large text icon buttons
...
Port 38753acaa5
1 year ago
ca7d16912e
[Glitch] Fix line wrapping of language selection button with long locale codes
...
Port 88fa8e710a
1 year ago
Claire
Stanislas Signoud
github-actions[bot]
Renaud Chaput
Michael Stanclift
Christian Schmidt
gunchleoc