Commit graph

2732 commits

Author SHA1 Message Date
Joachim f287a19f12 Update settings.py 2021-06-07 18:31:01 +02:00
Joachim 715cb46e1e Lint 2021-06-07 18:15:48 +02:00
Joachim b448d40514 Use the right snippets on Templates 2021-06-07 18:13:24 +02:00
Joachim cba34780d8 Use S3 as static and media storage
TODO

- [ ] Write some documentation for non-AWS, S3-compatible services
- [ ] Make a management command to move existing media to the new S3 bucket
- [ ] See if Nginx can reverse-proxy the S3 bucket in order to keep the files accessible through the domain name
2021-06-07 18:12:48 +02:00
Mouse Reeve 5b40069d99
Merge pull request #1153 from bookwyrm-social/instance-language
Use "instance" consistently
2021-06-06 14:07:49 -07:00
Joachim 7ed2ed116a lint 2021-06-06 21:13:16 +02:00
Joachim 1f2c296cfd This should now work 2021-06-06 21:12:21 +02:00
Mouse Reeve 4ea672f2a1
Merge pull request #1157 from bcj/bcj/urlencode-redis-password
URL-Encode password in broker_url
2021-06-05 12:51:25 -07:00
Mouse Reeve c8d2df1203
Merge pull request #1155 from joachimesque/front-modal-title-fit
Front: Modal title fit
2021-06-05 12:43:35 -07:00
Mouse Reeve d1e33e14e2
Merge pull request #1154 from joachimesque/front-better-forms
Front-end: Better forms
2021-06-05 12:38:20 -07:00
Mouse Reeve bbbae9fc9d
Merge branch 'main' into images-django-imagekit 2021-06-05 11:46:57 -07:00
Mouse Reeve 61e55628fa
Merge pull request #1131 from joachimesque/author-page-microformats
Author page microformats
2021-06-05 11:27:16 -07:00
Joachim 6f105fcdcc Front: Modal title fit 2021-06-02 18:56:24 +02:00
Joachim 49c057625a Smol fixes 2021-06-02 18:30:36 +02:00
Joachim 7d1e4aebbc Better forms 2021-06-02 18:17:53 +02:00
Mouse Reeve 2816d7cc88 Use "instance" consistently 2021-06-01 14:50:14 -07:00
Mouse Reeve ff45238667
Merge pull request #1123 from eatsleepdeploy/add-max-upload-size-config
Add max upload size config
2021-06-01 14:09:50 -07:00
Joachim cd7c0ccaea Enable env on GitHub Actions 2021-05-29 15:51:56 +02:00
Joachim ba39dad06c Add save_and_cleanup test 2021-05-29 15:32:04 +02:00
Joachim 00b09cd07d Try with logging 2021-05-29 14:43:06 +02:00
Joachim fbb262fe88 Try logging output 2021-05-29 13:44:43 +02:00
Joachim cc0881b11c Try another way 2021-05-29 12:33:04 +02:00
Joachim 022182e114 See if the image is saved in DB in the Github Actions test environment 2021-05-29 11:33:37 +02:00
Joachim b4e2d8c6e3 Better refresh object in test 2021-05-29 11:17:59 +02:00
Joachim 0f80456a08 Save as JPG 2021-05-28 23:42:04 +02:00
Joachim 872084d61a Update test_preview_images.py 2021-05-28 23:41:41 +02:00
Joachim 9cee119200 test 2021-05-28 23:29:28 +02:00
Joachim 0e28b79089 third time's the charm 2021-05-28 22:10:57 +02:00
Joachim 71bc35224b no, this will work 2021-05-28 22:00:26 +02:00
Joachim 8755b92c2e Fix GitHub FileNotFoundError 2021-05-28 21:40:20 +02:00
Joachim 2bf254bce7 Update test_preview_images.py 2021-05-28 21:26:13 +02:00
Joachim ec159ebcb0 Test generating preview images 2021-05-28 21:24:45 +02:00
Joachim 08cebd7051 Lint 2021-05-28 17:26:43 +02:00
Joachim 61367c3f4f Protect generate_preview_images command
- add `--all` argument
- send computation intensive tasks to Celery
2021-05-28 17:25:20 +02:00
Joachim f206f61e9a Use global switch to enable/disable preview images 2021-05-28 17:00:07 +02:00
Joachim 878cc5cb17 Lint 2021-05-27 23:21:47 +02:00
Joachim f8df501239 Fix tests (for realz) 2021-05-27 23:19:17 +02:00
Joachim d9d34d8220 Fix linting 2021-05-27 21:40:23 +02:00
Joachim b7965ce2ae Fix tests 2021-05-27 21:37:27 +02:00
Joachim b8bff8a882 Use field tracker to launch task on field change 2021-05-27 21:09:57 +02:00
Joachim 2ea1cd8319 Tests 2021-05-26 23:57:29 +02:00
Joachim f848dcd756 Fix issue with protocol 2021-05-26 18:20:22 +02:00
Joachim e214d8b879 Rationalize paths handling 2021-05-26 17:55:39 +02:00
Joachim e362c82495 Expose static & media paths 2021-05-26 17:54:59 +02:00
Joachim 7ea3153026 Fix site_path tag 2021-05-26 16:57:28 +02:00
Joachim 3ea935e7ce Update OFL.txt 2021-05-26 15:49:08 +02:00
Joachim f7b117e4fb Update preview_images.py 2021-05-26 15:46:40 +02:00
Joachim a8ae3c9950 Modify inner image position 2021-05-26 15:37:09 +02:00
Joachim 22c13f639c Update layout.html 2021-05-26 15:18:35 +02:00
Joachim 5943e6d79a Black 2021-05-26 15:18:05 +02:00
Joachim d4fc1b0fdf Fix line endings 2021-05-26 15:17:28 +02:00
Joachim 4db8aa85f0 Fix migration 2021-05-26 14:55:55 +02:00
Joachim eb56cced8d Lint 2021-05-26 14:46:34 +02:00
Joachim e5e549d125 Add opengraph image depending on context 2021-05-26 14:44:15 +02:00
Joachim 65de40a95a Add generate_preview_images command 2021-05-26 13:52:10 +02:00
Fabien Basmaison c894f5ef35 Update subtitle behaviour:
- on Book
	- Remove problematic punctuation (locale and multiple punctuation if the title ends with `?`, `!` or similar).
	- Update view.
	- Use proper semantic to split combined title into `name`, `alternativeHeadline` and series-related microdata.
	- The author is not a subtitle, just data.
