278 commits

Author	SHA1	Message	Date
Jeremy Kescher	6d5a8d89d1	4.0.1+1.0.4	2022-11-15 08:04:40 +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
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
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
Jeremy Kescher	a33508f687	v3.5.3+1.0.7	2022-10-10 06:46:48 +02:00
Jeremy Kescher	01d702f603	v3.5.3+1.0.6	2022-10-09 12:14:43 +02:00
Jeremy Kescher	7a385567b2	v3.5.3+1.0.5	2022-10-08 21:08:55 +02:00
Jeremy Kescher	7944e785fe	v3.5.3+1.0.4	2022-10-07 16:41:08 +02:00
Jeremy Kescher	7815af774f	v3.5.3+1.0.3	2022-10-05 17:59:25 +02:00
Jeremy Kescher	f955ea727b	Increase suffix to 1.0.2 for next	2022-10-04 21:14:35 +02:00
Jeremy Kescher	68fe934a48	Increase suffix to 1.0.1 for release	2022-10-04 21:12:09 +02:00
Jeremy Kescher	c33675bdb1	Add suffix version	2022-10-03 17:50:15 +02:00
Jeremy Kescher	394a536ae0	Create distinctions between glitch-soc and Catstodon. ... Version suffix and string changes.	2022-06-05 10:15:26 +02:00
Claire	3f10136a41	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-26 23:30:10 +02:00
Eugen Rochko	fbcbf7898f	Bump version to 3.5.3 (#18530)	2022-05-26 23:26:15 +02:00
Claire	c85c3fb708	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated `jest`, moving its config in a separate file. This config was modified in glitch-soc, so the corresponding changes have been ported to `jest.config.js`	2022-05-04 19:15:50 +02:00
Claire	014065913c	Bump version to 3.5.2 (#18295) ... * Bump version to 3.5.2 * Change some entries to be more clear * Add some extra notes * Fix line wrap Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2022-05-04 00:57:42 +02:00
Claire	eff62528de	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 23:00:03 +02:00
Eugen Rochko	ed5491e5de	Bump version to 3.5.1 (#18000)	2022-04-08 21:57:24 +02:00
Claire	fc5dd0c538	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-30 15:02:56 +02:00
Eugen Rochko	8c7223f4ea	Bump version to 3.5.0 (#17911)	2022-03-30 14:52:37 +02:00