mirrors
/
catstodon
mirror of https://git.kescher.at/CatCatNya/catstodon.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity
22,266 Commits
5 Branches
114 Tags
270 MiB
develop
main
essem/emoji-reactions-plus-upstream
merge/emoji-reactions
merge/filtering
v4.3.0-alpha.3+glitch+cat+1.2.2
v4.3.0-alpha.3+glitch+cat+1.2.1
v4.3.0-alpha.3+glitch+cat+1.2.0
v4.3.0-alpha.3+glitch+cat+1.1.3
v4.3.0-alpha.3+glitch+cat+1.1.2
v4.3.0-alpha.3+glitch+cat+1.1.1
v4.3.0-alpha.3+glitch+cat+1.1.0
v4.3.0-alpha.3+glitch+cat+1.0.9
v4.3.0-alpha.3+glitch+cat+1.0.8
v4.3.0-alpha.3+glitch+cat+1.0.7
v4.3.0-alpha.3+glitch+cat+1.0.6
v4.3.0-alpha.3+glitch+cat+1.0.5
v4.3.0-alpha.3+glitch+cat+1.0.4
v4.3.0-alpha.3+glitch+cat+1.0.3
v4.3.0-alpha.3+glitch+cat+1.0.2
v4.3.0-alpha.3+glitch+cat+1.0.1
v4.3.0-alpha.3+glitch+cat+1.0.0
v4.3.0-alpha.2+glitch+cat+1.0.18
v4.3.0-alpha.1+glitch+cat+1.0.17
v4.3.0-alpha.1+glitch+cat+1.0.16
v4.3.0-alpha.1+glitch+cat+1.0.15
v4.3.0-alpha.0+glitch+cat+1.0.14
v4.3.0-alpha.0+glitch+cat+1.0.13
v4.3.0-alpha.0+glitch+cat+1.0.12
v4.3.0-alpha.0+glitch+cat+1.0.11
v4.3.0-alpha.0+glitch+cat+1.0.10
v4.3.0-alpha.0+glitch+cat+1.0.9
v4.3.0-alpha.0+glitch+cat+1.0.8
v4.3.0-alpha.0+glitch+cat+1.0.7
v4.3.0-alpha.0+glitch+cat+1.0.6
v4.3.0-alpha.0+glitch+cat+1.0.5
v4.3.0-alpha.0+glitch+cat+1.0.4
v4.3.0-alpha.0+glitch+cat+1.0.3
v4.3.0-alpha.0+glitch+cat+1.0.2
v4.3.0+1.0.1
v4.3.0+1.0.0
4.0.1+1.0.0
4.0.1+1.0.1
4.0.1+1.0.2
4.0.1+1.0.3
4.0.1+1.0.4
v3.5.3+1.0.0
v3.5.3+1.0.1
v3.5.3+1.0.3
v3.5.3+1.0.4
v3.5.3+1.0.5
v3.5.3+1.0.6
v3.5.3+1.0.7
v3.5.3+1.0.8
v3.5.3+1.0.9
v3.5.3+1.1.0
v3.5.3+1.1.1
v3.5.3+1.1.2
v3.5.3+1.1.3
v3.5.3+1.1.4
v3.5.3+1.1.5
v3.5.3+1.1.6
v3.5.3+1.2.1
v3.5.3+1.2.2
v3.5.3+1.2.3
v4.0.0+1.0.0
v4.0.2+1.0.0
v4.0.2+1.0.1
v4.0.2+1.0.10
v4.0.2+1.0.11
v4.0.2+1.0.12
v4.0.2+1.0.13
v4.0.2+1.0.2
v4.0.2+1.0.3
v4.0.2+1.0.4
v4.0.2+1.0.5
v4.0.2+1.0.6
v4.0.2+1.0.7
v4.0.2+1.0.8
v4.0.2+1.0.9
v4.0.2+1.1.0
v4.0.2+1.1.1
v4.0.2+1.1.2
v4.0.2+1.1.3
v4.0.2+1.1.4
v4.0.2+1.1.5
v4.0.2+1.1.6
v4.0.2+1.1.7
v4.0.2+1.1.8
v4.0.2+1.1.9
v4.1.0+1.0.0
v4.1.0+1.0.1
v4.1.0+2.0.0
v4.1.0+2.0.1
v4.1.0+2.0.2
v4.1.0+2.0.4
v4.1.0+2.0.5
v4.1.0+2.1.0
v4.1.0+2.1.1
v4.1.1+1.0.0
v4.1.1+1.0.1
v4.1.1+1.0.2
v4.1.1+1.0.3
v4.1.1+1.0.4
v4.1.1+1.0.5
v4.1.1+1.0.6
v4.1.1+1.0.7
v4.1.2+1.0.0
v4.1.2+1.0.1
v4.1.2+1.0.2
v4.1.2+1.0.3
v4.1.2+1.0.4
v4.1.2+1.1.0
v4.1.2+1.1.1
v4.1.2+1.1.2
v4.1.2+1.1.3
v4.1.2+1.1.4
v4.1.3+1.0.0
v4.1.4+1.0.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
Commit Graph

