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

3681 Commits

Author SHA1 Message Date
Claire d6f9c97ae4 Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
Claire bac4026d80 Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream 2024-05-04 15:10:54 +02:00
Claire bceb45adda Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.

Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
 2024-05-04 14:59:00 +02:00
Claire 33368e3e79
Change ActiveRecordEncryption variable to be more explicit (#30151) 2024-05-03 09:26:24 +00:00
github-actions[bot] d5444a2c6c
New Crowdin Translations (automated) (#30160) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-03 09:15:06 +00:00
Matt Jankowski 1e7d5d2957
Update `devise-two-factor` to version 5.0.0 (#28325) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-02 09:31:41 +00:00
github-actions[bot] 309f352e6a
New Crowdin Translations (automated) (#30140) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-05-02 08:57:30 +00:00
Claire b039e62194 Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire eeefb7cdbc Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream 2024-05-01 19:42:34 +02:00
Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
 2024-05-01 19:38:34 +02:00
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 2024-05-01 19:30:41 +02:00
Claire 946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
 2024-05-01 18:56:48 +02:00
Claire 9ce82a35cb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire 3503fe1865 Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream 2024-05-01 17:26:21 +02:00
Claire 15f6d2d038 Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Conflict due to glitch-soc having a different default site name.
  Updated the tests as upstream did, keeping glitch-soc's default name.
 2024-05-01 17:22:02 +02:00
Claire 2c386d4cfe Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream 2024-05-01 17:06:49 +02:00
Claire 7f404fd635 Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream 2024-05-01 16:47:25 +02:00
Claire 3f61981f5d Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream 2024-05-01 14:50:16 +02:00
Claire 7b46517c38 Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
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
Matt Jankowski 75470f1256
Use implicit dotenv load (#30121) 2024-04-30 13:00:39 +00:00
github-actions[bot] 56821ed879
New Crowdin Translations (automated) (#30128) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-30 09:05:53 +00:00
github-actions[bot] 9be7efedf0
New Crowdin Translations (automated) (#30092) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-29 08:15:43 +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
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 62bc36416f Get rid of `app/javascript/core` 
Have all flavors implement everything they need instead.
 2024-04-28 15:04:52 +02:00
Michael Stanclift bb8c6346fb
Reword and rearrange Content Retention page (#27733) 2024-04-26 15:17:41 +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
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
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
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
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] 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
Tim Rogers 1ca6ff8ca5
Fixed crash when supplying FFMPEG_BINARY environment variable (#30022) 2024-04-22 09:00:24 +00:00
github-actions[bot] 3655fb6a22
New Crowdin Translations (automated) (#30014) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-22 08:42:35 +00:00
Matt Jankowski 18737aad49
Rely on dotenv autoload instead of explicit call (#30007) 2024-04-22 08:31:20 +00:00
Matt Jankowski 35b517c207
Remove remnants of capistrano (#30009) 2024-04-19 20:53:01 +00:00
Matt Jankowski 369b2ef0ed
Fix `Style/TrailingCommaInHashLiteral` cop (#30004) 2024-04-19 20:52:01 +00:00
Matt Jankowski c7384adc00
Fix `Style/TrailingCommaInArguments` cop (#30003) 2024-04-19 20:37:18 +00:00
Matt Jankowski 933189887b
Fix `Style/StringLiterals` cop (#30005) 2024-04-19 20:33:00 +00:00
Matt Jankowski 8d47ba893a
Fix `Style/PercentLiteralDelimiters` cop (#30006) 2024-04-19 20:32:26 +00:00
Matt Jankowski f386eb6c63
Replace deprecated `dotenv-rails` gem with `dotenv` gem (#29173) 2024-04-19 14:25:14 +00:00
github-actions[bot] ec71c02c4b
New Crowdin Translations (automated) (#29994) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-19 13:57:43 +00:00
github-actions[bot] 443186ff40
New Crowdin Translations (automated) (#29980) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-18 11:18:39 +00:00
Matt Jankowski 828299e71c
Enable AR Encryption (#29831) 2024-04-17 09:19:02 +00:00
github-actions[bot] c35042b7eb
New Crowdin Translations (automated) (#29972) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-17 09:07:13 +00:00
github-actions[bot] 285d4123b5
New Crowdin Translations (automated) (#29955) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-16 08:36:21 +00:00
github-actions[bot] 4e78cb9988
New Crowdin Translations (automated) (#29939) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-15 09:29:39 +00:00
Matt Jankowski 0d9ad96d3f
Rename `PremailerWebpackStrategy` -> `PremailerBundledAssetStrategy` (#29934) 2024-04-15 09:16:59 +00:00
github-actions[bot] 5992df0762
New Crowdin Translations (automated) (#29920) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-12 08:19:48 +00:00
github-actions[bot] 20b1e55f24
New Crowdin Translations (automated) (#29903) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-11 10:30:31 +00:00
github-actions[bot] 13faf26315
New Crowdin Translations (automated) (#29859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-08 13:44:54 +00:00
Claire 0e76b919b5 Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream 2024-04-06 21:48:35 +02:00
Claire 777984faeb Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 2024-04-06 20:01:25 +02:00
Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
 2024-04-06 19:35:21 +02:00
github-actions[bot] 8a64406d34
New Crowdin Translations (automated) (#2668) 
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-04-06 18:18:06 +02:00
github-actions[bot] 56d13069cd
New Crowdin Translations (automated) (#29836) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-03 09:04:29 +00:00
Matt Jankowski edde54e991
Update stoplight to version 4.1.0 (#28366) 2024-04-02 15:47:40 +00:00
github-actions[bot] c717747603
New Crowdin Translations (automated) (#29812) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-04-02 09:26:06 +00:00
github-actions[bot] f96648d41c
New Crowdin Translations (automated) (#29796) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-29 13:35:50 +00:00
github-actions[bot] 8a498f4e65
New Crowdin Translations (automated) (#29785) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-28 14:48:09 +00:00
github-actions[bot] 1025fff6b9
New Crowdin Translations (automated) (#29772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-27 21:19:03 +00:00
github-actions[bot] b3d970bdb8
New Crowdin Translations (automated) (#29756) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-26 09:49:19 +00:00
Renaud Chaput 02ea161506
Support "system" theme setting (light/dark theme depending on user system preference) (#29748) 
Co-authored-by: Nishiki Liu <hello@nshki.com>
 2024-03-26 09:25:49 +00:00
github-actions[bot] 799e3be9bd
New Crowdin Translations (automated) (#29726) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-25 11:07:38 +00:00
github-actions[bot] 5db5fa879b
New Crowdin Translations (automated) (#29708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-22 14:50:03 +00:00
Matt Jankowski a59f5694fe
Add empty line after ✨magic✨ frozen string comment (#29696) 2024-03-21 14:12:50 +00:00
github-actions[bot] c007dd5dd2
New Crowdin Translations (automated) (#29687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-21 09:57:45 +00:00
Claire 44bf7b8128
Add notifications of severed relationships (#27511) 2024-03-20 15:37:21 +00:00
Claire eb3aed9545 Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream touched a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-20 12:27:52 +01:00
github-actions[bot] 6c0b1a41a1
New Crowdin Translations (automated) (#29657) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-20 08:39:42 +00:00
Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2024-03-19 19:21:12 +01:00
Claire bc6f9befde
Change “Notifications” settings page to “E-mail notifications” (#29646) 2024-03-19 13:40:16 +00:00
Matt Jankowski 6c68c3c0ce
Introduce `inline_svg` gem, minimal usage, prep for material design icons (#29612) 2024-03-19 09:03:15 +00:00
github-actions[bot] 4e61bce4e9
New Crowdin Translations (automated) (#29641) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-19 08:36:52 +00:00
Claire cf08a438e7
Add badge on account card in report moderation interface when account is already suspended (#29592) 2024-03-19 08:20:53 +00:00
Matt Jankowski ecdbf15ebe
Remove unused `link_to_older` and `link_to_newer` helper methods (#29620) 2024-03-18 08:54:46 +00:00
github-actions[bot] 04817e965a
New Crowdin Translations (automated) (#29623) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-18 08:47:48 +00:00
Claire 82c2af0356
Fix `user_mailer.welcome.hashtags_recent_count` not having plural form (#29607) 2024-03-16 16:38:20 +00:00
Claire 2e49bc97b0 Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2024-03-15 12:20:32 +01:00
github-actions[bot] 6865fda593
New Crowdin Translations (automated) (#29603) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-15 10:02:10 +00:00
Claire e91ede5be6 Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2024-03-14 17:27:16 +01:00
Matt Jankowski 049d9171eb
Use `with_options` for shared option in `accounts#show` routing block (#28914) 2024-03-14 10:03:38 +00:00
Matt Jankowski 79e7590578
Clean up `activitypub` module route scope near instance actor (#29579) 2024-03-14 09:18:46 +00:00
Matt Jankowski 65e8349980
Clean up `activitypub` module route scope near collections/boxes (#29580) 2024-03-14 09:18:41 +00:00
Matt Jankowski 18ffd4d925
Add module `instances` route scope in api routes (#29581) 2024-03-14 09:18:36 +00:00
Matt Jankowski 01ecc80118
Add module `accounts` route scope in api routes (#29582) 2024-03-14 09:18:31 +00:00
github-actions[bot] 5aea35de13
New Crowdin Translations (automated) (#29587) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-14 09:00:42 +00:00
Claire 48134bcd10 Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream 2024-03-13 20:13:29 +01:00
Claire 27ffc09847 Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream 2024-03-13 18:56:40 +01:00
github-actions[bot] 171948b910
New Crowdin Translations (automated) (#29563) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-13 12:42:44 +00:00
github-actions[bot] dc36b961aa
New Crowdin Translations (automated) (#29554) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-12 09:03:51 +00:00
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2024-03-11 17:29:07 +01:00
Matt Jankowski a38e424185
Use unchanging github links in docs/comments (#29545) 2024-03-11 15:14:55 +00:00
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2024-03-11 15:02:21 +00:00