fef
/
nyastodon
forked from mirrors/catstodon
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,246 Commits
2 Branches
270 Tags
270 MiB
develop
main
nya-1.2.2
nya-1.2.1
nya-1.2.0
v0.1.2
v0.1.1
v0.1.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
v0.6
v0.7
v0.8
v0.9
v0.9.9
v1.0
v1.1
v1.1.1
v1.1.2
v1.2
v1.2.1
v1.2.2
v1.3
v1.3.1
v1.3.2
v1.4.1
v1.4.2
v1.4.3
v1.4.4
v1.4.5
v1.4.6
v1.4.7
v1.4rc1
v1.4rc2
v1.4rc3
v1.4rc4
v1.4rc5
v1.4rc6
v1.5.0
v1.5.0rc1
v1.5.0rc2
v1.5.0rc3
v1.5.1
v1.6.0
v1.6.0rc1
v1.6.0rc2
v1.6.0rc3
v1.6.0rc4
v1.6.0rc5
v1.6.1
v2.0.0
v2.0.0rc1
v2.0.0rc2
v2.0.0rc3
v2.0.0rc4
v2.1.0
v2.1.0rc1
v2.1.0rc2
v2.1.0rc3
v2.1.0rc4
v2.1.0rc5
v2.1.0rc6
v2.1.1
v2.1.2
v2.1.3
v2.2.0
v2.2.0rc1
v2.2.0rc2
v2.3.0
v2.3.0rc1
v2.3.0rc2
v2.3.0rc3
v2.3.1
v2.3.1rc1
v2.3.1rc2
v2.3.1rc3
v2.3.2
v2.3.2rc1
v2.3.2rc2
v2.3.2rc3
v2.3.2rc4
v2.3.2rc5
v2.4.0
v2.4.0rc1
v2.4.0rc2
v2.4.0rc3
v2.4.0rc4
v2.4.0rc5
v2.4.1
v2.4.1rc1
v2.4.1rc2
v2.4.1rc3
v2.4.1rc4
v2.4.2
v2.4.2rc1
v2.4.2rc2
v2.4.2rc3
v2.4.3
v2.4.3rc1
v2.4.3rc2
v2.4.3rc3
v2.4.4
v2.4.5
v2.5.0
v2.5.0rc1
v2.5.0rc2
v2.5.1
v2.5.2
v2.6.0
v2.6.0rc1
v2.6.0rc2
v2.6.0rc3
v2.6.0rc4
v2.6.1
v2.6.2
v2.6.3
v2.6.4
v2.6.5
v2.7.0
v2.7.0rc1
v2.7.0rc2
v2.7.0rc3
v2.7.1
v2.7.2
v2.7.3
v2.7.4
v2.8.0
v2.8.0rc1
v2.8.0rc2
v2.8.0rc3
v2.8.1
v2.8.2
v2.8.3
v2.8.4
v2.9.0
v2.9.0rc1
v2.9.0rc2
v2.9.1
v2.9.2
v2.9.3
v2.9.4
v3.0.0
v3.0.0rc1
v3.0.0rc2
v3.0.0rc3
v3.0.1
v3.0.2
v3.1.0
v3.1.0rc1
v3.1.0rc2
v3.1.1
v3.1.2
v3.1.3
v3.1.4
v3.1.5
v3.2.0
v3.2.0rc1
v3.2.0rc2
v3.2.1
v3.2.2
v3.3.0
v3.3.0rc1
v3.3.0rc2
v3.3.0rc3
v3.3.1
v3.3.2
v3.3.3
v3.4.0
v3.4.0rc1
v3.4.0rc2
v3.4.1
v3.4.2
v3.4.3
v3.4.4
v3.4.5
v3.4.6
v3.4.7
v3.4.8
v3.5.0
v3.5.0rc1
v3.5.0rc2
v3.5.0rc3
v3.5.1
v3.5.2
v3.5.3
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
v4.0.0+1.0.0
v4.0.0rc1
v4.0.0rc2
v4.0.0rc3
v4.0.0rc4
v4.0.1
v4.0.2
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
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.0rc1
v4.1.0rc2
v4.1.0rc3
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

1347 Commits (main)

