Commit graph

3799 commits

Author SHA1 Message Date
bcj 9302aa6ce4 Add POSTGRES_PORT to .env.dev 2021-05-18 13:21:19 -05:00
bcj 238862a4cf Have redis_* grab port information from .env 2021-05-18 00:54:15 -05:00
bcj bad39aef55 Remove the redis_activity ports listing
It is misleading, it isn't binding to that port
2021-05-17 00:07:59 -05:00
bcj 83078cd424 Combine duplicate redis_* volumes in compose file.
I _think_ yaml handles duplicates by overwriting so the conf file was not being added
2021-05-17 00:05:11 -05:00
bcj 892d338adc Read flower port from .env 2021-05-17 00:03:51 -05:00
bcj e8124806b1 Don't hardcode postres port in bookwyrm.settings
Have bookwyrm.settings check for an alternative postgres port.
2021-05-17 00:03:11 -05:00
Mouse Reeve f508b4eb33 Merge branch 'main' into production 2021-05-10 16:25:25 -07:00
Mouse Reeve 27fe09a32b
Merge pull request #1062 from alisww/storygraph-import
add storygraph import
2021-05-10 16:23:00 -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 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
Mouse Reeve 485f4b7eba Revert "Replaces date elements with datepicker"
This reverts commit 869cfa6d34.
2021-05-10 14:56:33 -07:00
allie 314a27841b Merge branch 'bookwyrm-social:main' into storygraph-import 2021-05-10 18:52:54 -03:00
Mouse Reeve 07f3737420
Merge pull request #1066 from bookwyrm-social/settings-files
Imports bookwyrm settings into celery settings
2021-05-10 14:43:36 -07:00
Mouse Reeve e34ae18e98 Don't show following years' books in a year's goal 2021-05-10 14:40:41 -07:00
Mouse Reeve b4ae639dab Imports bookwyrm settings into celery settings
It was redundant and super bug-prone!
2021-05-10 14:20:27 -07:00
Mouse Reeve 08346b7f87
Merge pull request #1065 from bookwyrm-social/fixes-search-display
Makes book search results from remote sources easier to use
2021-05-10 14:18:11 -07:00
Allie Signet 85a8210f5e fix rating property on ImportItem 2021-05-10 18:11:28 -03:00
allie 711772046f Merge branch 'bookwyrm-social:main' into storygraph-import 2021-05-10 17:31:12 -03:00
Mouse Reeve df2c1f0723
Merge branch 'main' into fixes-search-display 2021-05-10 13:29:39 -07:00
Mouse Reeve c869129323 Updates locales 2021-05-10 13:26:10 -07:00
Mouse Reeve 1b23cca1dd
Merge pull request #1061 from bookwyrm-social/first-search-result-bug
Uses one set of search logic for all results and first result only functions
2021-05-10 13:25:30 -07:00
Mouse Reeve b0055f398d Makes the show/hide buttons easier to find in book search 2021-05-10 13:24:00 -07:00
Mouse Reeve 1844dd6b20 Only include result blobs with results in search results 2021-05-10 13:01:11 -07:00
Mouse Reeve 13dc5efe71 More comprehensive tests for connector search 2021-05-10 12:53:36 -07:00
allie df99060898 Merge branch 'bookwyrm-social:main' into storygraph-import 2021-05-10 15:58:04 -03:00
Allie Signet 623bb181e4 fix formatting 2021-05-10 15:56:35 -03:00
Mouse Reeve 5cd974b78d Python formatting 2021-05-10 10:03:05 -07:00
Allie Signet 36439506b6 add storygraph import 2021-05-10 14:00:51 -03:00
Mouse Reeve f2d985e583 Uses one set of search logic for all results or just first 2021-05-10 09:57:53 -07:00
Mouse Reeve c005e458fa
Merge pull request #1055 from bookwyrm-social/filter-notifications
Filter notifications
2021-05-10 09:37:00 -07:00
Mouse Reeve 852f8da62e Adds tabs to notifications 2021-05-07 14:00:55 -07:00
Mouse Reeve 1cc63c6d45 Adds filtered view for notifications 2021-05-07 14:00:51 -07:00
Mouse Reeve 78f3e2efc2
Merge pull request #1053 from arkhi/patch-1
Display author biography with style. 😎
2021-05-06 09:59:39 -07:00
Fabien Basmaison a137bd21ff
Display author biography with style. 😎 2021-05-06 17:24:05 +02:00
Mouse Reeve 8d875f73ff
Merge pull request #1051 from bookwyrm-social/inventaire-edition
Sort edition list for better import results from inventaire
2021-05-05 08:40:30 -07:00
Mouse Reeve 0ff7c84a14 Merge branch 'main' into production 2021-05-05 08:39:21 -07:00
Mouse Reeve c15358d715 Python formatting 2021-05-05 07:58:09 -07:00
Mouse Reeve 558c9c4d67 Sort edition list for better import results from inventaire 2021-05-05 07:53:10 -07:00
Mouse Reeve dcde3ded95
Merge pull request #1049 from bookwyrm-social/datepicker
Datepicker
2021-05-05 07:00:07 -07:00
Mouse Reeve f0cb82dd26
Merge pull request #1050 from bookwyrm-social/urls
Use reverse lookups for urls
2021-05-04 10:45:41 -07:00
Mouse Reeve 5906588c86 Fixes shelf add test 2021-05-04 10:33:16 -07:00
Mouse Reeve b10f0b19c4 Removes outdated test 2021-05-04 09:49:24 -07:00
Mouse Reeve c9ed069121 Use example url in test 2021-05-04 09:47:00 -07:00
Mouse Reeve 906201fa2a Fixes notification import link 2021-05-04 09:45:13 -07:00
Mouse Reeve 7bbef1d193 Removes outdated test 2021-05-04 09:42:00 -07:00