mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-26 00:40:41 +00:00
Code Issues Projects Releases Wiki Activity
7591 commits 16 branches 36 tags 94 MiB
Commit graph

418 commits

Author SHA1 Message Date
Hugh Rundle da613c9b26 ugh forgot to run black 2022-10-15 07:47:20 +11:00
Hugh Rundle fda150fa0d resolve migration conflict 2022-10-15 07:47:20 +11:00
Hugh Rundle 9b74c26742 backup codes 
- add hotp_secret to user model
- view to create backup codes in user prefs
- check backup code if otp doesn't work
- increment hotp count if used
- show correct errors if code wrong
 2022-10-15 07:47:20 +11:00
Hugh Rundle 514762c233 fix typo in new user fields 
oopsie
 2022-10-15 07:47:20 +11:00
Hugh Rundle 54daade9f9 prepare for 2FA 
- add and migrate User fields for 2FA
- add views for 2FA
- add new forms for 2FA
- update package list in requirements.txt
- add URLs for 2FA views
 2022-10-15 07:47:20 +11:00
Mouse Reeve e51980bc12 Use BookWyrmModel as parent for admin models 
This will make them more internally consistent and give them built-in
permissions checking
 2022-09-19 09:35:38 -07:00
Hugh Rundle aa18179dbc add migration 2022-09-10 10:27:17 +10:00
Mouse Reeve 0bc3c3b5f6 Adds locale migration 2022-08-02 11:09:58 -07:00
Mouse Reeve 844023f104
Merge pull request #2246 from bookwyrm-social/goal-model 
Moves annual goal to its own file
 2022-07-29 13:22:12 -07:00
Mouse Reeve 2298a478cf Moves annual goal to its own file 
The user model file is just,, very long
 2022-07-29 13:00:59 -07:00
Hugh Rundle 356c1c0b62 fix migration dependency order 
Show_guided_tour needs to come after alter_user_preferred_language due to conficts. I think.
 2022-07-17 16:34:42 +10:00
Hugh Rundle 17dc5e7eb1 Merge branch 'main' into tour 
- we need to do this because of conflicting migrations
 2022-07-17 16:30:45 +10:00
Mouse Reeve d3f35fb691 Adds Catalan 2022-07-15 12:28:31 -07:00
Hugh Rundle e1acdd0062 fix migrations 
There was a conflict due to the order of migrations. Hopefully this commit fixes it!
 2022-07-10 09:53:43 +10:00
Hugh Rundle ab5e4128e6 Merge branch 'main' into tour 
Also fixes conflict
 2022-07-09 20:54:48 +10:00
Hugh Rundle 02c6932409 lint migration file 2022-07-09 20:10:28 +10:00
Hugh Rundle baad1314d8 default existing users to no tour 2022-07-09 19:51:05 +10:00
Mouse Reeve 221b5138e8 Adds merge migration 2022-07-06 14:42:58 -07:00
Mouse Reeve 5a6ef7ccd8 Merge branch 'main' into notifications 2022-07-06 14:41:15 -07:00
Mouse Reeve 079f6d304e Python formatting 2022-07-06 12:22:07 -07:00
Mouse Reeve 9fceeb3eda Adds another missing migration 2022-07-06 12:17:24 -07:00
Mouse Reeve 003ef65db5 Adds missing migration 2022-07-05 18:01:10 -07:00
Mouse Reeve 801ba03aaf Keep group as a foreign key field 2022-07-04 20:32:13 -07:00
Mouse Reeve 9948dd2356 Use enums in more models 2022-07-04 20:27:56 -07:00
Mouse Reeve 03f5a3f2c1 Use enums for notification types 2022-07-04 20:19:18 -07:00
Mouse Reeve b193652a67 Python formatting 2022-07-04 19:58:27 -07:00
Mouse Reeve a9a2da0957 Keep status as a single field 2022-07-04 19:20:04 -07:00
Mouse Reeve c7ecbb2fdf New migration file 
I don't know why it felt important to do this but it did. The migrations
are in one file now and don't need a merge migration.
 2022-07-04 18:42:56 -07:00
Mouse Reeve a718a168a3 Merge branch 'main' into notifications 2022-07-04 17:38:21 -07:00
Hugh Rundle b82cf887e2 linting fixes 2022-07-03 17:14:13 +10:00
Hugh Rundle 80c71928c3 add show_guided_tour value to User 
This boolean value indicates whether the user wishes to be show the guided tour.
It defaults to True but will be able to be easily set to False.
 2022-06-13 13:07:48 +10:00
Mouse Reeve 375c5a8789 Adds stopped date separate from finish date on readthrough 2022-05-26 11:36:37 -07:00
Mouse Reeve 23c6019340 Adds merge migration 2022-05-26 10:23:32 -07:00
Mouse Reeve 88b2cffcf2
Merge pull request #2035 from bookwyrm-social/stopped-shelf 
Stopped shelf
 2022-05-26 10:11:32 -07:00
Mouse Reeve a2a04da493 Adds many to many related items to notifications 2022-04-09 09:44:42 -07:00
Mouse Reeve 8d266fda4d Removes unused related_book field on notification model 2022-04-08 15:21:38 -07:00
Mouse Reeve ae86829a7e
Adds Finnish locale (#2069) 
* Adds Finnish locale
 2022-03-31 08:20:52 -07:00
Mouse Reeve 71cbe611de Merge migration 2022-03-26 13:07:27 -07:00
Mouse Reeve ec21d20b90 Merge branch 'main' into stopped-shelf 2022-03-26 13:06:06 -07:00
Mouse Reeve 5cf52cff54 Formats migration 2022-03-26 10:32:07 -07:00
Mouse Reeve a6ae55608a Adds Romanian locale 2022-03-26 10:03:50 -07:00
Mouse Reeve 8b061f9432 Manually updates migration 2022-03-16 16:53:16 -07:00
Mouse Reeve 7b3b357756 Merge branch 'main' into form-conflict 2022-03-16 16:51:57 -07:00
Mouse Reeve 108981a226 Creates fresh migration and removes merges 2022-03-16 16:35:03 -07:00
Mouse Reeve 159b73d860 Fixes errors in migration 2022-03-16 13:54:25 -07:00
Mouse Reeve f2b0b306e9
Merge pull request #1934 from tversteeg/partially-read-shelf 
Add 'Stopped Reading' shelf
 2022-03-16 13:51:15 -07:00
Mouse Reeve 820279166a Adds update script 2022-03-16 12:39:49 -07:00
Thomas Versteeg b3f03164cc Apply black 2022-03-15 09:28:40 +01:00
corentin-feys a0ae96923c fix to pass invite request pytest 2022-03-13 23:34:49 +01:00
corentin-feys 3e9cb2acb1 Revert to stable commit 
This reverts commit d542be943f.
 2022-03-13 22:56:41 +01:00