- Use parenthesis in the `get_title` filter instead of punctuation.
2021-05-26 13:21:06 +02:00
Joachim b47edc5f0d Add dark mode 2021-05-26 13:07:33 +02:00
Joachim bf503d370c Add user preview task 2021-05-26 12:54:57 +02:00
Joachim 34caa36ab7 Add site preview task 2021-05-26 10:19:39 +02:00
Joachim 101ca0ff81 Refactor some 2021-05-26 09:44:32 +02:00
Joachim fd82567cbf Update 0076_book_preview_image.py 2021-05-26 09:16:15 +02:00
Joachim a83aa47c9a Generate on new rating 2021-05-26 09:10:05 +02:00
Joachim 8c25272462 Fix last night's bugs 2021-05-26 09:09:13 +02:00
Joachim 5b03934ec3 Update preview_images.py 2021-05-25 23:16:33 +02:00
Joachim e305c5d73d Fix color 2021-05-25 23:12:54 +02:00
Joachim dca0888d5d Thank you Black 2021-05-25 23:05:38 +02:00
Joachim fa7334826c Update 2021-05-25 23:04:28 +02:00
Joachim d1737b44bd First functioning commit
TODO

- [ ] Delay task (Celery?)
- [ ] Store the image in a subfolder unique to the edition, to make cleaning up the image easy
- [ ] Clean up the image before replacing it
- [ ] Ensure that the image will be cleaned when the edition is deleted ??
- [ ] Use instance custom colors?
- [ ] Use book cover color base?
2021-05-25 00:41:53 +02:00
Joachim b72580daf6 Update author.html 2021-05-24 17:17:12 +02:00
Joachim 8b4cb4aeed Thanks, ./bw-dev black 2021-05-24 16:40:25 +02:00
Joachim ef4961e4e9 Apply linter suggestions 2021-05-24 16:33:40 +02:00
Mouse Reeve ea0f7ff925
Merge pull request #1137 from bookwyrm-social/title-header
Uses correct filter for book title
2021-05-24 07:21:12 -07:00
Joachim 36f447210a Specify sizes on all templates 2021-05-24 16:18:05 +02:00
Joachim dc49432322 Change img_path to external_path 2021-05-24 16:17:39 +02:00
Joachim c1456ce853 Update .cover-caption name and styles 2021-05-24 16:16:33 +02:00
Joachim 4c55f07f2a Update book_cover.html 2021-05-24 16:16:09 +02:00
Joachim f60e9d76d2 Generate generators 2021-05-24 16:15:08 +02:00
Joachim 77e81c4dbb Add django-imagekit to BookWyrm 2021-05-24 16:14:51 +02:00
Mouse Reeve f058aa8f1d Uses correct filter for book title 2021-05-24 06:54:43 -07:00
Joachim 25858ed3aa Added LibraryThing and Goodreads links 2021-05-24 12:51:41 +02:00
Joachim 594f7b3708 Style fixes 2021-05-24 12:51:18 +02:00
Joachim 58c07d1677 Apply review suggestions 2021-05-24 12:36:48 +02:00
bcj 31deb36c85 URL-Encode password in broker_url
Needed to prevent connection errors if the password contains non-urlsafe characters.

