mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-26 03:21:05 +00:00
Code Issues Projects Releases Wiki Activity
4034 commits 21 branches 36 tags 103 MiB
Commit graph

4034 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mouse Reeve
7ae64c2a68 Splits user view out and adds template 2021-06-14 10:01:21 -07:00
Fabien Basmaison
17635b47db Fix case where there is no subtitle. 
Consequentially change back author to being a subtitle.
 2021-06-11 09:41:55 +02:00
Fabien Basmaison
cf751a8efa Merge branch 'main' into frontend/subtitle 2021-06-11 08:49:46 +02:00
Mouse Reeve
e4b815d276
Merge pull request #1169 from bookwyrm-social/dependabot/pip/django-3.2.4 
Bump django from 3.2.2 to 3.2.4
 2021-06-10 12:59:32 -07:00
dependabot[bot]
c415860373
Bump django from 3.2.2 to 3.2.4 
Bumps [django](https://github.com/django/django) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.2...3.2.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-10 17:42:49 +00:00
Mouse Reeve
fd753d47ce
Merge pull request #1168 from bookwyrm-social/reading-progress-view 
Merge reading status views into one view
 2021-06-09 11:48:06 -07:00
Mouse Reeve
a4afbccb3a Fixes straggling reading view test name 2021-06-09 11:36:17 -07:00
Mouse Reeve
ce4a57e5c9 Reading status view name 2021-06-09 11:16:52 -07:00
Mouse Reeve
4107f7ddf1 Updates readthrough tests 2021-06-09 11:07:15 -07:00
Mouse Reeve
3c7c8a1797 Fixes urls in fallback mode 2021-06-09 11:05:05 -07:00
Mouse Reeve
113ced2900 Merge reading status views into one view 2021-06-09 10:53:52 -07:00
Mouse Reeve
166515a755
Merge pull request #1167 from bookwyrm-social/dependabot/pip/django-3.2.2 
Bump django from 3.2.1 to 3.2.2
 2021-06-09 10:37:46 -07:00
Mouse Reeve
c24d95bc5b
Merge pull request #1166 from bookwyrm-social/dependabot/npm_and_yarn/trim-newlines-3.0.1 
Bump trim-newlines from 3.0.0 to 3.0.1
 2021-06-09 10:37:29 -07:00
dependabot[bot]
a8eb21f992
Bump django from 3.2.1 to 3.2.2 
Bumps [django](https://github.com/django/django) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.1...3.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 17:22:46 +00:00
dependabot[bot]
eb087e131e
Bump trim-newlines from 3.0.0 to 3.0.1 
Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases)
- [Commits](https://github.com/sindresorhus/trim-newlines/commits)

---
updated-dependencies:
- dependency-name: trim-newlines
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 17:22:45 +00:00
Mouse Reeve
8d181a9848
Merge pull request #1165 from bookwyrm-social/nojs-modals 
Refactors want to read/start reading/finish reading modals
 2021-06-09 10:22:15 -07:00
Fabien Basmaison
6be97a6102 Be consistent between variable name & logic. Equal is already too short. 2021-06-09 19:03:15 +02:00
Fabien Basmaison
c4072cbc04 Be nice to Black and follow styleguides. 2021-06-09 18:54:05 +02:00
Fabien Basmaison
0ecea5710b Use gettext to add subtitle to short titles (use variable for length). 2021-06-09 18:51:20 +02:00
Fabien Basmaison
b8922bae19 Merge branch 'main' into frontend/subtitle 2021-06-09 17:59:23 +02:00
Mouse Reeve
090281573c
Merge pull request #1162 from joachimesque/locales-french-update 
Locales: French update
 2021-06-09 06:23:07 -07:00
Fabien Basmaison
f58c1d1138 Tweak styles for subtitle: 
- Make it bold as the title while preserving consistency with other subtitles.
- Pull the author closer to the subtitle to preserve a descending visual and typographic scales.
 2021-06-09 12:20:34 +02:00
Fabien Basmaison
5047b8bf94 Do not break document structure with ratings. 2021-06-09 11:12:38 +02:00
Fabien Basmaison
b9562e44e3 Merge branch 'main' into frontend/subtitle 2021-06-09 10:14:34 +02:00
Mouse Reeve
625ab46059 Removes start reading with progress test 
There's no way to do this from the ui???? I don't tihnk there ever
was???
 2021-06-08 15:03:50 -07:00
Mouse Reeve
a00fdc6864 Updates tests for reading views 2021-06-08 14:42:55 -07:00
Mouse Reeve
e65bc09e7a Linter fixes 2021-06-08 12:42:45 -07:00
Mouse Reeve
eb12506985 No script fallback mode 2021-06-08 12:40:01 -07:00
Mouse Reeve
3356c652ee Adds standalone modal views for reading steps 2021-06-08 11:55:18 -07:00
Mouse Reeve
b5d0a9e0b4 Removes deplicate progress code form reading views 2021-06-08 11:43:30 -07:00
Mouse Reeve
1231d40e80 Want to read view 2021-06-08 11:23:53 -07:00
Mouse Reeve
45146b4999 Convert start and finish reading into view classes 2021-06-08 11:10:39 -07:00
Joachim
689fefb096 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-06-08 18:20:57 +02:00
Joachim
280be59c46 Refactor AWS command 2021-06-08 18:19:52 +02:00
Joachim
311042a59b Add S3 CORS command 2021-06-07 23:20:27 +02:00
Mouse Reeve
0e84f4bbac
Merge pull request #1164 from bookwyrm-social/env-cleanup 
Cleans up .env and settings files
 2021-06-07 13:52:24 -07:00
Mouse Reeve
948a5dea10 Cleans up .env and settings files 
Some outdated stuff doesn't need to be in there
 2021-06-07 12:53:57 -07:00
Joachim
e904c202a9 Add command copy_media_to_s3 2021-06-07 21:40:37 +02:00
Joachim
4359505124 Update book.py 2021-06-07 19:54:16 +02:00
Joachim
d105ae9c78 Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-07 19:53:11 +02:00
Joachim
2731ea9aa9 Add env var to enable/disable thumbnail generation 2021-06-07 19:52:25 +02:00
Joachim
f287a19f12 Update settings.py 2021-06-07 18:31:01 +02:00
Joachim
715cb46e1e Lint 2021-06-07 18:15:48 +02:00
Joachim
b448d40514 Use the right snippets on Templates 2021-06-07 18:13:24 +02:00
Joachim
cba34780d8 Use S3 as static and media storage 
TODO

- [ ] Write some documentation for non-AWS, S3-compatible services
- [ ] Make a management command to move existing media to the new S3 bucket
- [ ] See if Nginx can reverse-proxy the S3 bucket in order to keep the files accessible through the domain name
 2021-06-07 18:12:48 +02:00
Joachim
ac90cf7420 Apply suggestions from feedback 2021-06-07 16:16:07 +02:00
Joachim
37f92140ad Update django.po 2021-06-07 16:10:00 +02:00
Joachim
a14b481996 Merge remote-tracking branch 'upstream/main' into locales-french-update 2021-06-07 16:08:30 +02:00
Mouse Reeve
5b40069d99
Merge pull request #1153 from bookwyrm-social/instance-language 
Use "instance" consistently
 2021-06-06 14:07:49 -07:00
Mouse Reeve
7c2dc81501 Corrects variable name in locales 2021-06-06 13:58:41 -07:00