Commit graph

7128 commits

Author SHA1 Message Date
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
Mouse Reeve 57cba4eb7a
Merge pull request #2013 from bookwyrm-social/theme-path
Manually add theme path rather than options
2022-03-13 13:30:32 -07:00
Mouse Reeve c08459cf5d Tick version number 2022-03-13 13:19:40 -07:00
Mouse Reeve 37beb5a8f4 Tick javascript cache buster 2022-03-13 13:19:02 -07:00
Mouse Reeve 3885ae789b Manually add theme path rather than options 2022-03-13 13:15:42 -07:00
Mouse Reeve 753cd36f86
Merge pull request #2012 from bookwyrm-social/catch-update-book-error
Catch update book error
2022-03-13 12:53:09 -07:00
Mouse Reeve c7efa23405 Display error message for remote failure 2022-03-13 12:38:29 -07:00
Mouse Reeve 739b394ccc Catch error when trying to update book 2022-03-13 12:31:21 -07:00
Mouse Reeve b32f3c1b7b
Merge pull request #1976 from viviicat/code-scanning
Add barcode scanning support
2022-03-13 12:26:31 -07:00
Mouse Reeve 5bd25ba740
Merge pull request #2011 from bookwyrm-social/update-locales
Updates locales
2022-03-13 12:14:42 -07:00
Mouse Reeve 2f124e00d1 Updates locales 2022-03-13 11:57:46 -07:00
Mouse Reeve a69a9a401b
Merge pull request #2010 from bookwyrm-social/themes-text
Fixes instructions on admin themes view
2022-03-13 11:47:58 -07:00
Mouse Reeve 0c87ee1d4b Fixes instructions on admin themes view 2022-03-13 11:36:31 -07:00
Mouse Reeve 9f19fb698b
Merge pull request #2009 from viviicat/sass-in-prod
add SASS_PROCESSOR_ENABLED = True
2022-03-13 11:31:24 -07:00
Orage Pika bcdee8071c fixing errors from check 2022-03-13 15:49:09 +01:00
Orage Pika c99fe2bdc3 fixing errors from checks 2022-03-13 13:37:09 +01:00
Orage Pika d2e6dfc07b fixing errors from checks 2022-03-13 13:31:38 +01:00
Orage Pika 4fb3cbfc29 fixing errors from checks 2022-03-13 13:30:37 +01:00
Orage Pika d542be943f bw-dev black and fixing things according to the warning messages of the checks. 2022-03-13 13:23:58 +01:00
OragePika, aka "FANS DON'T CARE 974c569fc1
Merge branch 'main' into question_invite_correct 2022-03-13 13:14:23 +01:00
Vivianne Langdon 306f177d55 add SASS_PROCESSOR_ENABLED = True 2022-03-12 21:12:25 -07:00
Mouse Reeve 4cfa4046a1
Merge pull request #2008 from viviicat/fish-completions
Add autocompletions for fish shell
2022-03-12 06:39:09 -08:00
Vivianne Langdon 3358c233ea remove no-up autocomplete 2022-03-12 04:38:42 -08:00
Vivianne Langdon 4530d4917a make more compact with a function 2022-03-12 04:34:03 -08:00
Vivianne Langdon 822868bf87 fish autocompletions 2022-03-12 04:34:03 -08:00
Thomas Versteeg 5d8404f797 Add merge migration 2022-03-12 11:45:09 +01:00
Thomas Versteeg 9e6dfb4706
Merge branch 'main' into partially-read-shelf 2022-03-12 10:38:56 +00:00
corentin-feys 1b4e532f90 Added invite question migration 2022-03-12 11:19:14 +01:00
corentin-feys 5dbee33185 invite_question_text resets to default question when left blank 2022-03-12 11:13:42 +01:00
corentin-feys 7337f378c0 Hide the answer column from invites when invite questions are disabled 2022-03-12 11:10:44 +01:00
Vivianne Langdon a4391f35c1 black 2022-03-11 22:31:40 -08:00
Vivianne Langdon d6767e42fc fix variable clash 2022-03-11 22:28:05 -08:00
Vivianne Langdon cf53134577 disable linting unused-argument 2022-03-11 21:19:20 -08:00
Vivianne Langdon 598a0587cf Fix issue with tabs on bottom of book page 2022-03-11 21:10:22 -08:00
Vivianne Langdon f2d7bdbf27 in progress fixes for pylint 2022-03-11 20:14:45 -08:00
Vivianne Langdon 594fa5d058 Black 2022-03-11 20:00:13 -08:00
Vivianne 9fa8caba45
Merge branch 'bookwyrm-social:main' into url-names 2022-03-11 19:55:06 -08:00
Mouse Reeve 02a93bd730
Merge pull request #2006 from bookwyrm-social/log-level
Log info, not exception, for expected errors
2022-03-11 16:05:03 -08:00
Mouse Reeve 72d6a4ce52 Log info, not exception, for expected errors 2022-03-11 14:55:54 -08:00
Vivianne Langdon 5d25da93d5 revert previously changed unit tests 2022-03-11 04:25:50 -08:00
Vivianne Langdon d9ac326c29 No more remote id with slug, just add slug in local path. 2022-03-11 04:18:52 -08:00
Mouse Reeve e0ffcddd3c
Merge pull request #2003 from bookwyrm-social/modal-button-pattern
Consistent positioning of success buttons
2022-03-10 14:29:39 -08:00
Mouse Reeve f2bf52ccb9
Merge pull request #2002 from bookwyrm-social/cw-refactor
Refactors content warning field
2022-03-10 14:29:16 -08:00
Mouse Reeve dbf925f176 Removes trailing whitespace 2022-03-10 10:52:39 -08:00
Mouse Reeve 9977b33a8d Group, list, and shelve form buttons 2022-03-10 10:49:33 -08:00
Mouse Reeve d4be0ca58b Report modal 2022-03-10 10:02:18 -08:00
Mouse Reeve 20453a9977 Delete readthrough and add cover modals 2022-03-10 09:57:55 -08:00