fef
/
nyastodon
forked from mirrors/catstodon
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,670 Commits 2 Branches 270 Tags 283 MiB
Commit Graph

569 Commits

Author SHA1 Message Date
anna 8380f9fc2c
merge catstodon/main into main 2022-11-24 05:55:08 +00:00
Jeremy Kescher 41ce71cc92
Merge remote-tracking branch 'upstream/main' into develop 2022-11-23 22:54:06 +01:00
anna 1b7839f00a
merge catcatnya/main into main 2022-11-20 22:49:50 +00:00
anna 1792b688ac
bump to nyastodon 1.0.3 2022-11-20 22:46:00 +00:00
Jeremy Kescher 1381fb355c
v4.0.2+1.0.2 2022-11-19 10:22:49 +01:00
anna 9d14085607
bump to nyastodon 1.0.2 2022-11-19 05:43:03 +00:00
anna 44689beb43
merge catcatnya/main into main 2022-11-18 18:14:19 +00:00
Jeremy Kescher 874d4a2585
v4.0.2+1.0.1 2022-11-17 23:40:56 +01:00
anna 7c7f2d1b91
merge catcatnya/main into main 2022-11-16 18:47:18 +00:00
Jeremy Kescher 82e063ac6c
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
 2022-11-16 17:43:21 +01:00
Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.
 2022-11-16 08:30:00 +01:00
anna baab85fac7
add post suffix version 2022-11-16 01:27:48 +00:00
Jeremy Kescher 6d5a8d89d1
4.0.1+1.0.4 2022-11-15 08:04:40 +01:00
Eugen Rochko 03b0f3ac83
Bump version to 4.0.2 (#20725) 2022-11-15 03:57:18 +01:00
Jeremy Kescher 4b56353f13
Merge remote-tracking branch 'upstream/main' into develop 2022-11-15 00:34:05 +01:00
Jeremy Kescher 0005e01aa6
4.0.1+1.0.2 2022-11-14 22:52:11 +01:00
Jeremy Kescher 14ef153c69
Revert "[Glitch] Fix nodes order being sometimes mangled when rewriting emoji" 
This reverts commit 06faf2f977.
 2022-11-14 22:50:45 +01:00
Jeremy Kescher 06faf2f977
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji 
backport ccbca50a25 by Claire
 2022-11-14 22:40:37 +01:00
Jeremy Kescher ec15e58efa
4.0.1+1.0.0 2022-11-14 22:34:38 +01:00
Claire b5698af25f Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 22:30:30 +01:00
Eugen Rochko 4415dd6036
Bump version to 4.0.1 (#20696) 2022-11-14 22:21:14 +01:00
Jeremy Kescher 122870cb6b
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	config/initializers/rack_attack.rb
#	lib/mastodon/version.rb
 2022-11-14 22:18:48 +01:00
Eugen Rochko fb389bd73c
Bump version to 4.0.0 (#20636) 2022-11-14 20:27:12 +01:00
Claire cd713cac81 Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:57:25 +01:00
Eugen Rochko 75299a042c
Bump version to 4.0.0rc4 (#20634) 2022-11-14 08:50:14 +01:00
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
 2022-11-14 08:35:55 +01:00
Claire 457c37e47a
Fix index name in fix-duplicates task (#20632) 2022-11-14 08:33:48 +01:00
Claire bd806a3090
Update fix-duplicates (#20502) 
Fixes #19133
 2022-11-13 21:01:38 +01:00
Jeremy Kescher c40b063bd4
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	lib/mastodon/version.rb
 2022-11-12 14:38:59 +01:00
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
 2022-11-12 13:28:03 +01:00
Eugen Rochko 53028af10e
Bump version to 4.0.0rc3 (#20378) 2022-11-11 08:39:38 +01:00
Jeremy Kescher 1eadfddbd2
Bump to v3.5.3+1.2.2 2022-11-10 21:11:44 +01:00
Jeremy Kescher 5ee53d06a2
Bump to v3.5.3+1.2.1 2022-11-08 07:30:27 +01:00
Jeremy Kescher cf746c6ded
Bump to v3.5.3+1.2.0 2022-11-06 21:03:14 +01:00
Jeremy Kescher 996267fc8b
Fix vanilla flavor being broken due to incorrect imports 2022-11-06 13:03:02 +01:00
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
 2022-11-06 09:50:41 +01:00
Eugen Rochko 5187e4e758
Bump version to 4.0.0rc2 (#19831) 2022-11-06 06:59:56 +01:00
Jeremy Kescher e326d44f29
Add missing require_auth? in StatusController 2022-11-06 02:03:56 +01:00
Jeremy Kescher 52f9449b3d
Update outdated link to source 2022-11-06 01:50:59 +01:00
Jeremy Kescher 9dafedaecd
Remove misc duplicate declarations 2022-11-06 01:42:40 +01:00
Jeremy Kescher f0422fb416
v3.5.3+1.1.3 2022-11-05 12:26:41 +01:00
Jeremy Kescher 3bc0621c3c
v3.5.3+1.1.2 2022-11-02 21:16:39 +01:00
Jeremy Kescher 025e6ce643
v3.5.3+1.1.1 2022-11-01 10:30:21 +01:00
Jeremy Kescher 30223ea224
Revert version bump for now 
Shorten "catstodon" to "cat" in version suffix
 2022-10-31 21:47:02 +01:00
Jeremy Kescher 7f6215984b
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
 2022-10-31 21:37:48 +01:00
Claire cb19be67d1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
Eugen Rochko 8ae0936ddd
Bump version to 4.0.0rc1 (#19473) 2022-10-28 00:26:02 +02:00
Eugen Rochko d7595adbf4
Add `--remove-role` option to `tootctl accounts modify` (#19477) 
Fix #19152
 2022-10-27 14:31:10 +02:00
Jeremy Kescher 19413ebb0b
v3.5.3+1.0.9 2022-10-13 22:39:51 +02:00
Jeremy Kescher 727da8dcc9
v3.5.3+1.0.8 2022-10-13 06:52:46 +02:00