419 commits

Author	SHA1	Message	Date
Jeremy Kescher	3e02b6063a	Bump Catstodon revision to 1.1.2	2024-04-11 21:52:10 +02:00
Jeremy Kescher	7953261a1f	Bump Catstodon revision to 1.1.1	2024-04-06 21:06:05 +02:00
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	2024-03-14 20:01:30 +01:00
Jeremy Kescher	9a1c5188a8	Bump Catstodon version to 1.0.9	2024-03-03 03:15:51 +01:00
Jeremy Kescher	75b87c100a	Update changelog and bump version	2024-02-29 19:38:54 +01:00
Jeremy Kescher	ca9b83b5a3	Bump Catstodon version	2024-02-28 23:10:22 +01:00
Jeremy Kescher	9b59f9c652	Bump Catstodon rev to 1.0.6	2024-02-25 18:16:38 +01:00
Jeremy Kescher	8f8cb0fad3	Merge branch 'glitch-soc' into develop	2024-02-24 17:51:18 +01:00
Jeremy Kescher	78b0f1c6cb	Bump version	2024-02-24 14:06:52 +01:00
Jeremy Kescher	206de12616	Bump Catstodon version	2024-02-24 11:17:01 +01:00
Jeremy Kescher	c2721d5129	Bump Catstodon revision to 1.0.2	2024-02-17 18:56:19 +01:00
Jeremy Kescher	05a5c20681	Merge branch 'glitch-soc' into develop	2024-02-17 18:16:14 +01:00
Jeremy Kescher	6d6a5561f8	Catstodon rev reset due to upstream version bump	2024-02-16 14:49:21 +01:00
Jeremy Kescher	ce878a78bb	Merge branch 'glitch-soc' into develop	2024-02-16 14:48:08 +01:00
Claire	d7d477047e	Bump version to v4.3.0-alpha.3 (#29241)	2024-02-16 12:17:15 +01:00
Jeremy Kescher	f044841a6e	Catstodon rev +1.0.18	2024-02-14 18:03:42 +01:00
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	2024-02-14 18:02:38 +01:00
Claire	40439399c6	Bump version to v4.3.0-alpha.2 (#29200)	2024-02-14 15:26:18 +01:00
Jeremy Kescher	924912bf9b	Catstodon rev +1.0.17	2024-02-11 17:26:45 +01:00
Jeremy Kescher	40ef7b3849	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/serializers/initial_state_serializer.rb	2024-02-06 22:58:23 +01:00
Jeremy Kescher	c7e37c256e	Merge branch 'glitch-soc' into develop	2024-02-01 18:18:19 +01:00
Claire	ff58ec0103	Merge pull request from GHSA-3fjr-858r-92rw ... * Fix insufficient origin validation * Bump version to 4.3.0-alpha.1	2024-02-01 15:57:08 +01:00
Jeremy Kescher	2609f2bcbd	Bump to +1.0.14	2024-01-28 17:58:28 +01:00
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."	2024-01-28 02:22:43 +01:00
Jeremy Kescher	93ae46fa14	Merge branch 'glitch-soc' into develop	2024-01-18 22:59:27 +01:00
Jeremy Kescher	16be9e975b	Remove local account check in like and emoji_react inbound activity handling	2024-01-18 19:46:29 +01:00
Jeremy Kescher	d06ea73a04	Bump version	2024-01-17 22:41:16 +01:00
Jeremy Kescher	777be10810	Merge branch 'glitch-soc' into develop	2024-01-14 19:46:03 +01:00
Jeremy Kescher	2047683539	v4.3.0-alpha.0+glitch+cat+1.0.8	2024-01-14 17:48:42 +01:00
Jeremy Kescher	bfda2d7bc4	v4.3.0-alpha.0+glitch+cat+1.0.7	2024-01-14 03:58:49 +01:00
Jeremy Kescher	3df2bc2caf	v4.3.0-alpha.0+glitch+cat+1.0.6	2024-01-13 17:46:55 +01:00
Jeremy Kescher	c677b8de19	v4.3.0-alpha.0+glitch+cat+1.0.5	2024-01-12 22:03:50 +01:00
Jeremy Kescher	adc45c99d7	v4.3.0+1.0.4	2024-01-07 20:11:03 +01:00
Jeremy Kescher	3b9a52aab6	Merge branch 'glitch-soc' into develop	2024-01-04 17:57:02 +01:00
Jeremy Kescher	abb21a1eab	Merge branch 'glitch-soc' into develop	2024-01-04 17:30:03 +01:00
Jeremy Kescher	42520e72c5	Remove duplicate "Number of visible reactions" setting	2024-01-03 17:55:12 +01:00
Jeremy Kescher	981fd44683	v4.3.0+1.0.0	2024-01-02 19:11:50 +01:00
Jeremy Kescher	5be3fb3d66	Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions	2024-01-02 12:16:35 +01:00
Claire	19ebf7797e	Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream	2023-10-08 16:30:00 +02:00
Claire	f0c720cfc9	Bump version to v4.3.0-alpha.0 (#27022)	2023-09-28 13:40:43 +02:00
Claire	86ec1e833e	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-21 16:56:09 +02:00
Claire	4fcc026f0f	Bump version to v4.2.0 (#27017)	2023-09-21 16:51:32 +02:00
Claire	f546b0c999	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-19 17:07:29 +02:00
Claire	f4b780ba22	Bump version to v4.2.0-rc2 (#26974)	2023-09-19 17:04:23 +02:00
Claire	5ed72f668f	Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream	2023-09-15 21:39:21 +02:00
Claire	b90383d073	Bump version to v4.2.0-rc1 (#26916)	2023-09-14 18:46:00 +02:00
Jeong Arm	97f3d7b662	Fix Version metadata have trailing dot (#2403)	2023-09-13 08:47:39 +02:00
Claire	87b5f84625	Merge commit 'f80f426c57d5a5e1d289372ef7c323741d27c768' into glitch-soc/merge-upstream	2023-09-05 08:14:52 +02:00
Claire	f80f426c57	Bump version to v4.2.0-beta3 (#26753)	2023-09-04 21:20:20 +02:00
Claire	c107512fa6	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00