Claire
73f77c49d8
Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
Bumped the Mastodon API version as upstream did.
2026-03-16 18:16:56 +01:00
Matt Jankowski
1a464bc5ed
Use to_json in simple view hash data-props build locations ( #38218 )
2026-03-16 14:02:52 +00:00
Claire
f49940db85
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
...
Too many conflicts to list, because of webpack → vite migration.
2025-05-25 14:36:51 +02:00
Echo
c4f47adb49
Convert from Webpack to Vite ( #34450 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2025-05-16 13:26:12 +00:00
Claire
7208edbd37
Replace use_pack, layouts/theme and @theme by new helpers
...
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
2024-04-28 15:45:42 +02:00
Eugen Rochko
9b1f2a4b61
Add subresource integrity for JS and CSS assets ( #15096 )
...
Fix #2744
2020-11-06 11:56:31 +01:00
Thibaut Girka
1488be7d96
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
Eugen Rochko
e5cee8062f
Fix blurhash and autoplay not working on public pages ( #11585 )
2019-08-16 19:15:05 +02:00
kibigo!
bdbbd06dad
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
Eugen Rochko
3c6503038e
Add protocol handler. Handle follow intents ( #4511 )
...
* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS
2017-08-14 04:53:31 +02:00
