Commit graph

5280 commits

Author SHA1 Message Date
Mouse Reeve 0cf2c07069
Merge branch 'main' into url-names 2022-03-16 16:32:07 -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 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 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 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 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
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 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 0c87ee1d4b Fixes instructions on admin themes view 2022-03-13 11:36:31 -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
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 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 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
Mouse Reeve 8b4c9483ea Udates sync modals 2022-03-10 09:49:27 -08:00
Mouse Reeve cbcd5c7a57 Adds elided page range to editions 2022-03-10 09:49:17 -08:00
Mouse Reeve 672eee9c9c Updates add file link modal 2022-03-10 09:41:32 -08:00
Mouse Reeve d7eb118a07 Updates readthrough modal 2022-03-10 09:35:05 -08:00
Mouse Reeve 1657f28c5e Updates verification modal button positions 2022-03-10 09:30:39 -08:00
Mouse Reeve cc2b774fb5 Updates wording on content warning field 2022-03-10 09:16:50 -08:00
Mouse Reeve bcd83ee802 Fixes list notes icon 2022-03-10 09:16:44 -08:00
Mouse Reeve a922b8fd04 Uses details to show/hide content warning field 2022-03-10 09:03:24 -08:00
Mouse Reeve e2476d1ad3 Move content warning toggle out of post options block 2022-03-10 08:38:06 -08:00
Orage Pika 0c429ee6d7 bw-dev blacked 2022-03-09 16:04:58 +01:00
Levi Bard 0c0d0b6299 Allow book subjects to be edited 2022-03-09 10:33:59 +01:00
corentin-feys bb7d080f65 Replaced tabs with spaces 2022-03-07 21:20:42 +01:00
corentin-feys 35f115bc0a removed unneeded code for invite question 2022-03-07 19:42:57 +01:00
corentin-feys e1e03ebd22 removed unneded migrations 2022-03-07 19:41:24 +01:00
Orage Pika 5fbb5c655b custom questions 2022-03-07 18:49:59 +01:00
Mouse Reeve 34a4c18397
Merge branch 'main' into partially-read-shelf 2022-03-05 19:23:35 -08:00
Mouse Reeve f26106fffd Python formatting 2022-03-04 12:42:43 -08:00
Mouse Reeve b0c0af9617 Adds custom compile management command 2022-03-04 12:40:06 -08:00
Vivianne Langdon 8838875879 Fix failure to 404 2022-03-02 04:07:13 -08:00
Vivianne Langdon 81594892ef Fix test for unit test requests 2022-03-02 03:42:29 -08:00
Vivianne Langdon 05f11e68c5 Hopefully knocking out many of the unit test fails 2022-03-02 03:11:02 -08:00
Vivianne Langdon 440e2f8806 black 2022-03-02 01:47:08 -08:00
Vivianne Langdon 2b483488aa Remove slugs from shelf as their id has text in it already 2022-03-02 01:37:58 -08:00
Vivianne Langdon 846963ad18 Fix accidental change to post 2022-03-02 01:16:30 -08:00
Vivianne Langdon d8181d6d66 Redirect to correct url with slug 2022-03-02 01:12:32 -08:00
Vivianne Langdon ebf463fc91 Generation of slugs and new urls to handle slugs
- TODO: redirect to correct slug if not found.
2022-03-02 00:21:23 -08:00
Vivianne 3ee3e9a13c
Merge branch 'main' into code-scanning 2022-03-01 18:33:40 -08:00
Mouse Reeve a99d482167 Temporary fix 2022-03-01 14:38:50 -08:00
Mouse Reeve f7c6c70c5e Ticks version 2022-03-01 12:15:56 -08:00
Mouse Reeve 12ad88ac29
Merge pull request #1975 from bookwyrm-social/themes
Themes
2022-03-01 12:03:22 -08:00
Mouse Reeve 07daa24a72 Merge branch 'main' into themes 2022-03-01 11:46:02 -08:00
Mouse Reeve 89c8aa83f4 Tweaks preferences wording 2022-03-01 11:44:39 -08:00
Mouse Reeve 38535f811c Python formatting 2022-03-01 11:39:08 -08:00
Mouse Reeve 41ea7db8b6 Removes hardcoded white in announcements 2022-03-01 11:06:15 -08:00
Mouse Reeve 55f1ce12cf Second attempt at fixing tests using context processors 2022-03-01 11:05:47 -08:00
Mouse Reeve 4cdbdd8d0b
Merge pull request #1977 from viviicat/dark-theme
Dark theme
2022-03-01 11:00:05 -08:00
Mouse Reeve 9422a07414 Safer query for request user for tests 2022-03-01 10:36:19 -08:00
Mouse Reeve 5d7e6b872a Fixes localizing query for superlatives 2022-03-01 10:34:17 -08:00
Mouse Reeve d1d743281a Cleans up display of superlatives on about page 2022-03-01 10:28:51 -08:00
Mouse Reeve c7c90f9e9b Removes test print statement 2022-03-01 10:09:53 -08:00
Mouse Reeve f4dc07b6b9 Select theme in context processors 2022-03-01 09:53:02 -08:00
Vivianne Langdon 8e9bacc527 Fix red for <code> being too harsh 2022-02-28 23:31:57 -08:00
Vivianne Langdon b4222bead4 Remove uuid for status reply panel
- The focus target did not include this uuid, so was throwing `Uncaught TypeError: node is null` when clicking on Reply button.
- I wasn't able to figure out how to share the uuid between blocks but it doesn't seem like the uuid is really needed -- the same block has other ids that do not have the uuid in them.
2022-02-28 23:01:33 -08:00
Vivianne Langdon c0fed31fb0 eslint 2022-02-28 21:28:33 -08:00
Vivianne Langdon 62b4133e58 Move quagga to vendor. 2022-02-28 21:22:49 -08:00
Vivianne 8c92869fc0
Merge branch 'main' into code-scanning 2022-02-28 21:17:32 -08:00
Mouse Reeve 2c8fa5cd9b
Merge branch 'themes' into dark-theme 2022-02-28 13:32:37 -08:00
Mouse Reeve a6883b5b87 Adds merge migration 2022-02-28 13:30:02 -08:00
Mouse Reeve 043fd54d70
Merge branch 'main' into themes 2022-02-28 13:27:05 -08:00
Mouse Reeve e1ea847441
Merge pull request #1986 from bookwyrm-social/instance-refresh
Instance refresh
2022-02-28 13:26:22 -08:00
Mouse Reeve 81cfcff939 Reload instance data 2022-02-28 13:11:01 -08:00
Mouse Reeve c91b08303b More breadcrumbs 2022-02-28 12:31:28 -08:00
Mouse Reeve f4aa202292 Adds counts of blocked and federated instances 2022-02-28 12:27:54 -08:00
Mouse Reeve 991461221d Adds breadcrumbs instead of "back" link 2022-02-28 12:24:45 -08:00
Mouse Reeve 00d0d9d5de Avoid whitespace when adding instance 2022-02-28 12:20:04 -08:00
Mouse Reeve 3dbbe0089c Show if user follows you 2022-02-28 12:07:06 -08:00
Mouse Reeve ec93d1812a Block access to follow views 2022-02-28 12:04:47 -08:00
Thomas Versteeg 1e3f9246d6 Produce a proper status 2022-02-28 20:56:59 +01:00
Mouse Reeve 5837c37a32 Hide followers info slug 2022-02-28 11:55:54 -08:00
Mouse Reeve e90cb52f23 Add option to hide follows 2022-02-28 11:48:49 -08:00
Thomas Versteeg 539775f370 Merge remote-tracking branch 'upstream/main' into partially-read-shelf 2022-02-28 20:44:55 +01:00
Mouse Reeve 6c17aa7630
Merge pull request #1983 from bookwyrm-social/shelf-name-translation
Shelf name translation
2022-02-28 11:28:53 -08:00
Mouse Reeve 5cdcac0682
Merge pull request #1981 from bookwyrm-social/list-duplicate-books
Show meaningful message when you try to add a duplicate book to a list
2022-02-28 11:21:18 -08:00
Mouse Reeve 7d6032e110 Fixes calls to filter 2022-02-28 11:18:03 -08:00
Mouse Reeve ffb4098cfb Fixes translation of "remove from shelf" string 2022-02-28 11:07:12 -08:00
Mouse Reeve 0f5fd6be15 Move translations to filter 2022-02-28 11:05:12 -08:00
Mouse Reeve 374dd24fa8 Remove reviews from deleted users 2022-02-28 10:47:08 -08:00
Mouse Reeve 142cc5437a Move sorting to separate function 2022-02-28 10:41:40 -08:00
Mouse Reeve 99fc3aaf25 Avoid showing success and failure 2022-02-28 10:31:58 -08:00
Mouse Reeve b2b3ba653e Refactors how success/failure messages how on list page 2022-02-28 10:29:58 -08:00
Mouse Reeve 202696f913 Don't show lists a book is already on in add form 2022-02-28 10:03:24 -08:00
Mouse Reeve c82042f506 Delete themes 2022-02-28 09:55:23 -08:00
Mouse Reeve 106ef2e3a4 Fixes reference to theme in layout 2022-02-28 09:46:05 -08:00
Mouse Reeve 295d9c42d7 Adds theme to user settings form 2022-02-28 09:45:34 -08:00
Mouse Reeve a00ee8a706 Adds link to set instance-wide theme 2022-02-28 09:43:31 -08:00
Mouse Reeve 2d516812b4 Fixes icons by moving import to theme 2022-02-28 09:34:54 -08:00
Mouse Reeve 4d3e709b2a
Update layout.html 2022-02-28 09:23:03 -08:00
Mouse Reeve 3283302093
Merge branch 'themes' into dark-theme 2022-02-27 20:21:17 -08:00
Vivianne Langdon 3a9ff2c2ea Refer to canvas by type
- Fixes stylelint without adding an exclusion
2022-02-27 14:08:11 -08:00
Vivianne Langdon c0380cca5a stylelint 2022-02-27 14:04:30 -08:00
Vivianne Langdon fbe7e860e8 Prettier 2022-02-27 14:01:25 -08:00
Mouse Reeve 8259d16ee9 Check available themes in form 2022-02-27 11:20:11 -08:00
Mouse Reeve 005b69177c
Merge branch 'themes' into dark-theme 2022-02-27 10:54:15 -08:00
Mouse Reeve c8d3222c33
Rename dark.scss to bookwyrm-dark.scss 2022-02-27 10:52:07 -08:00
Mouse Reeve fd0f739418
Rename light.scss to bookwyrm-light.scss 2022-02-27 10:51:49 -08:00
Mouse Reeve 8850b68b52 Show theme options 2022-02-27 10:48:33 -08:00
Mouse Reeve cc015536fa Adds theme instructions 2022-02-27 10:12:47 -08:00
Mouse Reeve 3dfbb3272e Theme selector 2022-02-27 10:00:50 -08:00
Mouse Reeve 6e96c1eee7 Avoid linter error 2022-02-27 08:09:17 -08:00
Vivianne Langdon e4d7dd7ee4 Fix progress bar 2022-02-27 05:29:33 -08:00
Vivianne Langdon 40319302b7 Initial theme 2022-02-27 05:20:29 -08:00
Vivianne Langdon 789626a9da Stray line 2022-02-27 00:39:45 -08:00
Vivianne Langdon f5c66b5b4a Adjust layout more
Ensure camera select box is never hidden.
2022-02-27 00:33:54 -08:00
Vivianne Langdon 43f62ef5d7 d'oh, fix event leak 2022-02-27 00:18:38 -08:00
Vivianne Langdon 9f67a74340 Show grant access dialog every time we initialize 2022-02-27 00:04:25 -08:00
Vivianne Langdon e71a5e3bdf Add barcode icon and use other icons
Minor formatting and messaging tweaks
2022-02-27 00:00:22 -08:00
Vivianne Langdon f4d5b7b4d2 Adjusted message 2022-02-26 23:28:52 -08:00
Vivianne Langdon 9b0874f889 Fix barcode button 2022-02-26 23:28:13 -08:00
Vivianne Langdon cdddf73e29 Improve layout for some camera types 2022-02-26 23:22:44 -08:00
Vivianne Langdon 464050deaa Implement switching cameras
Also, use session storage to remember last selected camera deviceId, if any
2022-02-26 21:32:01 -08:00
Vivianne Langdon fee6ffcbd8 Fix formatting in chrome
Was using experimental selector, forget about it.
Also reduce jumping around of video size
2022-02-26 21:29:18 -08:00
Vivianne Langdon 8d0e549480 Improve visuals and quality of scanning 2022-02-26 20:19:26 -08:00
Vivianne Langdon 649ffe571a Fix typos with searching 2022-02-26 18:29:38 -08:00
Vivianne Langdon fcc8b6aaab Move to sass 2022-02-26 18:19:12 -08:00
Vivianne Langdon 340b306d2e Fix path 2022-02-26 18:08:07 -08:00
Vivianne Langdon 48c8166e58 Merge branch 'main' into code-scanning 2022-02-26 17:54:33 -08:00
Mouse Reeve 43269429ac Use selected theme 2022-02-26 13:40:06 -08:00
Mouse Reeve e15193e100 Adds themes 2022-02-26 12:44:20 -08:00
Mouse Reeve 6b5bebdf78 Cleans up scheduler form 2022-02-26 10:45:43 -08:00
Mouse Reeve 0870eccad9 Adds unscheduler 2022-02-26 10:24:23 -08:00
Mouse Reeve 2a436800c4 Schedules automod task 2022-02-26 10:14:47 -08:00
Mouse Reeve 95e9119817 Adds django celery beat 2022-02-26 08:44:19 -08:00
Mouse Reeve a5571c65bc
Update 0134_alter_stopped_reading.py 2022-02-25 18:25:41 -08:00
Mouse Reeve b511928400
Create 0134_alter_stopped_reading.py 2022-02-25 18:08:30 -08:00
Mouse Reeve eea7d9d4e5 Retain author across saves 2022-02-25 17:57:18 -08:00
Mouse Reeve 29a6d74ff2 Python formatting 2022-02-25 17:23:13 -08:00
Mouse Reeve b001c31f97 Save author along with added edition 2022-02-25 16:54:03 -08:00
Mouse Reeve c67f92af46 Add editions view 2022-02-25 16:40:34 -08:00
Mouse Reeve 1d99e455e8 Adds link to add edition to editions page 2022-02-25 16:40:21 -08:00
Thomas Versteeg 8deee2220e Fix stopped reading status model in non-javascript environment 2022-02-25 22:39:42 +01:00
Thomas Versteeg 5eb113af6b Create merge migration 2022-02-25 22:03:49 +01:00
Thomas Versteeg e9dfa42e11
Merge branch 'main' into partially-read-shelf 2022-02-25 21:00:29 +00:00
Mouse Reeve 02808f88e6 eslint fixes 2022-02-25 13:00:23 -08:00
Mouse Reeve 65bd3945e7 Prettify tabs file 2022-02-25 12:52:35 -08:00
Mouse Reeve cec7625e1e Moves tabs script to main scripts directory
It's our own custom script at this point
2022-02-25 12:47:46 -08:00
Mouse Reeve 5d4efd457a Removes scrollIntoView script behavior for tabs 2022-02-25 12:39:44 -08:00
Mouse Reeve 8ca2b55e7e Sort author books by rating 2022-02-25 12:04:21 -08:00
Mouse Reeve 6d1d62cf2f View for starting to edit a book with existing data 2022-02-25 11:50:25 -08:00
Mouse Reeve 689be8c94b Only scan local data 2022-02-24 17:42:28 -08:00
Mouse Reeve 84ef214ca1 Valid template markup 2022-02-24 17:36:49 -08:00
Mouse Reeve eb8b9fdaed Fixes bugs in model task 2022-02-24 17:33:22 -08:00
Mouse Reeve 1aa6b99d1f Adds tests 2022-02-24 17:33:05 -08:00
Mouse Reeve f446828175 Fixes template typo 2022-02-24 14:39:09 -08:00
Mouse Reeve 84b9a19339 Expands scanned fields 2022-02-24 13:29:17 -08:00
Mouse Reeve 93f82fbf18 Adds notifications 2022-02-24 13:20:18 -08:00
Mouse Reeve ad41f19dc5 Updates report model 2022-02-24 13:00:41 -08:00
Mouse Reeve 3ce8b3390e Adds task 2022-02-24 12:16:18 -08:00