7224 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mouse Reeve	5255abb2af	Fixes create book view unit test	2022-03-16 17:55:41 -07:00
Mouse Reeve	0617b9424b	Merge pull request #2029 from bookwyrm-social/merge-error ... Removes file added by merge	2022-03-16 17:31:02 -07:00
Mouse Reeve	178f26192b	Removes file added by merge	2022-03-16 17:15:53 -07:00
Mouse Reeve	0688dfa3aa	Merge pull request #2028 from bookwyrm-social/user-question-resolve ... Resolves merge conflicts on user invite question PR	2022-03-16 17:09:35 -07:00
Mouse Reeve	8b061f9432	Manually updates migration	2022-03-16 16:53:16 -07:00
Mouse Reeve	7b3b357756	Merge branch 'main' into form-conflict	2022-03-16 16:51:57 -07:00
Mouse Reeve	44e68cd0a4	Whitespace fix	2022-03-16 16:50:34 -07:00
Mouse Reeve	922cc61a5f	Merge pull request #1998 from oragegu/question_invite_correct ... Custom question option and field for spammed bookwyrm instances	2022-03-16 16:49:00 -07:00
Mouse Reeve	108981a226	Creates fresh migration and removes merges	2022-03-16 16:35:03 -07:00
Mouse Reeve	0cf2c07069	Merge branch 'main' into url-names	2022-03-16 16:32:07 -07:00
Mouse Reeve	ffec47ad9a	Merge pull request #2027 from bookwyrm-social/locales ... Adds context and fixes whitespace in translation strings	2022-03-16 16:29:38 -07:00
Mouse Reeve	68dc5962ee	Merge branch 'main' into add-edition	2022-03-16 16:16:55 -07:00
Mouse Reeve	da100cd114	Adds context and fixes whitespace in translation strings ... Also updates locales	2022-03-16 16:13:15 -07:00
Mouse Reeve	159b73d860	Fixes errors in migration	2022-03-16 13:54:25 -07:00
Mouse Reeve	819458e82a	Improves error reporting on activitypub parser	2022-03-16 13:53:54 -07:00
Mouse Reeve	f2b0b306e9	Merge pull request #1934 from tversteeg/partially-read-shelf ... Add 'Stopped Reading' shelf	2022-03-16 13:51:15 -07:00
Mouse Reeve	eee325b662	Merge pull request #2026 from bookwyrm-social/missing-file ... Adds missing update script	2022-03-16 13:41:43 -07:00
Mouse Reeve	ea69f9087f	Adds missing update script	2022-03-16 13:32:37 -07:00
Mouse Reeve	8969958e51	Merge pull request #2025 from bookwyrm-social/upgrade-scripts ... Run miscellaneous scripts during update	2022-03-16 13:03:38 -07:00
Mouse Reeve	2b2aa078ad	Merge branch 'main' into upgrade-scripts	2022-03-16 12:54:25 -07:00
Mouse Reeve	f4e828e2fb	Merge pull request #1974 from bookwyrm-social/celerybeat ... Schedules automod tasks	2022-03-16 12:54:06 -07:00
Mouse Reeve	ee973c7d72	Adds celerybeat update script	2022-03-16 12:53:27 -07:00
Mouse Reeve	78b03efe45	Updates bw-dev command and ticks version number	2022-03-16 12:53:05 -07:00
Mouse Reeve	820279166a	Adds update script	2022-03-16 12:39:49 -07:00
Thomas Versteeg	b3f03164cc	Apply black	2022-03-15 09:28:40 +01:00
Thomas Versteeg	ee414598bf	Merge branch 'main' into partially-read-shelf	2022-03-15 08:28:02 +00:00
Mouse Reeve	81b7dca4b9	Merge branch 'main' into celerybeat	2022-03-14 15:13:09 -07:00
Mouse Reeve	13b82c2740	Merge pull request #2020 from bookwyrm-social/multi-input ... Array input field for forms	2022-03-14 15:07:00 -07:00
Mouse Reeve	a37f83c458	Get the field working	2022-03-14 14:55:41 -07:00
Mouse Reeve	716e357060	Use plus icon on add field button	2022-03-14 12:54:50 -07:00
Mouse Reeve	35e6dede09	Script to remove input fields	2022-03-14 12:41:41 -07:00
Mouse Reeve	a2f2104a08	Create non-functional UI for editing array fields	2022-03-14 12:41:41 -07:00
Mouse Reeve	916d6a417d	Merge pull request #2018 from bookwyrm-social/locales ... Adds scanner translation strings	2022-03-14 12:40:53 -07:00
Mouse Reeve	486f70c7fb	Adds scanner translation strings	2022-03-14 12:31:29 -07:00
Mouse Reeve	d848b950dc	Merge pull request #2017 from bookwyrm-social/forms ... Moves forms into separate files	2022-03-14 12:21:42 -07:00
Mouse Reeve	19202e2cd7	Fixes name of user forms file	2022-03-14 12:12:51 -07:00
Mouse Reeve	d3f723a07d	Splits forms into separate files	2022-03-14 12:06:50 -07:00
Mouse Reeve	7169f7ba20	Creates forms directory	2022-03-14 11:43:58 -07:00
Mouse Reeve	c0db081120	Merge pull request #2016 from bookwyrm-social/duplicate-script ... Moves duplicate field script into its own file	2022-03-14 11:09:48 -07:00
Mouse Reeve	bfb8fc800a	Moves duplicate field script into its own file	2022-03-14 10:59:24 -07:00
Mouse Reeve	e0c0bebf65	Merge pull request #2015 from bookwyrm-social/admin-view-fix ... Improves user admin view	2022-03-14 09:50:31 -07:00
Mouse Reeve	6ddf1aad91	Merge pull request #2000 from Tak/edit-subjects ... Allow book subjects to be edited	2022-03-14 09:46:05 -07:00
Mouse Reeve	f42e863434	Updates user admin filters	2022-03-14 09:38:03 -07:00
Mouse Reeve	488d702473	Separate admin user list into tabbed lists	2022-03-14 09:27:18 -07:00
Mouse Reeve	bf68b70fba	Use breadcrumbs in use admin view	2022-03-14 09:10:48 -07:00
Mouse Reeve	e4f94780eb	Uses translated fields in admin user info	2022-03-14 09:10:42 -07:00
Corentin Feys	771fa5a00a	Merge branch 'main' into question_invite_correct	2022-03-13 23:44:20 +01:00
corentin-feys	a0ae96923c	fix to pass invite request pytest	2022-03-13 23:34:49 +01:00
corentin-feys	74a1697cda	fix to pass register pytest	2022-03-13 23:04:14 +01:00
corentin-feys	3e9cb2acb1	Revert to stable commit ... This reverts commit d542be943f.	2022-03-13 22:56:41 +01:00