Willi Hohenstein
c2c33fe1e8
fixed merge conflict
2022-02-02 20:20:16 +01:00
Mouse Reeve
b5baf1620f
Merge pull request #1897 from bookwyrm-social/verify-image-types
...
Check image extensions before saving
2022-02-02 11:04:52 -08:00
Willi Hohenstein
4503dd6864
Merge branch 'main' of github.com:willhoh/bookwyrm
2022-02-02 19:51:23 +01:00
Willi Hohenstein
e37982d285
added domain pending or blocked check
...
fixes #1850
2022-02-02 19:35:26 +01:00
Mouse Reeve
6fd3ac0cb1
Changes how test image data is loaded
2022-02-02 09:36:47 -08:00
Mouse Reeve
f84241b085
Merge pull request #1804 from cincodenada/run-not-exec
...
Use run --rm instead of exec for initdb
2022-02-02 09:10:28 -08:00
Mouse Reeve
194c69f512
Fixes return values of null responses
2022-02-02 07:09:35 -08:00
Joel Bradshaw
060f515aea
Be even more conservative on errors
...
This runs at startup of anything, so we should be extra sure to not
break anything, and lots of things can go wrong downloading files from
the internet
2022-02-01 21:59:07 -08:00
Joel Bradshaw
d6abd9b32d
Ensure directory exists, don't crash if we fail to write
...
We should be creating the directory because the static tree from the
repo isn't actually copied into the container, so we can't rely on it
existing.
And if we can't write it, we should catch that error instead of crashing
the whole thing, oops!
2022-02-01 21:45:13 -08:00
Mouse Reeve
754e24812b
Check image extensions before saving
2022-02-01 21:18:25 -08:00
Mouse Reeve
9611815b44
Extract wikipedia and inventaire ids
2022-01-30 12:02:18 -08:00
Mouse Reeve
44dad43f36
Load new fields via connector
2022-01-30 11:41:33 -08:00
Mouse Reeve
c4b8e7949d
Add more book identifier fields
2022-01-30 11:41:31 -08:00
Mouse Reeve
1dfe4d0f52
Merge pull request #1890 from bookwyrm-social/shelf-display
...
Don't display empty shelves on user page
2022-01-30 11:39:25 -08:00
Mouse Reeve
e674f85d4e
Don't display empty shelves on user page
2022-01-30 11:23:23 -08:00
Mouse Reeve
4e607d38eb
Merge pull request #1888 from bookwyrm-social/ap-delete
...
More resilient hanlding of deletions
2022-01-30 11:21:16 -08:00
Mouse Reeve
ef44b407e5
Merge pull request #1889 from bookwyrm-social/dm-button
...
Fixes display of dm button
2022-01-30 11:21:04 -08:00
Mouse Reeve
a7afd4c47b
Fixes display of dm button
2022-01-30 11:10:18 -08:00
Mouse Reeve
f2d2d050f5
Merge pull request #1886 from bookwyrm-social/filter-panels-display
...
Fixes form element display inside details panel
2022-01-30 10:45:26 -08:00
Mouse Reeve
2d5b6ba0e9
Merge pull request #1887 from bookwyrm-social/locale-updates
...
Updates locales
2022-01-30 10:44:53 -08:00
Mouse Reeve
18b53a608c
More resilient hanlding of deletions
2022-01-30 10:42:29 -08:00
Mouse Reeve
65496fea49
Fixes black regression
2022-01-30 10:26:28 -08:00
Mouse Reeve
f52fd25313
Updates locales
2022-01-30 10:19:12 -08:00
Mouse Reeve
79be02230b
Merge pull request #1885 from bookwyrm-social/reporting-improvements
...
Reporting improvements
2022-01-30 09:55:37 -08:00
Mouse Reeve
ae0e67f076
Fixes form element display inside details panel
2022-01-30 09:31:57 -08:00
Mouse Reeve
68f9ee9d8a
Fixes access level control in report view
2022-01-30 09:20:26 -08:00
Mouse Reeve
24c1d5a168
Add prompt to respond to reporter
2022-01-30 09:17:12 -08:00
Mouse Reeve
c04bf4638f
Avoid duplicate emails
2022-01-30 08:59:32 -08:00
Mouse Reeve
8a07f5c396
Fixes report remote id
2022-01-30 08:50:53 -08:00
Mouse Reeve
ae53b479f5
Fixes status field on report modal form
2022-01-30 08:36:20 -08:00
Mouse Reeve
dd39046ff9
Merge pull request #1884 from bookwyrm-social/dependabot/pip/django-3.2.11
...
Bump django from 3.2.10 to 3.2.11
2022-01-30 07:39:53 -08:00
Mouse Reeve
6983884eaa
Merge pull request #1883 from bookwyrm-social/cache-fix
...
Fixes bad cache on status shelve buttons
2022-01-30 07:19:30 -08:00
Mouse Reeve
aaccab6dce
Merge branch 'main' into cache-fix
2022-01-30 07:09:32 -08:00
dependabot[bot]
36d2a7cc1d
Bump django from 3.2.10 to 3.2.11
...
Bumps [django](https://github.com/django/django ) from 3.2.10 to 3.2.11.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.10...3.2.11 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-30 15:09:29 +00:00
Mouse Reeve
65e4e6418e
Merge pull request #1882 from bookwyrm-social/fix-urls
...
Bring prod and main into sync on urls
2022-01-30 07:09:07 -08:00
Mouse Reeve
f86016ba33
Python formatting for black update
2022-01-30 07:01:38 -08:00
Mouse Reeve
3c2aa72424
Fixes bad cache on status shelve buttons
2022-01-30 06:56:15 -08:00
Mouse Reeve
29a7c59d5f
Bring prod and main into sync on urls
2022-01-30 06:43:50 -08:00
Mouse Reeve
224dc4100a
Activitstreams tests
2022-01-28 17:32:41 -08:00
Mouse Reeve
8fc23ba184
Merge pull request #1878 from bookwyrm-social/tests
...
Some tests
2022-01-28 06:54:51 -08:00
Mouse Reeve
c6c1534c85
Adds id to report page
2022-01-27 20:05:17 -08:00
Mouse Reeve
e8e2cb08a5
Merge pull request #1877 from bookwyrm-social/locale-updates
...
Updates locales and adds new strings
2022-01-27 19:55:03 -08:00
Mouse Reeve
1d45e8b4cc
Updates ip blocklists tests
2022-01-27 19:43:42 -08:00
Mouse Reeve
778975d492
Merge branch 'misc-tests' into user-view
2022-01-27 19:39:19 -08:00
Mouse Reeve
89aa1673b2
Admin views tests
2022-01-27 19:39:07 -08:00
Mouse Reeve
afdaa776e2
Fixes syntax
2022-01-27 19:38:51 -08:00
Mouse Reeve
e7ecae0f96
Adds annual review test
2022-01-27 18:57:18 -08:00
Mouse Reeve
8ec1b49800
Updates locales and adds new strings
2022-01-27 18:52:33 -08:00
Mouse Reeve
40a14a05ad
Merge pull request #1865 from bookwyrm-social/unread-status-translation
...
Calculate and translate unread status counts in view
2022-01-27 18:47:35 -08:00
Mouse Reeve
107f02e4e5
Merge pull request #1876 from bookwyrm-social/initdb-tests
...
Adds tests for initdb command
2022-01-27 18:38:55 -08:00