Dockerfile change because all the services using it are mirroring ./ in /app now anyway.
Flower needs because it needs bookwyrm in order to read the celerywyrm config (because flower only allows overwriting broker_url from the command line and we want to do it in Python so we have access to a urlencode function).
2021-05-23 23:49:12 -05:00
Jason Kelly b362b72c57 Python linting 2021-05-24 09:35:21 +08:00
Joachim 55a3a28d49 Add microformats to author page 2021-05-23 21:17:14 +02:00
Joachim 6e9c9e839c Fix date of death display 2021-05-23 20:25:42 +02:00
Mouse Reeve c9b337348e
Merge pull request #1126 from bookwyrm-social/deleted-ratings
Don't show deleted ratings in stars
2021-05-23 09:00:53 -07:00
Mouse Reeve ca8067769c Don't show deleted ratings in stars 2021-05-23 08:48:00 -07:00
Mouse Reeve 4e9c7a7748
Merge pull request #1070 from bookwyrm-social/top-bar
Top bar
2021-05-23 08:42:14 -07:00
Joachim 354b511089 Fix flex styles 2021-05-23 17:18:16 +02:00
Joachim 1aa319d6ee Move description text below header 2021-05-23 17:17:46 +02:00
Joachim cf7cbfdf8f Fix title styles 2021-05-23 17:17:30 +02:00
Joachim 9eb719106f Fix display bug 2021-05-23 17:17:02 +02:00
Joachim 251c8bbd08 Merge remote-tracking branch 'upstream/main' into list-style-fixes 2021-05-23 15:14:50 +02:00
Joachim 0708d64bf1 Update bookwyrm.css 2021-05-23 12:10:57 +02:00
Jason Kelly 7eb5f3b026 Making magic number more readable 2021-05-23 14:31:22 +08:00
Jason Kelly 6e655cb0e0 Added new widget to alert if a file is set at larger than 10 MB.
- Updated default widget to use template that adds a notification box.
- Added JS to add onchange & load events to look at the value in the input and trigger the notification & disable the form submits.
2021-05-23 14:12:00 +08:00
Jason Kelly c9617c4bd3 Added EMAIL_BACKEND to env settings to be able to use console backend in local dev. 2021-05-23 14:09:13 +08:00
Mouse Reeve f987a352c6 Fixes username helper 2021-05-22 21:33:56 -07:00
Mouse Reeve bdf267dea5 Refactors block button for query efficiency 2021-05-22 20:36:30 -07:00
Mouse Reeve 9285f483c2 Query tweaks for book page 2021-05-22 20:14:57 -07:00
Mouse Reeve 2d4cec4422 Improves shelf page query efficiency a little 2021-05-22 19:54:50 -07:00
Mouse Reeve 7a4c4248df Improves status template performance
Reduces queries about about 65
2021-05-22 19:01:40 -07:00
Mouse Reeve e5ff4ac36d Python formatting 2021-05-22 18:02:14 -07:00
Mouse Reeve 3d3ab6433e Improves query efficiency for shelve buttons
About 50 fewer queries (yikes)
2021-05-22 17:58:08 -07:00
Mouse Reeve 368d2cd716 Reduces feed page queries for goals
9 fewer queries
2021-05-22 17:34:16 -07:00
Mouse Reeve d33b55e025 Hide delete button text on mobile 2021-05-21 09:52:40 -07:00
Mouse Reeve 00eba98e9f Fixes display of announcement show/hide button on mobile 2021-05-21 09:50:23 -07:00
Mouse Reeve ea56d42906
Merge pull request #1116 from bookwyrm-social/import-async-error
Don't error when task for import no longer exists
2021-05-20 21:14:15 -07:00
Mouse Reeve 8772f26b91 Don't error when task for import no longer exists 2021-05-20 20:35:12 -07:00
Mouse Reeve a70c713c29 Fixes default values in edit announcement form 2021-05-20 20:21:04 -07:00
Mouse Reeve d39374f13c Fixes editions page 2021-05-20 18:41:36 -07:00
Mouse Reeve 9933b888f9
Merge pull request #1112 from bookwyrm-social/search-null-state
Fixes search null state view
2021-05-20 16:49:46 -07:00
Mouse Reeve e74bb4e33c
Merge pull request #1111 from bookwyrm-social/rss-templates
Moves rss templates to base level directory
2021-05-20 16:40:41 -07:00
Mouse Reeve 6cadba78fe Python formatting 2021-05-20 16:38:12 -07:00
Mouse Reeve a8a8398cf8 Fixes search null state view 2021-05-20 16:34:32 -07:00
Mouse Reeve ab3fb4d555 Adds test for search with no query 2021-05-20 16:32:44 -07:00
Mouse Reeve b6c17defd7
Merge pull request #1108 from bookwyrm-social/ol-redirects
Handle openlibrary redirects
2021-05-20 16:18:51 -07:00
Mouse Reeve 2a451e83c6
Merge pull request #1109 from bookwyrm-social/invalid-image-url
Handle all kinds of invalid image urls
2021-05-20 16:18:44 -07:00
Mouse Reeve c52b26f404 Moves rss templates to base level directory 2021-05-20 16:12:24 -07:00
Mouse Reeve 5401d73909 404 instead of error for invalid post link 2021-05-20 16:06:23 -07:00
Mouse Reeve f1d4f092f2 Handle all kinds of invalid image urls 2021-05-20 16:03:14 -07:00
Mouse Reeve 1e9211018d Handle openlibrary redirects 2021-05-20 15:55:50 -07:00
Mouse Reeve f6440aa173 Correctly handles openlibrary works with no editions 2021-05-20 15:37:26 -07:00
Mouse Reeve 4af6667d6a
Merge pull request #1105 from bookwyrm-social/suggested-users-error
Fixes logic error in get started user view
2021-05-20 15:26:39 -07:00
Mouse Reeve 633a4c4135
Merge pull request #1104 from bookwyrm-social/banner-auth
Only show banner to authenticated users
2021-05-20 15:26:29 -07:00
Mouse Reeve 0ba7ee41fe
Merge pull request #1102 from bookwyrm-social/pagination-get
Uses safe method for pagination on follows pages
2021-05-20 15:17:54 -07:00
Mouse Reeve 82f74a4049 Fixes logic error in get started user view 2021-05-20 15:17:05 -07:00
Mouse Reeve 9c13bf34a8 Only show banner to authenticated users 2021-05-20 15:11:47 -07:00
Mouse Reeve 3f1d670911 Uses safe method for pagination on follows pages 2021-05-20 14:47:23 -07:00
Mouse Reeve 62dc8270b6 Catch unexpectedly missing columns in csv imports
I kept the 500 error here so that things don't silently fail in
unexepcted ways
2021-05-20 14:39:33 -07:00
Mouse Reeve ff3c4b8e73 Fixes announcement view test 2021-05-20 13:42:30 -07:00
Mouse Reeve cefc5994a6 Makes extra content optional 2021-05-20 12:40:03 -07:00
Mouse Reeve fdb315d2ac Adds individual announcement page test 2021-05-20 12:14:57 -07:00
Mouse Reeve 44e8db3f33 Adds view test for announcements admin page 2021-05-20 12:12:11 -07:00
Mouse Reeve 2e193aa3c6 Delete announcements 2021-05-20 12:08:12 -07:00
Mouse Reeve a415991e96 Fixes clashing filter names in templates 2021-05-20 11:56:26 -07:00
Mouse Reeve b8e9b9f57e Cleans up show/hide behavior 2021-05-20 11:46:24 -07:00
Mouse Reeve 49916a7498 Sorting for announcement headers and pagination 2021-05-20 09:43:29 -07:00
Mouse Reeve 3d70a36d86 Editable announcement 2021-05-20 09:28:39 -07:00
Mouse Reeve d64e0c4aa8 Adds admin view for individual announcement 2021-05-20 08:09:35 -07:00
Mouse Reeve c73c063949 Show announcements on all pages 2021-05-19 15:35:14 -07:00
Mouse Reeve 346d718265 Don't need both name and preview 2021-05-19 15:18:43 -07:00
Mouse Reeve 515d5bb237 Create announcements admin view 2021-05-19 14:57:28 -07:00
Mouse Reeve d1f2d9812f Adds model for instance admin announcements 2021-05-19 14:00:46 -07:00
Mouse Reeve 3b295a724e
Merge pull request #1096 from bookwyrm-social/book-fields
Add more book fields to book edit form
2021-05-18 22:36:10 -07:00
bcj 213a9508d8 Don't hardcode postres port in bookwyrm.settings
Have bookwyrm.settings check for an alternative postgres port.
2021-05-18 18:35:32 -05:00
Mouse Reeve 8fc0da8dc2 Adds inventaire ID field to edit book form 2021-05-18 16:10:43 -07:00
Mouse Reeve 6fff45d36c Adds language field to edit book form 2021-05-18 15:56:11 -07:00
Mouse Reeve 0c0dcc57d6 Adjusts line length 2021-05-18 12:51:57 -07:00
Mouse Reeve 097659a627
Merge pull request #1075 from bookwyrm-social/disable-connectors
Disable related connector when an instance is blocked
2021-05-18 12:41:09 -07:00
Mouse Reeve 82117a7d28 Tests deactivating connectors 2021-05-18 12:29:01 -07:00
Mouse Reeve 0bddad259b
Merge pull request #1095 from bookwyrm-social/display-fixes
Display fixes
2021-05-18 11:46:28 -07:00
Mouse Reeve 9f789cd5d4
Merge branch 'main' into top-bar 2021-05-18 11:39:36 -07:00
Mouse Reeve 3d7f3f34c1 Fixes book view test 2021-05-18 11:36:50 -07:00
Mouse Reeve 04c165113f Cleans up login page 2021-05-18 11:22:45 -07:00
Mouse Reeve 58a059c85f Fixes display of user ratings 2021-05-18 11:17:59 -07:00
Mouse Reeve 07d59c8c09 Don't show ratings below user statuses 2021-05-18 11:09:19 -07:00
Mouse Reeve ab69abb8f0 Gap between book search results 2021-05-18 10:57:54 -07:00
Mouse Reeve 8b14f8585e Small fixes for list display 2021-05-18 10:55:05 -07:00
Mouse Reeve 5cd5a6107f Show text with buttons in most places 2021-05-18 10:45:51 -07:00
Mouse Reeve 7dccce6b1f Adds keyboard focus to add readthrough form 2021-05-18 09:59:40 -07:00
Mouse Reeve 3c7882b055 Fixes abstract minimal connector test 2021-05-14 16:13:32 -07:00
Mouse Reeve 2b4ac71d7a Updates footer language around github link 2021-05-14 15:21:26 -07:00
Mouse Reeve 3b9fed1b31 Filter for concise status timestamps 2021-05-11 18:59:31 -07:00
Mouse Reeve 865faf6714 Fixes tests 2021-05-11 15:52:41 -07:00
Mouse Reeve 65f78b45da Merge branch 'main' into templatetags 2021-05-11 15:41:07 -07:00
Mouse Reeve 87bf863ac6
Revert "Preserve width when cover images fail to load" 2021-05-11 15:29:18 -07:00
Mouse Reeve dbf795be5d Python formatting 2021-05-11 15:16:27 -07:00
Mouse Reeve ac2b63d0cd More templatetag files 2021-05-11 15:14:42 -07:00
Mouse Reeve 58da17d694 Use smaller templatetag modules 2021-05-11 14:41:28 -07:00
Mouse Reeve eba6159f68 Moves status interaction filters into their own module 2021-05-11 14:14:22 -07:00
Mouse Reeve acd26012be Removes more unused filters 2021-05-11 14:12:28 -07:00
Mouse Reeve f5eb5f982a Removes filter for checking for follow requests 2021-05-11 14:05:46 -07:00
Mouse Reeve 3de8ae00ae Removes unused templatetag 2021-05-11 14:00:23 -07:00
Mouse Reeve 04cc2fb3f3 Removes unused dict_key filter 2021-05-11 13:55:46 -07:00
Mouse Reeve 63172ecf00 Fixes ratings on shelf pages 2021-05-11 13:54:38 -07:00
Mouse Reeve 1fbd6537b7 Remove unnecessary tags from import page 2021-05-11 13:28:52 -07:00
Mouse Reeve d7a8dd5e19 Removes outdated field form abstract connector 2021-05-11 13:20:17 -07:00
Mouse Reeve 9b42bba236 Filter out inactive connectors 2021-05-11 11:34:58 -07:00
Mouse Reeve 19f788b9aa Deactivate connectors related to blocked federated servers 2021-05-11 11:31:02 -07:00
Mouse Reeve e7c5b77b4c Removes unused connector fields and adds active boolean 2021-05-11 09:54:04 -07:00
Mouse Reeve 680f300e7c Preserve width when cover images fail to load 2021-05-11 08:15:02 -07:00
Mouse Reeve db5796764b
Merge pull request #1071 from bookwyrm-social/author-page
Updates author page
2021-05-10 19:26:10 -07:00
Mouse Reeve 92e2c70baf Fixes list sorting by rating 2021-05-10 18:28:31 -07:00
Mouse Reeve 6dae4ebd6f Splits list tests into two files and adds user list page tests 2021-05-10 17:44:19 -07:00
Mouse Reeve 4c99fd7f12 Adds metadata to author view 2021-05-10 17:24:10 -07:00
Mouse Reeve 443109bac3 Adds aliases and inventaire id to edit author form
Plus consolidates some wording
2021-05-10 17:06:22 -07:00
Mouse Reeve 9bfe4f4e91 Uses a different snippet for previewing books on author page 2021-05-10 16:43:40 -07:00
Mouse Reeve 867a33de57 Creates author template dir 2021-05-10 16:34:37 -07:00
Mouse Reeve 27fe09a32b
Merge pull request #1062 from alisww/storygraph-import
add storygraph import
2021-05-10 16:23:00 -07:00
Mouse Reeve 202c43f610 Adds import option to books page 2021-05-10 16:13:17 -07:00
Allie Signet d40ff5c751 support both author field names 2021-05-10 20:11:44 -03:00
Mouse Reeve 9e9f94753d
Merge pull request #1069 from bookwyrm-social/inventaire-confidence
Adds confidence ratings to inventaire results
2021-05-10 16:10:30 -07:00
Allie Signet 8c2552f739 storygraph renamed the author field 2021-05-10 20:09:16 -03:00
Mouse Reeve 6abe9274c0 Switches out links in the top bar and dropdown 2021-05-10 15:55:42 -07:00
Mouse Reeve dad0161844
Merge pull request #1068 from bookwyrm-social/revert-datepicker
Revert datepicker
2021-05-10 15:36:17 -07:00
Mouse Reeve 07c84a6e1a Adds confidence ratings to inventaire results
Fixes bad matches in csv imports
2021-05-10 15:35:46 -07:00
Mouse Reeve 5efc7280a1
Merge pull request #1067 from bookwyrm-social/goal-year
Don't show following years' books in a year's goal
2021-05-10 15:02:18 -07:00
Mouse Reeve 3f4807a345 Revert "Adds datepicker script dependencies to templates"
This reverts commit 33ca7b4b76.
2021-05-10 14:56:43 -07:00