Author SHA1 Message Date
anna 60d54db810
merge with catstodon/main 3 months ago
Jeremy Kescher 6d6a5561f8
Catstodon rev reset due to upstream version bump 3 months ago
Jeremy Kescher ce878a78bb
Merge branch 'glitch-soc' into develop 3 months ago
Claire d7d477047e Bump version to v4.3.0-alpha.3 (#29241) 3 months ago
Jeremy Kescher f044841a6e
Catstodon rev +1.0.18 3 months ago
Jeremy Kescher 1c9291adcd
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/styles/components/accounts.scss
#	app/javascript/flavours/glitch/styles/components/status.scss
 3 months ago
Claire 40439399c6 Bump version to v4.3.0-alpha.2 (#29200) 3 months ago
Claire 3c3ef8b9d3 Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default (#29199) 3 months ago
Jeremy Kescher 924912bf9b
Catstodon rev +1.0.17 3 months ago
Jeremy Kescher 40ef7b3849
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/initial_state.js
#	app/serializers/initial_state_serializer.rb
 3 months ago
anna 1caf07f427
merge with catstodon/main 3 months ago
Jeremy Kescher c7e37c256e
Merge branch 'glitch-soc' into develop 3 months ago
Claire ff58ec0103 Merge pull request from GHSA-3fjr-858r-92rw 
* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
 3 months ago
Jeremy Kescher 2609f2bcbd
Bump to +1.0.14 3 months ago
Jeremy Kescher bf4d613731
Merge branch 'glitch-soc' into develop 3 months ago
Jeremy Kescher c2c2afc294
Merge branch 'glitch-soc' into develop 3 months ago
Essem ae854b8027
Port three new emoji reaction PR commits to Catstodon: 
"Update reaction emails

Reaction icon made by @t3rminus@calamity.world"

"Simplify reactions API controller"

"Refactor status reactions query

This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too."
 3 months ago
Claire bf153b384b Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
 3 months ago
Claire 5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 3 months ago
Claire 70de52c297 Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 3 months ago
Matt Jankowski 4cdf62e576
Extract `rebuild_index` method in maintenance CLI (#28911) 3 months ago
Matt Jankowski 274a48a9f4
Extract helper methods for db connection and table existence check in `CLI::Maintenance` task (#28281) 3 months ago
Matt Jankowski ca7053f19c
Consolidate db test prep steps to rake task (#28886) 3 months ago
Claire 22cfab0ebf Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
 3 months ago
Matt Jankowski 7a1f087659
Add `created_before` and `updated_before` scopes to `MediaAttachment` (#28869) 4 months ago
Matt Jankowski d03fe2bdee
N+1 fixes for CLI maintenance command (#28847) 4 months ago
Matt Jankowski defe5f4076
Fix `Rails/WhereExists` cop in lib/tasks (#28852) 4 months ago
Claire 102eff7c05 Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 4 months ago
Claire 93957daa50
Fix error when processing remote files with unusually long names (#28823) 4 months ago
Matt Jankowski 6a5d70e146
Update pre_migration_check postgres version requirement (#28800) 4 months ago
Jeremy Kescher 93ae46fa14
Merge branch 'glitch-soc' into develop 4 months ago
Claire 528a8fa495 Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream 4 months ago
Jeremy Kescher 16be9e975b
Remove local account check in like and emoji_react inbound activity handling 4 months ago
Matt Jankowski 2115bc52e4
Order by sql in `CLI::Maintenance` task (#28289) 4 months ago
Matt Jankowski 81e4e65610
Update links to upstream migration helpers, remove unused methods (#28781) 4 months ago
Jeremy Kescher d06ea73a04
Bump version 4 months ago
Jeremy Kescher 5d4cfe4cd8
Merge branch 'glitch-soc' into develop 4 months ago
Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
 4 months ago
Matt Jankowski 127503eb2c
Fix `Rails/RakeEnvironment` cop (#28782) 4 months ago
Claire e4d07c7bcc Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 4 months ago
Renaud Chaput 01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible (#28753) 4 months ago
Claire 4fcb372776 Fix Ruby linting issue 4 months ago
Claire 278597c161 Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream 4 months ago
Claire 2f521bc84a Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 4 months ago
Claire 1323dfac80 Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream 4 months ago
Claire 98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` (#28735) 4 months ago
Jeremy Kescher 777be10810
Merge branch 'glitch-soc' into develop 4 months ago
Jeremy Kescher 2047683539
v4.3.0-alpha.0+glitch+cat+1.0.8 4 months ago
Jeremy Kescher bfda2d7bc4
v4.3.0-alpha.0+glitch+cat+1.0.7 4 months ago
Jeremy Kescher 3df2bc2caf
v4.3.0-alpha.0+glitch+cat+1.0.6 4 months ago