1,634 commits

Author	SHA1	Message	Date
Essem	8860d937ce	Merge remote-tracking branch 'upstream/main'	2023-12-22 16:07:42 -06:00
Claire	a60b9acf3c	Merge commit 'b2f915b31a' into glitch-soc/merge-upstream	2023-12-21 19:04:20 +01:00
Essem	5fdd18ead1	Merge remote-tracking branch 'upstream/main'	2023-12-20 15:01:05 -06:00
Claire	8a5f2442cc	Merge commit '0530ce5e95' into glitch-soc/merge-upstream	2023-12-20 21:58:18 +01:00
Essem	cc676636f4	Merge remote-tracking branch 'upstream/main'	2023-12-19 15:24:52 -06:00
Claire	d288a6162a	Merge commit '12c22ee5e7' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +01:00
Claire	b24f676cf1	Merge commit '1526e54ac6' into glitch-soc/merge-upstream	2023-12-19 20:24:57 +01:00
Claire	3ad92e8d0d	Merge commit 'bd575a1dd6' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +01:00
Essem	f84f397807	Remove post reactions from vanilla flavor ... This is mainly for cleanup and parity with the current PR. Not much reason to modify something that should be "vanilla" anyways.	2023-12-18 19:42:35 -06:00
Essem	f628ebad02	Merge remote-tracking branch 'upstream/main'	2023-12-18 18:05:23 -06:00
Claire	d6ad9d351e	Merge commit 'a36b59be8a' into glitch-soc/merge-upstream	2023-12-18 19:10:43 +01:00
Claire	4113fbf6e8	Merge commit 'f476d9dab2' 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.	2023-12-17 23:04:16 +01:00
Essem	00dae881c5	Merge remote-tracking branch 'upstream/main'	2023-12-12 20:30:34 -06:00
Claire	3f1ec16377	Fix empty column explainer getting cropped under certain conditions (#28337)	2023-12-12 14:31:37 +00:00
Claire	9f92b05bd2	Merge commit '2e6bf60f15' 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`	2023-12-10 18:05:02 +01:00
Claire	b20af17a2c	Fix onboarding step descriptions being truncated on narrow screens (#28021)	2023-11-30 13:47:07 +00:00
Essem	570a8c00a2	Vertical status buttons fix	2023-11-27 10:31:51 -06:00
Essem	7a638e3225	Update mastomodern	2023-11-25 20:27:38 -06:00
Eugen Rochko	0e9801443f	Change to single opt-in during profile setup in onboarding in web UI (#27876)	2023-11-17 10:37:04 +00:00
Claire	0a6ec048a8	Fix upper border radius of onboarding columns (#27890)	2023-11-16 13:43:02 +00:00
Claire	c94bedf4e6	Use container queries to hide profile share button (#27889)	2023-11-16 11:59:45 +00:00
Eugen Rochko	87696ea26e	Add prominent share/copy button on profiles in web UI (#27865)	2023-11-16 10:23:14 +00:00
Eugen Rochko	d67bd44ca1	Add profile setup to onboarding in web UI (#27829)	2023-11-15 11:13:53 +00:00
pajowu	ed79713f3a	Fix modal content not being selectable (#27813)	2023-11-13 13:27:50 +00:00
zunda	e4e752c26e	Adjust transform origin for favorite star (#27700)	2023-11-06 11:14:46 +00:00
Essem	1483b2b13d	More cleanup	2023-11-05 22:29:44 -06:00
Essem	759ab62c7b	Quick hotfix for mastomodern buttons?	2023-11-05 19:37:47 -06:00
Essem	1b64242fa5	Update to mastomodern upstream	2023-11-01 22:42:03 -05:00
Essem	c2033b5a86	Fix large icons in vanilla mastomodern	2023-11-01 17:33:45 -05:00
Essem	0868c11651	Merge branch 'main' of https://github.com/glitch-soc/mastodon	2023-10-30 14:42:53 -05:00
Renaud Chaput	13d310e64d	Simplify column headers (#27557)	2023-10-27 13:21:07 +00:00
Eugen Rochko	fa7e64df1d	Fix various icon styles in web UI (#27579)	2023-10-26 23:37:58 +00:00
Claire	ba527c071f	Merge commit '134de736dc' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream changed how icons are handled, including on a line modified by glitch-soc to bump the number of poll options. Applied upstream's change, while keeping the increased number of poll options.	2023-10-25 12:14:24 +02:00
Eugen Rochko	134de736dc	Change icons in web UI (#27385) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2023-10-24 17:45:08 +00:00
Essem	27c641a848	Merge branch 'main' of https://github.com/glitch-soc/mastodon	2023-10-24 10:16:17 -05:00
Claire	cc000c8859	Merge commit '126cd7705d' into glitch-soc/merge-upstream	2023-10-19 20:48:22 +02:00
Renaud Chaput	126cd7705d	Do not display the navigation banner in the logo container (#27476)	2023-10-19 19:36:08 +02:00
Essem	7d7d8e0c82	Fix mastomodern bottom bar	2023-10-19 11:13:52 -05:00
Essem	9c0a4a6937	Update mastomodern to 1.8.1	2023-10-11 11:09:27 -05:00
Essem	9b73910346	Revert "Update mastomodern to 1.8.0" ... This reverts commit 0aea24cfb7.	2023-10-10 12:25:47 -05:00
Essem	29f2a7d9f4	Merge branch 'main' of https://github.com/glitch-soc/mastodon	2023-10-10 12:24:32 -05:00
Claire	74c27e33e3	Merge commit '37bbd3c106' into glitch-soc/merge-upstream	2023-10-08 17:10:39 +02:00
Claire	a5dbb1ee5a	Merge commit '5a437edc7f' into glitch-soc/merge-upstream	2023-10-08 17:05:40 +02:00
Claire	19ebf7797e	Merge commit 'e6b903b21e' into glitch-soc/merge-upstream	2023-10-08 16:30:00 +02:00
Essem	0aea24cfb7	Update mastomodern to 1.8.0	2023-10-06 17:39:27 -05:00
Claire	37bbd3c106	Fix double scroll bars in some columns in advanced interface (#27187)	2023-10-03 13:12:39 +02:00
Michael Stanclift	5a437edc7f	Keep version string displayed without breakpoints in UI (#26986)	2023-10-03 11:52:21 +02:00
Christian Schmidt	6d0767558a	Make notification respect reduce-motion (#27178)	2023-09-28 10:39:38 +02:00
Essem	8d776b9aa5	Merge remote-tracking branch 'upstream/main'	2023-09-26 20:03:35 -05:00
Claire	abdb58840a	Merge commit '57f592fed5' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00