Commit graph

1421 commits

Author SHA1 Message Date
Mouse Reeve b36cf5a7b8 Merge branch 'main' into production 2020-12-17 13:56:45 -08:00
Mouse Reeve 6149f36c7f Fixes bug in alt text breaing serializing work 2020-12-17 13:55:31 -08:00
Mouse Reeve d024d44b79 Fixes incoming tests 2020-12-17 13:46:32 -08:00
Mouse Reeve c5b48f521a Merge branch 'main' into production 2020-12-17 13:26:42 -08:00
Mouse Reeve c4c01f4950
Merge pull request #404 from mouse-reeve/rate-action
Rate action
2020-12-17 13:25:35 -08:00
Mouse Reeve 666ae117d2
Merge pull request #403 from mouse-reeve/cover-max-width
Set max width on cover container
2020-12-17 13:24:49 -08:00
Mouse Reeve d109ac0626
Merge pull request #402 from mouse-reeve/alt-text
Federate cover alt text
2020-12-17 13:22:09 -08:00
Mouse Reeve 5cadd48aef Fixes rate action 2020-12-17 13:21:21 -08:00
Mouse Reeve dccd9ac052 uuids for content warners loaded correctly 2020-12-17 13:14:44 -08:00
Mouse Reeve 60239c867a Updates unit tests 2020-12-17 13:06:17 -08:00
Mouse Reeve 3f1bf4e1d6 Set max width on cover container 2020-12-17 12:57:56 -08:00
Mouse Reeve 80029f3137
Merge pull request #401 from mouse-reeve/infinite-recursion-bug
Fixes infinite recursion when loading books
2020-12-17 12:56:07 -08:00
Mouse Reeve 530198adea Serialize alt text of images 2020-12-17 12:54:04 -08:00
Mouse Reeve 39dc0501a5 Make alt text a model property 2020-12-17 12:30:49 -08:00
Mouse Reeve 04ba5abf45 Fixes infinite recursion when loading books
Also fixes bug in serializing page nubmers
2020-12-17 12:02:59 -08:00
Mouse Reeve 0cd9f81431 Merge branch 'main' into production 2020-12-17 11:33:52 -08:00
Mouse Reeve 2799ed68e3 Propogate content warning from parent 2020-12-17 11:32:09 -08:00
Mouse Reeve 34a2afc788 Change text on cw button 2020-12-17 11:05:37 -08:00
Mouse Reeve ad6b2315ab Merge branch 'main' into production 2020-12-16 20:28:47 -08:00
Mouse Reeve c0dc3c5c05
Merge pull request #396 from mouse-reeve/content-warnings
Content warnings
2020-12-16 20:25:51 -08:00
Mouse Reeve 172c36b641 Adds content warning field in status forms 2020-12-16 20:10:50 -08:00
Mouse Reeve 0d42b9cf8f Display status cw's 2020-12-16 19:50:36 -08:00
Mouse Reeve b796686483 Adds cw field 2020-12-16 19:20:15 -08:00
Mouse Reeve 33c2f6c3b2 Merge branch 'main' into content-warnings 2020-12-16 19:14:34 -08:00
Mouse Reeve f0767de363
Merge pull request #394 from mouse-reeve/sanitize-html
Sanitize html
2020-12-16 19:12:37 -08:00
Mouse Reeve a8e424a0f7
Merge pull request #393 from mouse-reeve/notifications-cleanup
Avoid duplicate notifications
2020-12-16 18:59:20 -08:00
Mouse Reeve f7cb525981 Fixes logic error 2020-12-16 18:40:43 -08:00
Mouse Reeve 42167af3e9 Tests fro html field 2020-12-16 18:39:18 -08:00
Mouse Reeve a3c7d324d6 Sanitize incoming html 2020-12-16 16:47:23 -08:00
Mouse Reeve f1926ce76d Avoid duplicate notifitions
And render html
2020-12-16 16:20:40 -08:00
Mouse Reeve 4c8583bfdb Merge branch 'main' into production 2020-12-16 15:59:59 -08:00
Mouse Reeve d79a756813 Fixes pure status serializer 2020-12-16 15:59:42 -08:00
Mouse Reeve 175eab01f7 Merge branch 'main' into production 2020-12-16 15:02:23 -08:00
Mouse Reeve ef92e562fd
Merge pull request #382 from mouse-reeve/switch-edition
Adds shelf info to book page
2020-12-16 14:58:36 -08:00
Mouse Reeve 21b0bec8d7 Switch edition from editions list page 2020-12-16 14:45:35 -08:00
Mouse Reeve 8a1800ea26 Federate shelve activities when switching editions 2020-12-16 13:59:18 -08:00
Mouse Reeve 5dbacb3524 Merge branch 'main' into switch-edition 2020-12-16 09:22:04 -08:00
Mouse Reeve b2c1bc1481 Migration consistency 2020-12-16 09:20:24 -08:00
Mouse Reeve 729e50de63 Show consistent book status regardless of edition 2020-12-16 09:15:26 -08:00
Mouse Reeve cf78087bfe
Merge pull request #392 from mouse-reeve/incoming-shelve
Incoming shelve
2020-12-16 08:32:54 -08:00
Mouse Reeve da05b99bb8 Fixes incoming shelve activity 2020-12-15 18:57:17 -08:00
Mouse Reeve 948e938040 Handles outdated Add with Book type
should be edition.
2020-12-15 18:16:33 -08:00
Mouse Reeve af823cf645 Merge migration 2020-12-15 17:53:20 -08:00
Mouse Reeve 310c814399
Merge pull request #391 from mouse-reeve/view-tests
View tests
2020-12-15 17:06:52 -08:00
Mouse Reeve fabf880a94 Adds post attribute to resolve book endpoint 2020-12-15 16:50:10 -08:00
Mouse Reeve bde75766f2 test for registration and password reset 2020-12-15 16:36:22 -08:00
Mouse Reeve 710fbc949b Better username validator and remove trailing whitespace 2020-12-15 15:52:22 -08:00
Mouse Reeve 9d7ad3c492
Merge pull request #390 from mouse-reeve/incoming-tests
Incoming tests
2020-12-15 12:43:28 -08:00
Mouse Reeve ee2121095c Separate update editon and work functions 2020-12-15 12:39:09 -08:00
Mouse Reeve 2ef4df41b4 Fixes boosts 2020-12-15 11:54:57 -08:00