Commit graph

6612 commits

Author SHA1 Message Date
Mouse Reeve
1761db5444
Merge pull request #1920 from bookwyrm-social/branch-convergence
Moves towards single branch setup
2022-02-12 10:31:55 -08:00
Mouse Reeve
72818d4ab2
Merge pull request #1939 from bookwyrm-social/list-bug
Fixes display name of list contributor comments
2022-02-12 10:29:41 -08:00
Mouse Reeve
a2d9bf50c5 Fixes display name of list contributor comments 2022-02-12 10:18:14 -08:00
Mouse Reeve
df0467a662
Merge pull request #1930 from bookwyrm-social/dependabot/pip/django-3.2.12
Bump django from 3.2.11 to 3.2.12
2022-02-12 10:10:38 -08:00
Mouse Reeve
6bf6b118bf
Merge pull request #1937 from bookwyrm-social/stylelint-prettier
Adds stylelint fix to bw-dev
2022-02-12 09:58:26 -08:00
Mouse Reeve
d49e9b4dcd Updates packages 2022-02-12 09:41:18 -08:00
Mouse Reeve
30ad3bba0b Suggest stylelint --fix in CI and add to bw-dev 2022-02-12 09:00:38 -08:00
Willi Hohenstein
67ea18c840 Changed cover class for proper image size in mobile 2022-02-12 17:58:36 +01:00
Willi Hohenstein
6cb480d111 Merge branch 'main' of github.com:willhoh/bookwyrm 2022-02-12 15:36:30 +01:00
Mouse Reeve
89de03bffe Adds breadcrumbs 2022-02-11 14:58:40 -05:00
Mouse Reeve
b95f0ed287 Use color in announcement 2022-02-11 14:43:37 -05:00
Mouse Reeve
01b52f023a Adds edit announcement view 2022-02-11 14:42:47 -05:00
Mouse Reeve
cfa91e2570 Adds color options to announcements 2022-02-11 14:00:01 -05:00
Mouse Reeve
ee23aba994 Use details and summary for announcement panel 2022-02-11 13:50:55 -05:00
Mouse Reeve
62741a5d2e Allow html in announcement header 2022-02-11 13:36:08 -05:00
Mouse Reeve
059fd84d06 Adds delete button to announcements list view
It's handy to have it there
2022-02-11 13:33:42 -05:00
dependabot[bot]
046f516091
Bump django from 3.2.11 to 3.2.12
Bumps [django](https://github.com/django/django) from 3.2.11 to 3.2.12.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.11...3.2.12)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-10 13:02:16 +00:00
Mouse Reeve
542957364c
Merge pull request #1929 from bookwyrm-social/link-federation
Use correct model type for federated links
2022-02-09 09:30:26 -08:00
Mouse Reeve
bd846bba34
Merge pull request #1927 from bookwyrm-social/update-command
Refresh web and celery in update command
2022-02-09 09:25:15 -08:00
Mouse Reeve
c06817e9ff Python formatting 2022-02-09 12:23:01 -05:00
Mouse Reeve
6323b0e700 Use correct model type for federated links 2022-02-09 12:20:11 -05:00
Mouse Reeve
e9e4f70ae4 Refresh web and celery in update command 2022-02-08 09:17:42 -05:00
Mouse Reeve
74fd13fb22 Consistent ordering of items in docker-compose file 2022-02-06 06:37:03 -08:00
Mouse Reeve
4b88ea142f
Merge pull request #1922 from bookwyrm-social/version
Tick version number
2022-02-04 20:21:49 -08:00
Mouse Reeve
73b611d68d Tick version number 2022-02-04 20:12:26 -08:00
Mouse Reeve
d65a80d9ea
Merge pull request #1921 from bookwyrm-social/author-page-query
Fixes author page query
2022-02-04 19:51:24 -08:00
Mouse Reeve
a73960a0da Python formatting 2022-02-04 19:44:03 -08:00
Mouse Reeve
49ceb2a978 Fixes warning in author view tests 2022-02-04 19:41:21 -08:00
Mouse Reeve
a9a6fd1242 Adds test for author page bug 2022-02-04 19:34:37 -08:00
Mouse Reeve
28a8edfdc4 Fixes author page query 2022-02-04 19:06:47 -08:00
Mouse Reeve
bc7aa91b97 Fixes pylint complaints 2022-02-04 18:50:57 -08:00
Mouse Reeve
28fe0b0bc6
Merge pull request #1919 from bookwyrm-social/locales
Updates locales
2022-02-04 18:37:05 -08:00
Mouse Reeve
7811a9920e Copy config from prod branch to main 2022-02-04 18:36:12 -08:00
Mouse Reeve
d8c3699adc Updates locales 2022-02-04 18:21:48 -08:00
Mouse Reeve
0601f68685
Merge pull request #1918 from bookwyrm-social/ports
Don't expose unnecessary ports
2022-02-04 18:12:05 -08:00
Mouse Reeve
ea035b9fbe Don't expose unnecessary ports 2022-02-04 17:58:29 -08:00
Mouse Reeve
70bd6b9a65
Merge pull request #1917 from bookwyrm-social/list-page-error
Fixes errors in how lists with notes display
2022-02-04 15:44:49 -08:00
Mouse Reeve
18768a23f3 Fixes test 2022-02-04 15:30:58 -08:00
Mouse Reeve
0c3b6e6938
Merge pull request #1900 from willhoh/main
Added check for bocked or pending domains. Fixes #1850
2022-02-04 12:11:41 -08:00
Mouse Reeve
547d246375 Fixes 500 error 2022-02-04 12:09:20 -08:00
Mouse Reeve
0683ce1c33 Proper markdown formatting 2022-02-04 12:07:26 -08:00
Mouse Reeve
fefb7e582a Fixes list note display 2022-02-04 12:02:10 -08:00
Mouse Reeve
719df5621c Unit test to catch error on list page 2022-02-04 11:58:03 -08:00
Mouse Reeve
82aacf8f2a
Update forms.py 2022-02-04 11:47:18 -08:00
Mouse Reeve
e80a4c16f0
Merge pull request #1915 from bookwyrm-social/url-validation
Adds some simple url validation
2022-02-04 08:45:43 -08:00
Willi Hohenstein
495af09c4c
Merge branch 'bookwyrm-social:main' into main 2022-02-04 14:11:50 +01:00
Willi Hohenstein
a3e2cd77a1 Merge branch 'main' of github.com:bookwyrm-social/bookwyrm 2022-02-04 14:09:15 +01:00
Mouse Reeve
da8e07057c
Merge pull request #1916 from bookwyrm-social/user-view
Fixes duplicted shelves on user view
2022-02-03 19:31:49 -08:00
Mouse Reeve
7c0d51ed14 Fixes duplicted shelves on user view 2022-02-03 18:59:08 -08:00
Mouse Reeve
3e635f497e Adds some simple url validation 2022-02-03 15:11:01 -08:00