1,573 commits

Author	SHA1	Message	Date
Claire	a60b9acf3c	Merge commit 'b2f915b31a' into glitch-soc/merge-upstream	2023-12-21 19:04:20 +01:00
Claire	8a5f2442cc	Merge commit '0530ce5e95' into glitch-soc/merge-upstream	2023-12-20 21:58:18 +01: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
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
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
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
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
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
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
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
Claire	abdb58840a	Merge commit '57f592fed5' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
gunchleoc	88fa8e710a	Fix line wrapping of language selection button with long locale codes (#27100)	2023-09-25 12:59:37 +02:00
Claire	dfc05ec8df	Merge commit '6273416292' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream modified this file close to a line modified by glitch-soc to disable the ARMv64 builder (as glitch-soc doesn't have one). Ported upstream's changes. - `.github/workflows/build-releases.yml`: Upstream modified this file close to lines changed by glitch-soc to change the Docker image repositories used (only ghcr, and based on the organization's name). Ported upstream's changes.	2023-09-15 21:43:49 +02:00
Claire	e193c848fe	Merge commit '97e4011c3c' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream added some code to add the Identity Provider's sign-in endpoint to the `form-action` Content Security Policy directive but our version of the file is pretty different. Ported the change.	2023-09-15 21:25:05 +02:00
Claire	08b495d95c	Merge commit 'b1d8907138' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00
Claire	5d8c65f2a7	Merge commit '398635c0c4' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
Claire	3ca94f6d4a	Merge commit '93d051e47d' into glitch-soc/merge-upstream	2023-09-15 20:21:40 +02:00
Claire	2a4fcc51fd	Fix dismiss button overlapping with text in dismissable banners (#26935)	2023-09-15 19:53:28 +02:00
Santiago Kozak	d2cfcdd09e	Fix recent search items not handling overflows correctly (#26893)	2023-09-12 04:20:57 +02:00
Eugen Rochko	1f141f656d	Change onboarding prompt to use full width of banner in web UI (#26829)	2023-09-07 04:24:11 +02:00
Eugen Rochko	398635c0c4	Fix paragraph margins resulting in irregular read-more cut-off in web UI (#26828)	2023-09-07 04:24:01 +02:00
Eugen Rochko	5d20733d8d	Add infinite scrolling for search results in web UI (#26784)	2023-09-05 23:54:24 +02:00
Claire	e66f961e05	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-04 18:27:46 +02:00
Stanislas Signoud	a106c46478	Fix light mode colors for advanced interface banner (#26759)	2023-09-04 10:14:01 +02:00
Claire	c107512fa6	Merge commit '05093266e6' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00
Eugen Rochko	728eb6a153	Fix wrong color on active icons with counters in web UI (#26767)	2023-09-02 14:46:26 +02:00
Claire	4ed629cd7e	Merge commit 'be991f1d18' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream added the notion of overriden settings, while we had extra code for pseudo-settings (only used to combine flavour and skin in a single select field). Ported upstream changes. - `config/i18n-tasks.yml`: Upstream added `simple_form.overridden` to `ignore_unused`, we had `simple_form.glitch_only`. Added `simple_form.glitch_only` as well.	2023-09-02 14:44:47 +02:00
Claire	ac2dae0d11	Merge commit '6c4c72497a' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-releases.yml`: Upstream changed comments close to a line we modified to account for different container image repositories. Updated the comments as upstream did.	2023-09-02 13:50:16 +02:00
Claire	ffb486648c	Merge commit 'cb9f96036c' into glitch-soc/merge-upstream	2023-09-02 13:34:54 +02:00
Claire	fbbe9f1c12	Merge commit 'a7d96e6aff' into glitch-soc/merge-upstream	2023-09-02 12:20:33 +02:00
Claire	c8aa3d6d06	Merge commit 'dd72a8d28b' into glitch-soc/merge-upstream	2023-09-02 12:02:23 +02:00