Commit graph

2749 commits

Author SHA1 Message Date
Mouse Reeve
bb8cac021b Merge branch 'main' into production 2021-03-21 12:54:00 -07:00
Mouse Reeve
e94a5032fc
Merge pull request #776 from mouse-reeve/email-templates
Email templates
2021-03-21 12:51:50 -07:00
Mouse Reeve
b29be11862 Updates reset password view test 2021-03-21 12:33:19 -07:00
Mouse Reeve
a0b106f6bb Adds emailing tests 2021-03-21 12:31:05 -07:00
Mouse Reeve
da2d146f0b runs black for python formatting 2021-03-21 12:07:58 -07:00
Mouse Reeve
c76ad0a312 Celery can't render tempaltes 2021-03-21 12:06:20 -07:00
Mouse Reeve
d8a20175b6 Adds email template layout and formatting 2021-03-21 12:06:12 -07:00
Mouse Reeve
9555470f2a
Merge pull request #775 from mouse-reeve/invite-request
Invite request
2021-03-21 09:35:09 -07:00
Mouse Reeve
33b5639af0 Fixes tests 2021-03-21 09:20:37 -07:00
Mouse Reeve
4575fe24c7 Updates readme 2021-03-21 09:20:32 -07:00
Mouse Reeve
1644c421e5 Send invites 2021-03-21 09:13:21 -07:00
Mouse Reeve
685da1f5b8 Adds email templating 2021-03-21 08:54:57 -07:00
Mouse Reeve
5b8bd9ad44 Adds tests 2021-03-21 08:24:59 -07:00
Mouse Reeve
5297b9d796 Ignore request flow 2021-03-21 08:18:04 -07:00
Mouse Reeve
94d18f6c24 Merge branch 'main' into production 2021-03-20 20:47:53 -07:00
Mouse Reeve
81ab73f309 Black formatting 2021-03-20 20:19:27 -07:00
Mouse Reeve
5e24b438ff Placeholders for send/ignore request flows 2021-03-20 20:16:13 -07:00
Mouse Reeve
f91a8144f4 Admin UI for managing invite requests 2021-03-20 19:39:39 -07:00
Mouse Reeve
d15396eb26 Request invite flow 2021-03-20 19:14:41 -07:00
Mouse Reeve
4d07cb1eb5 Adds invite request model 2021-03-20 18:27:30 -07:00
Mouse Reeve
f844974efd
Merge pull request #774 from mouse-reeve/progress-update-ui
Progress update UI
2021-03-20 18:21:05 -07:00
Mouse Reeve
396a43136d Black formatting 2021-03-20 18:04:10 -07:00
Mouse Reeve
d3a4282f11 Show progress on status 2021-03-20 18:03:20 -07:00
Mouse Reeve
17489f002f html linter fixes 2021-03-20 17:43:51 -07:00
Mouse Reeve
2a612f7278 Formatting 2021-03-20 17:39:05 -07:00
Mouse Reeve
dd15e87073 Merge branch 'main' into progress-update-ui 2021-03-20 17:38:22 -07:00
Mouse Reeve
daa0268eb3 Update progress with comments 2021-03-20 17:35:10 -07:00
Mouse Reeve
942c4a6664 Move progress updates into modal 2021-03-20 17:18:18 -07:00
Mouse Reeve
014c2f108b
Merge pull request #688 from arkhi/ci
Add .editorconfig files and global linting Github Workflow.
2021-03-20 16:09:37 -07:00
Mouse Reeve
c2935ad418
Merge pull request #773 from tofuwabohu/Translation
Added German translation
2021-03-20 16:08:09 -07:00
Lasse Petersen
00ed5ecccb Translations for Moderation 2021-03-20 20:12:55 +01:00
tofuwabohu
87597acba6
Merge pull request #3 from mouse-reeve/main
Renewing
2021-03-20 20:10:19 +01:00
Fabien Basmaison
fa79070b59 [lint] Update editorconfig linting:
- Add settings for comments.
- Remove custom settings that don’t work.
- Fix vendor JS file:
2021-03-20 16:33:18 +01:00
Fabien Basmaison
5c5fc98118 [lint] Trying out new syntax for vendor file. 2021-03-20 16:19:20 +01:00
Fabien Basmaison
e81ae2df9b Rename linters to be less ambiguous. 2021-03-20 16:13:19 +01:00
Fabien Basmaison
3ff336b104 Use the file on mouse-reeve/bookwyrm, verbatim. 2021-03-20 16:08:47 +01:00
Fabien Basmaison
e3cd09930b [lint] Exclude JS vendor file and show all errors. 2021-03-20 16:00:37 +01:00
Fabien Basmaison
4a7c0cd184 Fix indentation in bookwyrm/tests/data/ol_isbn_search.json. 2021-03-20 15:36:25 +01:00
Fabien Basmaison
543dcbd592 Fix indentation in README.md. 2021-03-20 15:30:48 +01:00
Fabien Basmaison
b9a61162d7 Merge branch 'main' into ci 2021-03-20 15:26:51 +01:00
Mouse Reeve
5f1694a7b0 Merge branch 'main' into production 2021-03-19 20:35:29 -07:00
Mouse Reeve
9b51ed40c8
Merge pull request #770 from GuDzpoz/main
Updated some Simplified Chinese translations
2021-03-19 20:07:15 -07:00
GuDzpoz
f16f2526f3 Removed "fuzzy" tag. 2021-03-20 10:51:14 +08:00
GuDzpoz
c4bb87ae31 Contextual fixes. 2021-03-20 10:44:32 +08:00
GuDzpoz
3ff871f20d Updated Chinese translation 2021-03-20 09:49:22 +08:00
Mouse Reeve
08cf9b5b40 Merge branch 'main' into production 2021-03-19 16:07:57 -07:00
Mouse Reeve
cafadbf2c6
Merge pull request #769 from mouse-reeve/fixes-js
Fixes loading javascript listeners
2021-03-19 16:06:07 -07:00
Mouse Reeve
c31bf1f0c8 Fixes loading javascript listeners 2021-03-19 15:59:28 -07:00
Mouse Reeve
50e5cf11b4
Merge pull request #767 from mouse-reeve/django-upgrade-migrations
Migrations for django 3.1 upgrade
2021-03-19 14:04:29 -07:00
Mouse Reeve
1b5c71c7b1 formatting 2021-03-19 12:44:30 -07:00