Commit graph

212 commits

Author SHA1 Message Date
Hugh Rundle
dafda649f1 run Black on changed code 2021-10-04 21:31:28 +11:00
Hugh Rundle
602664b8d7 Merge branch 'main' into groups-merge-test
Big merge of a couple of weeks' work from the main project back into this branch. :ohno:
2021-10-03 10:49:38 +11:00
Hugh Rundle
52a083a907 revert name change for Group, GroupMember
these were named as BookwyrmGroup and BookwyrmGroupMember due to a misunderstanding about related_name and a dodgy development environment. This naming makes more sense.
2021-10-02 16:52:34 +10:00
Hugh Rundle
9290655116 fix urls for group invitations 2021-10-02 12:13:34 +10:00
Hugh Rundle
2f42161dda disambiguate groups and prep for group invitations
- rename Group to BookwyrmGroup
- create group memberships and invitations
- adjust all model name references accordingly
2021-10-02 10:10:37 +10:00
Mouse Reeve
232e4bed79 Updates migrations 2021-09-30 11:06:12 -07:00
Mouse Reeve
5dd2aac600 Merge branch 'main' into search-refactor 2021-09-30 10:41:30 -07:00
Mouse Reeve
d78c278665 Progress update flow for modal 2021-09-29 10:59:36 -07:00
Mouse Reeve
0a37556941
Merge pull request #1401 from bookwyrm-social/opensearch
Adds opensearch xml file
2021-09-27 19:48:53 -07:00
Mouse Reeve
15fc31bf77 Merge branch 'main' into opensearch 2021-09-27 18:58:28 -07:00
Mouse Reeve
e6ae500569 Fixes syntax problem on http raises 2021-09-27 16:00:50 -07:00
Mouse Reeve
28d40e9914 Use url names in redirects 2021-09-27 10:17:16 -07:00
Hugh Rundle
e5ca377cd3 clean up stray code mess 2021-09-27 16:50:51 +10:00
Hugh Rundle
0ccd54b05a better urls and views for group creation and editing 2021-09-27 15:38:05 +10:00
Hugh Rundle
b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
Hugh Rundle
8d17f888ea improve naming of templates and urls for groups 2021-09-25 11:36:35 +10:00
Hugh Rundle
7c0deabcb2 update urls and group view for searching users to add to group 2021-09-25 11:14:04 +10:00
Hugh Rundle
9b6d2a9d88 add group page 2021-09-24 20:34:11 +10:00
Hugh Rundle
4e93b09067 create group form
adds a group creation form to user dashboard
2021-09-24 14:12:36 +10:00
Hugh Rundle
e07a25e288 add groups urls 2021-09-24 07:52:40 +10:00
Mouse Reeve
fa6e5605d1 Fixes goal url 2021-09-22 12:16:51 -07:00
Mouse Reeve
ea303fb285 Updating string format synatx part 3 2021-09-20 16:45:26 -07:00
Mouse Reeve
be86fbcf4d Merge branch 'main' into pylint-update 2021-09-18 07:46:12 -07:00
Mouse Reeve
377a4e1ef1 Updating string format syntax part 1 2021-09-17 21:39:18 -07:00
Mouse Reeve
6022e7b232 Adds IP blocklist views 2021-09-17 13:04:10 -07:00
Mouse Reeve
98325818b2 Display search results in api mode and regular 2021-09-16 10:44:33 -07:00
Mouse Reeve
0f3e71978e Federated and blocked tabs 2021-09-11 14:41:52 -07:00
Mouse Reeve
b26e486888 Python formatting 2021-09-11 07:20:40 -07:00
Mouse Reeve
fc69729f93 Link to dashboard from menu 2021-09-11 07:17:14 -07:00
Mouse Reeve
a79fb14686 Basic dashboard page 2021-09-10 21:12:08 -07:00
Mouse Reeve
e515912dbc Move admin views into their own directory 2021-09-10 18:50:31 -07:00
Mouse Reeve
7c3cf095f3 Adds opensearch xml file 2021-09-10 16:47:59 -07:00
Mouse Reeve
de3c79ce21 Merge branch 'main' into email-blocking 2021-09-08 17:43:08 -07:00
Mouse Reeve
15344b6a8e Let moderators delete users 2021-09-08 17:21:45 -07:00
Mouse Reeve
658e12eb86 Allow admins to suspend pending users 2021-09-08 16:47:12 -07:00
Mouse Reeve
d28db51a14 Adds delete functionality 2021-09-08 16:24:13 -07:00
Mouse Reeve
21de8e66be Formats url 2021-09-08 14:39:43 -07:00
Mouse Reeve
fd0cf49b40 Adds html and view for email blocklist 2021-09-08 14:32:11 -07:00
Mouse Reeve
527c0542af View to hide suggestions 2021-09-08 10:03:23 -07:00
Mouse Reeve
c630ec3572 Adds delete list view 2021-09-06 10:41:55 -07:00
Mouse Reeve
c727d351ba Fixes variable name 2021-08-23 15:33:49 -07:00
Mouse Reeve
f267e53b56 let's call it save not bookmark 2021-08-23 15:07:38 -07:00
Mouse Reeve
a30094c822 View bookmarked lists 2021-08-23 13:40:07 -07:00
Mouse Reeve
42abc145c8 Adds action views 2021-08-23 13:15:35 -07:00
Mouse Reeve
65fa2813c6 Show link to discover view 2021-08-08 08:07:20 -07:00
Mouse Reeve
9077516fa1 Resend links 2021-08-06 17:39:22 -07:00
Mouse Reeve
5926224d7e Confirm email views 2021-08-06 16:26:46 -07:00
Mouse Reeve
9d75bc3982 Display books timeline 2021-08-04 17:53:44 -07:00
Mouse Reeve
5a9dbc50da Adds books stream 2021-08-04 17:25:31 -07:00
Mouse Reeve
3f15e4410e Fixes link to edit book 2021-07-12 16:17:20 -07:00