453 commits

Author	SHA1	Message	Date
Jeremy Kescher	81609f09ba	Bump Catstodon revision to 1.0.6	2024-08-04 13:50:03 +02:00
Jeremy Kescher	dfb5ac3b98	Bump Catstodon revision to 1.0.5	2024-08-01 00:29:17 +02:00
Jeremy Kescher	f3a55891e0	Merge branch 'refs/heads/glitch' into develop	2024-08-01 00:27:00 +02:00
Claire	8dd671a977	Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream	2024-07-31 18:16:01 +02:00
Jeremy Kescher	1145f232e8	Bump Catstodon revision to 1.0.4	2024-07-31 15:03:30 +02:00
Claire	4eab6aef95	Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192)	2024-07-30 21:40:42 +00:00
Jeremy Kescher	5b2f994ad4	Bump Catstodon revision to 1.0.3	2024-07-30 08:46:24 +02:00
Jeremy Kescher	dcb356d256	Bump Catstodon revision to 1.0.2	2024-07-19 18:27:48 +02:00
Jeremy Kescher	5ed78a1e90	Bump Catstodon revision to 1.0.1	2024-07-16 22:38:39 +02:00
Jeremy Kescher	245684be0f	Reset Catstodon revision to 1.0.0 for alpha.5 merge	2024-07-04 18:11:47 +02:00
Claire	e61a7794f8	Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict because glitch-soc has a different list of allowed tags. Added upstream's new allowed tags while keeping ours. - `spec/requests/api/v1/timelines/public_spec.rb`: Conflict because of glitch-soc's default settings. Updated accordingly.	2024-07-04 17:12:14 +02:00
Claire	df9e26158d	Bump version to v4.3.0-alpha.5 (#30920)	2024-07-04 14:59:54 +00:00
Jeremy Kescher	a2b0c0f69a	Bump Catstodon revision to 1.1.3	2024-07-02 19:33:15 +02:00
Jeremy Kescher	fbf9a61c55	Bump Catstodon revision to 1.1.2	2024-06-22 13:34:56 +02:00
Jeremy Kescher	f883c171fb	Bump Catstodon revision to 1.1.1	2024-06-19 17:56:52 +02:00
Jeremy Kescher	d220eaab0a	Bump Catstodon revision to 1.1.0	2024-06-18 01:17:19 +02:00
Jeremy Kescher	463585fc3c	Bump Catstodon revision to 1.0.3	2024-06-17 22:55:11 +02:00
Jeremy Kescher	b8c60aa810	Bump catstodon rev to 1.0.2	2024-06-16 05:41:46 +02:00
Jeremy Kescher	3157f2d48a	Fix sign-in issues, bump version	2024-05-31 22:30:42 +02:00
Jeremy Kescher	cb080ca3ef	Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0	2024-05-30 18:51:42 +02:00
Claire	b8271f20c5	Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream	2024-05-30 15:41:31 +02:00
Claire	7f808ff6e9	Bump version to v4.3.0-alpha.4 (#30482)	2024-05-30 13:34:46 +00:00
Jeremy Kescher	3aa76c7383	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.7	2024-05-29 14:25:32 +02:00
Jeremy Kescher	c1054880a3	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.6	2024-05-22 23:58:09 +02:00
Jeremy Kescher	6703af29e3	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.5	2024-05-21 05:52:53 +02:00
Jeremy Kescher	c9fb54fd4c	Emergency fix for charlock_holmes after ICU 75	2024-05-21 03:37:40 +02:00
Jeremy Kescher	ec9b8d058a	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.3	2024-05-21 00:05:46 +02:00
Jeremy Kescher	16a89487fd	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.2	2024-05-17 15:35:29 +02:00
Jeremy Kescher	40bfe6a99c	Bump version to v4.3.0-alpha.3+glitch+cat+1.2.1	2024-05-14 18:56:58 +02:00
Jeremy Kescher	360fa71778	v4.3.0-alpha.3+glitch+cat+1.2.0	2024-05-11 23:36:59 +02:00
Jeremy Kescher	ef30d71a55	Add changelog for v4.3.0-alpha.3+glitch+cat+1.1.3	2024-04-26 21:28:50 +02:00
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
Claire	5f21a1f5a3	Bump version to v4.3.0-alpha.3 (#29241)	2024-02-16 11:06:47 +00: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