tobi
bf5366e127
[feature] Use instance settings for media attachment cap
2024-12-19 17:15:55 +01:00
tobi
c541d569cf
[chore] Use sloth flavour
2024-12-19 14:28:35 +01:00
tobi
7415961063
maoam
2024-12-18 12:07:50 +01:00
tobi
b8dd1e34bd
remove unused translation languages
2024-12-18 11:55:01 +01:00
tobi
934f50dc21
tweaky bombeeky
2024-12-18 11:39:49 +01:00
tobi
a21f6a9a6b
further tweaks
2024-12-17 11:34:02 +01:00
tobi
df322aacd4
source url
2024-12-16 14:40:16 +01:00
tobi
6d378b6b00
replace icons
2024-12-16 14:27:37 +01:00
tobi
0ba6ab88a9
weeeeeeeee
2024-12-15 17:19:57 +01:00
jwbjnwolf
915034f6a6
Revert "Remove layout glitch-soc settings"
...
Reverts 0d61985713
2024-07-17 16:41:39 +02:00
Laura Hausmann
3962700726
Fix 24:xx timestamps
2023-10-23 12:22:45 +02:00
Laura Hausmann
891d6c5fa5
Add domain to acct display in sidebar
2023-10-18 01:11:56 +02:00
Laura Hausmann
aa0801e1f3
Remove explore prompt
2023-10-18 01:05:23 +02:00
Laura Hausmann
1feffe4326
Ignore hashtag history if undefined
2023-10-14 15:03:34 +02:00
Laura Hausmann
aa27eaece4
Fix languages crash
2023-10-12 21:08:11 +02:00
Laura Hausmann
4a61246750
Remove issue templates
2023-10-12 21:01:51 +02:00
Laura Hausmann
114fd1a521
Update README
2023-10-12 20:26:48 +02:00
Laura Hausmann
ad151d2e3c
Revert to old profile actions icon
2023-10-12 20:24:20 +02:00
Laura Hausmann
6ac4848fbb
Merge remote-tracking branch 'upstream' into glitch
2023-10-12 20:16:41 +02:00
Laura Hausmann
d35cbe4473
Remove /deck prefix
2023-10-12 20:13:44 +02:00
Laura Hausmann
d7254bd332
Update default local-settings
2023-10-12 20:13:43 +02:00
Laura Hausmann
e6fd0de840
Update patchset to upstream glitch
2023-10-12 20:13:43 +02:00
Laura Hausmann
960614ec6f
Merge patchset from akko branch
2023-10-12 20:13:42 +02:00
Claire
45a19ddfe4
Merge pull request #2440 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 27e84c0691
2023-10-12 12:18:43 +02:00
Claire
99c72830bc
[Glitch] Fix scroll position in thread view reseting when closing a modal
...
Port 9d1c3d0678
2023-10-10 19:53:59 +02:00
Claire
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
2023-10-10 19:53:41 +02:00
Claire
1a4a23b5c8
Merge pull request #2439 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 4c2aca777f
2023-10-10 19:51:17 +02:00
Claire
27e84c0691
Fix duplicate reports being sent when reporting some remote posts ( #27355 )
2023-10-10 16:00:50 +02:00
Claire
9d1c3d0678
Fix scroll position in thread view reseting when closing a modal ( #27350 )
2023-10-10 11:35:32 +02:00
github-actions[bot]
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-10 10:06:37 +02:00
renovate[bot]
1745c582f8
Update dependency sidekiq to v6.5.11 ( #27345 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-10 09:52:09 +02:00
Claire
05159d2f94
[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread
...
Port 4c2aca777f
2023-10-09 21:15:59 +02:00
Claire
8ef1a95b1c
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
2023-10-09 21:14:57 +02:00
Renaud Chaput
7b325aa81b
[Glitch] Autofix missing comma and indentation in JS files
...
Port 774e1189d2
2023-10-09 21:14:25 +02:00
Claire
4a9cdfb928
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
Claire
b63d526590
[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread
...
Port c310374a2f
2023-10-09 21:11:44 +02:00
Claire
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
2023-10-09 21:10:47 +02:00
Claire
4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread ( #27338 )
2023-10-09 16:46:09 +02:00
Claire
9af24835f6
Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 640421f661
2023-10-09 15:44:35 +02:00
Laura Hausmann
d235afc303
Disable chunking
2023-10-09 13:53:35 +02:00
Laura Hausmann
9078917012
Update build commands
2023-10-09 13:39:47 +02:00
Renaud Chaput
774e1189d2
Change eslint config to autofix missing comma and indentation in JS files ( #26711 )
2023-10-09 13:38:29 +02:00
Claire
c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread ( #27331 )
2023-10-09 12:21:02 +02:00
github-actions[bot]
89b48681cf
New Crowdin Translations (automated) ( #27321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-09 10:32:06 +02:00
renovate[bot]
5fc5a548b4
Update DefinitelyTyped types (non-major) ( #27327 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-09 10:19:13 +02:00
renovate[bot]
eabe839744
Update eslint (non-major) ( #27328 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-09 09:43:42 +02:00
Claire
967bd543bb
[Glitch] Fix auto-loading-more when not scrolled
...
Port 2b98e2ecd6
2023-10-08 17:34:10 +02:00
Claire
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
Claire
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.
2023-10-08 17:26:43 +02:00
Claire
ac2370778a
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
2023-10-08 17:21:12 +02:00
