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

558 Commits (main)

Author SHA1 Message Date
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
 2 weeks ago
Emelia Smith 116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata (#29191) 2 weeks ago
Claire eeefb7cdbc Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream 2 weeks ago
Matt Jankowski 933189887b
Fix `Style/StringLiterals` cop (#30005) 4 weeks 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
Claire 44bf7b8128
Add notifications of severed relationships (#27511) 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
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
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2 months ago
Claire 5b9ddfcfcc Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream 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
Claire 554e2a019e
Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default (#29199) 3 months ago
Matt Jankowski ce0d134147
Add `redirect_with_vary` to `AllowedMethods` for `Style/FormatStringToken` cop (#28973) 4 months ago
Claire 5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 4 months ago
Eugen Rochko b19ae521b7
Add confirmation when redirecting logged-out requests to permalink (#27792) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 4 months ago
Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
 5 months ago
Claire 3ad92e8d0d Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream 5 months ago
Claire d6ad9d351e Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 5 months ago
Claire bc33be0342 Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies.
 5 months ago
Claire 4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
 5 months ago
Matt Jankowski e5717c9bc6
Fix `Style/Lambda` cop (#28378) 5 months ago
Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
 5 months ago
Eugen Rochko d67bd44ca1
Add profile setup to onboarding in web UI (#27829) 6 months ago
Claire 07a4059901
Add support for invite codes in the registration API (#27805) 6 months ago
Claire 23e32a4b30
Fix format-dependent redirects being cached regardless of requested format (#27632) 6 months ago
Matt Jankowski d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops (#27730) 6 months ago
Claire bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts (#27459) 7 months ago
Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
 7 months ago
Nick Schonning 85db392464
Autofix Rubocop cops for config/ (#24145) 8 months ago
Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
 10 months ago
Claire b4e739ff0f
Change interaction modal in web UI (#26075) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 10 months ago
Claire d9adda1a99 Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream 10 months ago
Stanislas Signoud 5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode (#25893) 10 months ago
Claire 5de49e74d4 Merge branch 'main' into glitch-soc/merge-upstream 11 months ago
Eugen Rochko 54a10523e2
Change labels of live feeds tabs in web UI (#25683) 11 months ago
Claire 44e98a2740 Merge branch 'main' into glitch-soc/merge-upstream 11 months ago
Matt Jankowski f8bd581126
Remove unused routes (#25578) 11 months ago
Claire 65cbcce997 Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 11 months ago
Eugen Rochko 6637ef7852
Add unsubscribe link to e-mails (#25378) 11 months ago
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
 11 months ago
Nick Schonning c66250abf1
Autofix Rubocop Regex Style rules (#23690) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 12 months ago
Claire bec6a1cad4
Add hCaptcha support (#25019) 1 year ago
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
 1 year ago
Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
 1 year ago
Matt Jankowski 41eb49b984
Extract large route namespace blocks to separate files (#23914) 1 year ago
Claire 32a030dd74
Rewrite import feature (#21054) 1 year ago
João Pedro Marques 8f6e290c7a
Adds new follower/following routes (#24601) 1 year ago