3776 Commits (main)

Author SHA1 Message Date
Claire 3f61981f5d Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream 3 weeks ago
Claire 7b46517c38 Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream 3 weeks ago
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.
 3 weeks ago
Matt Jankowski 75470f1256
Use implicit dotenv load (#30121) 3 weeks ago
github-actions[bot] 56821ed879
New Crowdin Translations (automated) (#30128) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 weeks ago
github-actions[bot] 9be7efedf0
New Crowdin Translations (automated) (#30092) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 weeks ago
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
 3 weeks ago
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.
 3 weeks ago
Claire 62bc36416f Get rid of `app/javascript/core` 
Have all flavors implement everything they need instead.
 3 weeks ago
Michael Stanclift bb8c6346fb
Reword and rearrange Content Retention page (#27733) 3 weeks ago
github-actions[bot] 5201882a23
New Crowdin Translations (automated) (#30077) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 weeks ago
github-actions[bot] 85fdbd0ad5
New Crowdin Translations (automated) (#30062) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 weeks ago
github-actions[bot] ebcf9840f4
New Crowdin Translations (automated) (#30050) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 weeks ago
Matt Jankowski 3f6887557b
Move JS source from `packs` to `entrypoints` (#30037) 4 weeks ago
Matt Jankowski 32ead51e5a
Add material design icons to admin/settings views (#27780) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 4 weeks ago
Emelia Smith 049b159beb
Add read:me OAuth 2.0 scope, allowing more limited access to user data (#29087) 4 weeks ago
github-actions[bot] d754b15afb
New Crowdin Translations (automated) (#30034) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 weeks ago
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>
 4 weeks ago
Claire 2ef098d01c
Revert "Rely on dotenv autoload instead of explicit call (#30007)" (#30028) 4 weeks ago
Tim Rogers 1ca6ff8ca5
Fixed crash when supplying FFMPEG_BINARY environment variable (#30022) 4 weeks ago
github-actions[bot] 3655fb6a22
New Crowdin Translations (automated) (#30014) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 weeks ago
Matt Jankowski 18737aad49
Rely on dotenv autoload instead of explicit call (#30007) 4 weeks ago
Matt Jankowski 35b517c207
Remove remnants of capistrano (#30009) 4 weeks ago
Matt Jankowski 369b2ef0ed
Fix `Style/TrailingCommaInHashLiteral` cop (#30004) 4 weeks ago
Matt Jankowski c7384adc00
Fix `Style/TrailingCommaInArguments` cop (#30003) 4 weeks ago
Matt Jankowski 933189887b
Fix `Style/StringLiterals` cop (#30005) 4 weeks ago
Matt Jankowski 8d47ba893a
Fix `Style/PercentLiteralDelimiters` cop (#30006) 4 weeks ago
Matt Jankowski f386eb6c63
Replace deprecated `dotenv-rails` gem with `dotenv` gem (#29173) 4 weeks ago
github-actions[bot] ec71c02c4b
New Crowdin Translations (automated) (#29994) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 weeks ago
github-actions[bot] 443186ff40
New Crowdin Translations (automated) (#29980) 
Co-authored-by: GitHub Actions <noreply@github.com>
 1 month ago
Matt Jankowski 828299e71c
Enable AR Encryption (#29831) 1 month ago
github-actions[bot] c35042b7eb
New Crowdin Translations (automated) (#29972) 
Co-authored-by: GitHub Actions <noreply@github.com>
 1 month ago
github-actions[bot] 285d4123b5
New Crowdin Translations (automated) (#29955) 
Co-authored-by: GitHub Actions <noreply@github.com>
 1 month ago
github-actions[bot] 4e78cb9988
New Crowdin Translations (automated) (#29939) 
Co-authored-by: GitHub Actions <noreply@github.com>
 1 month ago
Matt Jankowski 0d9ad96d3f
Rename `PremailerWebpackStrategy` -> `PremailerBundledAssetStrategy` (#29934) 1 month ago
github-actions[bot] 5992df0762
New Crowdin Translations (automated) (#29920) 
Co-authored-by: GitHub Actions <noreply@github.com>
 1 month ago
Jeremy Kescher 2df3b9f803
Merge branch 'refs/heads/glitch-soc' into develop 
# Conflicts:
#	app/serializers/initial_state_serializer.rb
 1 month ago
github-actions[bot] 20b1e55f24
New Crowdin Translations (automated) (#29903) 
Co-authored-by: GitHub Actions <noreply@github.com>
 1 month ago
github-actions[bot] 13faf26315
New Crowdin Translations (automated) (#29859) 
Co-authored-by: GitHub Actions <noreply@github.com>
 1 month ago
Claire 0e76b919b5 Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream 1 month ago
Jeremy Kescher 7122d5381c
Merge branch 'refs/heads/glitch-soc' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/features/notifications/components/notification.jsx
 1 month ago
Claire 777984faeb Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 1 month ago
Claire 903dc53522 Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream 1 month ago
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.
 1 month ago
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>
 1 month ago
github-actions[bot] 56d13069cd
New Crowdin Translations (automated) (#29836) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Matt Jankowski edde54e991
Update stoplight to version 4.1.0 (#28366) 2 months ago
github-actions[bot] c717747603
New Crowdin Translations (automated) (#29812) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] f96648d41c
New Crowdin Translations (automated) (#29796) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] 8a498f4e65
New Crowdin Translations (automated) (#29785) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] 1025fff6b9
New Crowdin Translations (automated) (#29772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] b3d970bdb8
New Crowdin Translations (automated) (#29756) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Renaud Chaput 02ea161506
Support "system" theme setting (light/dark theme depending on user system preference) (#29748) 
Co-authored-by: Nishiki Liu <hello@nshki.com>
 2 months ago
github-actions[bot] 799e3be9bd
New Crowdin Translations (automated) (#29726) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] 5db5fa879b
New Crowdin Translations (automated) (#29708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Matt Jankowski a59f5694fe
Add empty line after ✨magic✨ frozen string comment (#29696) 2 months ago
github-actions[bot] c007dd5dd2
New Crowdin Translations (automated) (#29687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Jeremy Kescher 0353a3d759
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
#	app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
#	app/javascript/mastodon/features/ui/components/navigation_panel.jsx
 2 months ago
Claire 44bf7b8128
Add notifications of severed relationships (#27511) 2 months ago
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.
 2 months ago
github-actions[bot] 6c0b1a41a1
New Crowdin Translations (automated) (#29657) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
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.
 2 months ago
Jeremy Kescher a53f2cf970
Merge branch 'glitch-soc' into develop 2 months ago
Claire bc6f9befde
Change “Notifications” settings page to “E-mail notifications” (#29646) 2 months ago
Matt Jankowski 6c68c3c0ce
Introduce `inline_svg` gem, minimal usage, prep for material design icons (#29612) 2 months ago
github-actions[bot] 4e61bce4e9
New Crowdin Translations (automated) (#29641) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Claire cf08a438e7
Add badge on account card in report moderation interface when account is already suspended (#29592) 2 months ago
Matt Jankowski ecdbf15ebe
Remove unused `link_to_older` and `link_to_newer` helper methods (#29620) 2 months ago
github-actions[bot] 04817e965a
New Crowdin Translations (automated) (#29623) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Claire 82c2af0356
Fix `user_mailer.welcome.hashtags_recent_count` not having plural form (#29607) 2 months ago
Claire 2e49bc97b0 Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2 months ago
github-actions[bot] 6865fda593
New Crowdin Translations (automated) (#29603) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Jeremy Kescher 21a23b58ab
Merge branch 'glitch-soc' into develop 2 months ago
Jeremy Kescher caccc2e0f4
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	README.md
#	app/javascript/flavours/glitch/components/status.jsx
#	app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
#	app/javascript/flavours/glitch/locales/en.json
#	app/javascript/flavours/glitch/reducers/compose.js
#	app/javascript/flavours/glitch/styles/components.scss
#	app/javascript/mastodon/reducers/compose.js
#	app/models/notification.rb
 2 months ago
Claire e91ede5be6 Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2 months ago
Matt Jankowski 049d9171eb
Use `with_options` for shared option in `accounts#show` routing block (#28914) 2 months ago
Matt Jankowski 79e7590578
Clean up `activitypub` module route scope near instance actor (#29579) 2 months ago
Matt Jankowski 65e8349980
Clean up `activitypub` module route scope near collections/boxes (#29580) 2 months ago
Matt Jankowski 18ffd4d925
Add module `instances` route scope in api routes (#29581) 2 months ago
Matt Jankowski 01ecc80118
Add module `accounts` route scope in api routes (#29582) 2 months ago
github-actions[bot] 5aea35de13
New Crowdin Translations (automated) (#29587) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Claire 48134bcd10 Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream 2 months ago
Claire 27ffc09847 Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream 2 months ago
github-actions[bot] 171948b910
New Crowdin Translations (automated) (#29563) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] dc36b961aa
New Crowdin Translations (automated) (#29554) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
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.
 2 months ago
Matt Jankowski a38e424185
Use unchanging github links in docs/comments (#29545) 2 months ago
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2 months ago
Eugen Rochko 5b3a8737d6
Add hints for rules (#29539) 2 months ago
github-actions[bot] f85168b189
New Crowdin Translations (automated) (#29467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Eugen Rochko 50b17f7e10
Add notification policies and notification requests (#29366) 2 months ago
Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
 2 months ago
Jeremy Kescher 6aa17a7c1b
Merge branch 'glitch-soc' into develop 3 months ago
Dave MacLeod b6b94c971f
Add Interlingue to available_locales (#28630) 3 months ago
Claire 159e500749 Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream 3 months ago
HTeuMeuLeu 934cab7508
New welcome email (#28883) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 3 months ago
Jeremy Kescher 05747febb6
Merge branch 'glitch-soc' into develop 3 months ago
Claire 4d7e7cc562 Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 3 months ago
Claire 1c4f36422d Fix bogus translation files 3 months ago
github-actions[bot] cdf5098166
New Crowdin Translations (automated) (#29452) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago