monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,580 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

21580 Commits

Author SHA1 Message Date
Claire a6147a831f Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`

All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.

Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper.
 2024-05-01 14:25:47 +02:00
Claire 3024212403
Merge pull request #2698 from ClearlyClaire/glitch-soc/refactor/index-application 
Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss`
 2024-05-01 13:09:43 +02:00
Claire d6048d3a6c Add compatibility `app/javascript/flavours/glitch/styles/index.scss` 2024-04-30 21:27:04 +02:00
Claire 8a34c42341 Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss` 
This is just to reduce differences with upstream.
 2024-04-30 21:03:04 +02:00
Claire 6f74ede26b
Merge pull request #2697 from ClearlyClaire/glitch-soc/refactor/revamp-theming-system 
Simplify glitch-soc's theming system
 2024-04-30 20:41:38 +02:00
Matt Jankowski 7201f99cf8
Change default ruby version to 3.3.1 (#28013) 2024-04-29 07:41:59 +00:00
Claire e0a3662d7b Drop hardcoded reliance on vanilla flavor 2024-04-28 22:38:11 +02: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
Claire c3e12a4dfa Change how theme style packs are loaded 
Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack.
 2024-04-28 15:45:41 +02:00
Claire 93cdc66e64 Make `common` inheritence unconditional and simplify theming code 2024-04-28 15:06:48 +02:00
Claire dee57982f1 Rename “home” pack to “application” 2024-04-28 15:06:41 +02:00
Claire 9a8be8cf49 Remove theme fallback mechanism 
Remove the `fallback` property and do not fallback to using another flavour
when a pack is not available in the selected flavour.

Flavours should define all packs, and should they wish to piggy-back on
another one, they can import that other one's pack explicitly instead.
 2024-04-28 15:05:16 +02:00
Claire 62bc36416f Get rid of `app/javascript/core` 
Have all flavors implement everything they need instead.
 2024-04-28 15:04:52 +02:00
Renaud Chaput 65093c619f
Fix marker thunks to not ignore eslint directives for the whole file (#30089) 2024-04-26 17:11:27 +00:00
Claire de4a7bf531
Change moderation warning notification icon (#30081) 2024-04-26 15:33:15 +00:00
renovate[bot] 0cf6cf457d
Update dependency selenium-webdriver to v4.20.1 (#30060) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-26 15:32:48 +00:00
renovate[bot] 17e0a31fe3
Update dependency cssnano to v7 (#30061) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-26 15:32:38 +00:00
Michael Stanclift bb8c6346fb
Reword and rearrange Content Retention page (#27733) 2024-04-26 15:17:41 +00:00
Matt Jankowski b67b61b963
Ignore dotenv *.local files (#29932) 2024-04-26 14:50:39 +00:00
renovate[bot] ac82f34f7d
Update dependency pino to v9 (#30057) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-26 14:49:54 +00:00
Claire 91ca90e25b
Fix Idempotency-Key ignored when scheduling a post (#30084) 2024-04-26 13:19:02 +00:00
Claire e845594878
Fix moderator account being exposed in account moderation notification (#30082) 2024-04-26 12:42:06 +00:00
github-actions[bot] 5201882a23
New Crowdin Translations (automated) (#30077) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-26 10:05:18 +00:00
Claire 4ef0b48b95
Add in-app notifications for moderation actions/warnings (#30065) 2024-04-25 17:26:05 +00:00
Eugen Rochko 0ec061aa8f
Change design of people tab on explore in web UI (#30059) 2024-04-25 16:25:33 +00:00
github-actions[bot] 85fdbd0ad5
New Crowdin Translations (automated) (#30062) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-25 08:50:54 +00:00
Claire 113c931cda
Fix follow request notifications not being displayed (#2695) 2024-04-24 17:00:48 +02:00
Claire b79df709a8
Merge pull request #2693 from glitch-soc/i18n/crowdin/translations 
New Crowdin Translations (automated)
 2024-04-24 17:00:31 +02:00
Matt Jankowski d9eee9bf9a
Remove column defaults for `status_pins` timestamp columns (#29261) 2024-04-24 14:56:54 +00:00
Claire 0e071edccc Fix bogus translation files 2024-04-24 12:36:32 +02:00
Tim Rogers b128474625
Fixed rendering of excess whitespace in status card titles (#30017) 2024-04-24 09:09:21 +00:00
Matt Jankowski f4a53f3fb4
Extract constants for column size length validation limits (#30045) 2024-04-24 08:56:28 +00:00
github-actions[bot] ebcf9840f4
New Crowdin Translations (automated) (#30050) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-24 08:45:24 +00:00
Eugen Rochko 74012831f6
Change mute options to be in dropdown on muted users list in web UI (#30049) 2024-04-24 08:45:12 +00:00
Matt Jankowski b903e6909e
Disable `Style/HashAsLastArrayItem` cop (#30041) 2024-04-24 08:32:18 +00:00
Renaud Chaput 0e585b9a52
Update to Ruby 3.2.4 (#30036) 2024-04-24 08:21:05 +00:00
Matt Jankowski 3f6887557b
Move JS source from `packs` to `entrypoints` (#30037) 2024-04-23 16:45:12 +00:00
Matt Jankowski 32ead51e5a
Add material design icons to admin/settings views (#27780) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-23 16:43:49 +00:00
Claire a2399046ca
Fix string interpolation for software updates admin mailer (#30035) 2024-04-23 12:54:52 +00:00
Emelia Smith 049b159beb
Add read:me OAuth 2.0 scope, allowing more limited access to user data (#29087) 2024-04-23 11:47:00 +00:00
github-actions[bot] d754b15afb
New Crowdin Translations (automated) (#30034) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-23 09:07:05 +00:00
renovate[bot] 91c7406b59
Update dependency postcss-preset-env to v9.5.9 (#30029) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-23 08:41:50 +00:00
renovate[bot] 1471c0d4e0
Update dependency rubocop to v1.63.3 (#30031) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-04-23 08:41:33 +00:00
renovate[bot] 483fabf48a
Update dependency http to '~> 5.2.0' (#30027) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-22 14:02:47 +00:00
Claire 2ef098d01c
Revert "Rely on dotenv autoload instead of explicit call (#30007)" (#30028) 2024-04-22 14:02:24 +00:00
Matt Jankowski 33e829763d
Use shared `form` partial for `admin/domain_blocks` views (#29609) 2024-04-22 12:22:16 +00:00
Matt Jankowski ffbbf74c50
Limit `http` gem version to 5.1.x series (#30010) 2024-04-22 09:01:36 +00:00
Matt Jankowski 56b095edeb
Update Gemfile.lock ruby and bundler versions (#30011) 2024-04-22 09:01:24 +00:00
Tim Rogers 1ca6ff8ca5
Fixed crash when supplying FFMPEG_BINARY environment variable (#30022) 2024-04-22 09:00:24 +00:00
Tim Rogers 75163d9daf
Fixed rendering error on /start when not logged in (#30023) 2024-04-22 08:53:08 +00:00