Mouse Reeve
736f28e254
Fixes user tabs linking to logged in user
2021-02-03 17:02:04 -08:00
Mouse Reeve
c03dcaf842
Distinct lists
2021-02-03 16:49:42 -08:00
Mouse Reeve
3f2f27bcac
Fixes logged out list view
2021-02-03 16:40:29 -08:00
Mouse Reeve
39d31060e1
Sort list preview by most recently added
2021-02-03 16:11:42 -08:00
Mouse Reeve
476d65552e
Hide other people's empty lists from lists page
2021-02-03 16:01:49 -08:00
Mouse Reeve
7af1f6c19d
Merge pull request #585 from mouse-reeve/inline-form
...
Inline form
2021-02-03 12:56:08 -08:00
Mouse Reeve
1dc02cd5fa
Merge pull request #576 from mouse-reeve/remove-editions
...
Clear unused editions with poor metadata
2021-02-03 12:55:27 -08:00
Mouse Reeve
7faf639758
Fixes openlibrary connector test
2021-02-03 12:52:13 -08:00
Mouse Reeve
502e235e59
Edit shelf form using component
2021-02-03 12:45:01 -08:00
Mouse Reeve
bcbcdd5b3b
Uses component for create shelf form
2021-02-03 12:36:20 -08:00
Mouse Reeve
6ce4be7406
Adds inline form component
2021-02-03 12:25:33 -08:00
Mouse Reeve
0ba7c60e83
Merge pull request #577 from mouse-reeve/lists
...
Lists
2021-02-03 10:57:19 -08:00
Mouse Reeve
65f3333edb
line length fix
2021-02-03 10:42:02 -08:00
Mouse Reeve
1b6dd666d9
Handling incoming list Creates and Updates
2021-02-03 10:34:27 -08:00
Mouse Reeve
627b2ae90a
Set header when opening forms
2021-02-02 15:46:58 -08:00
Mouse Reeve
7aa9204cd2
Fixes missing privacy field for to-read statuses
2021-02-02 15:25:34 -08:00
Mouse Reeve
18ef041a25
Fixes broadcast task patch on shelves tests
2021-02-02 15:19:44 -08:00
Mouse Reeve
b8dc307a6b
Fixes mocking broadcast task in lists tests
2021-02-02 15:14:33 -08:00
Mouse Reeve
bbc05578fb
Fixes tests
2021-02-02 14:59:40 -08:00
Mouse Reeve
6b07911a01
Patches broadcasts in list and shelf tests
2021-02-02 12:17:21 -08:00
Mouse Reeve
3f9bb97693
Merge pull request #583 from mouse-reeve/level
...
adds icons to discover page
2021-02-02 12:10:59 -08:00
Mouse Reeve
f42a5444e5
User ordered collection subtype for shelves
2021-02-02 11:17:31 -08:00
Mouse Reeve
e61d8b7638
Serialize lists as custom activitypub object
2021-02-02 11:13:15 -08:00
Mouse Reeve
d37f8f68d8
Adds user lists template
2021-02-02 10:13:59 -08:00
Mouse Reeve
05c00b9eca
Adds cute lil icons to discover page
2021-02-02 10:13:35 -08:00
Mouse Reeve
d2fc3febb0
Show reading activity panel when no readthroughs exist
2021-02-02 09:44:29 -08:00
Mouse Reeve
23ce639e5c
migration to change privacy field type
2021-02-02 09:41:24 -08:00
Mouse Reeve
e53b4e57fa
Federating lists and shelves
2021-02-02 09:37:46 -08:00
Mouse Reeve
c7914d1394
Fixes search tests
2021-02-01 13:06:06 -08:00
Mouse Reeve
3e3b21c46a
Fixes ap serialization of list lists
2021-02-01 12:03:11 -08:00
Mouse Reeve
e865530142
Search lists
2021-02-01 11:50:47 -08:00
Mouse Reeve
ec7a9f68c2
Adds tabs to user profile page
2021-02-01 11:34:08 -08:00
Mouse Reeve
d7c32cc314
Paginates lists view
2021-01-31 17:34:06 -08:00
Mouse Reeve
6e0d258c97
Cards on list page
2021-01-31 14:03:51 -08:00
Mouse Reeve
fd9b98d443
Fixes logged out list view
2021-01-31 13:38:26 -08:00
Mouse Reeve
5939a72c81
More list models tests
2021-01-31 13:31:49 -08:00
Mouse Reeve
b9b5694165
Fixes bug in removing list item
2021-01-31 13:14:52 -08:00
Mouse Reeve
19b56c26f7
list views tests
2021-01-31 13:12:56 -08:00
Mouse Reeve
944503dde5
Use close button instead of cancel button on edit form
2021-01-31 12:36:53 -08:00
Mouse Reeve
697bcb0edb
sidebar css class
2021-01-31 12:31:39 -08:00
Mouse Reeve
6824bdd5ed
Fixes shelve menu display
2021-01-31 12:30:33 -08:00
Mouse Reeve
b17761cfc3
remove items from list
2021-01-31 12:15:38 -08:00
Mouse Reeve
47097c6b32
updates user rating tag
2021-01-31 12:10:10 -08:00
Mouse Reeve
13b38d40bb
Curation view
2021-01-31 12:07:54 -08:00
Mouse Reeve
a6c5341ad1
curation ui
2021-01-31 11:45:16 -08:00
Mouse Reeve
846489e88e
Only show approved list items
2021-01-31 11:21:50 -08:00
Mouse Reeve
a2e69d783d
suggest button wording
2021-01-31 11:13:50 -08:00
Mouse Reeve
f15626b2cb
Null state for search results
2021-01-31 11:13:05 -08:00
Mouse Reeve
6a68fe9475
Search for books to add to lists
2021-01-31 11:11:26 -08:00
Mouse Reeve
1e9189d43c
Suggest recently edited books if we're out of user books
2021-01-31 10:56:40 -08:00
Mouse Reeve
1a4c53da2c
Only show delete button to appropriate users
2021-01-31 10:44:46 -08:00
Mouse Reeve
acd922970a
Add to and edit lists
2021-01-31 10:34:25 -08:00
Mouse Reeve
4883231347
Fixes model test
2021-01-31 09:08:06 -08:00
Mouse Reeve
d73a1b4ec1
handles list privacy in display
2021-01-31 08:41:11 -08:00
Mouse Reeve
69c2b192a4
Adds list creation form
2021-01-31 08:08:52 -08:00
Mouse Reeve
91483b56f5
Adds views tests
2021-01-31 07:09:03 -08:00
Mouse Reeve
8ef959ba73
Adds little icons, so cute
2021-01-31 06:52:18 -08:00
Mouse Reeve
0815b36ec9
Adds basic view and template files
2021-01-30 21:42:47 -08:00
Mouse Reeve
af65509527
stub test for list model
2021-01-30 21:03:50 -08:00
Mouse Reeve
fe088f21fb
Model and migration for lists
2021-01-30 21:00:36 -08:00
Mouse Reeve
45ac13a7ff
Clear unused editions with poor metadata
2021-01-30 18:30:07 -08:00
Mouse Reeve
a36de9026b
Merge pull request #575 from mouse-reeve/openlibrary-editions
...
Ignore openlibrary editions with little to no metadata
2021-01-30 17:49:54 -08:00
Mouse Reeve
9833f5a03d
Tests creating editions
2021-01-30 17:44:42 -08:00
Mouse Reeve
661d49d9cc
Ignore openlibrary editions with little to no metadata
...
Also fixes the isbn problem
2021-01-30 17:19:01 -08:00
Mouse Reeve
645e85050c
Group modals with shelve button
2021-01-30 16:08:29 -08:00
Mouse Reeve
6ff70d0d2c
directory for shelve button templates
2021-01-30 15:59:50 -08:00
Mouse Reeve
765a6a1878
uncomment error handling for bad shelf id
2021-01-30 15:56:22 -08:00
Mouse Reeve
74d37c84be
Don't show the main button in the dropdown
2021-01-30 15:49:43 -08:00
Mouse Reeve
0c723eb550
Fixes shelf page template path bug
2021-01-30 15:49:43 -08:00
Mouse Reeve
7afab352b1
Fixes incorrect tempalte path in threaded status page
2021-01-30 15:49:43 -08:00
Mouse Reeve
9b326f7321
Give user control over "want to read" posts
2021-01-30 15:18:38 -08:00
Mouse Reeve
e5fd14b206
Confirmation modal for to-read shelve action
2021-01-30 13:11:43 -08:00
Mouse Reeve
b3bd6822b2
Make sure templates render rather than checking template paths
2021-01-30 12:30:03 -08:00
Mouse Reeve
ac4a178e83
Fixes shelf page template path bug
2021-01-30 12:03:50 -08:00
Mouse Reeve
37710144fa
Adds options tempalte
2021-01-30 11:52:31 -08:00
Mouse Reeve
cd65ac7290
Fixes incorrect tempalte path in threaded status page
2021-01-30 11:46:15 -08:00
Mouse Reeve
e5746d6117
Menu list for shelf button options
2021-01-30 11:43:40 -08:00
Mouse Reeve
8add05d7fd
Fixes incorrect display of reading progress
2021-01-29 18:06:17 -08:00
Mouse Reeve
9d3f48a1a9
Settings views tests
2021-01-29 17:06:10 -08:00
Mouse Reeve
d1ee26e282
list of federated servers for admin panel
2021-01-29 16:02:59 -08:00
Mouse Reeve
9db327a69e
Edit view for site settings
2021-01-29 15:50:46 -08:00
Mouse Reeve
21aadf2920
Adds site settings view
2021-01-29 15:38:42 -08:00
Mouse Reeve
02c466e04a
Merge pull request #568 from mouse-reeve/send-dms
...
Compose window for dms
2021-01-29 14:23:06 -08:00
Mouse Reeve
93ef9e31ad
Send message to a particular user
2021-01-29 11:44:04 -08:00
Mouse Reeve
779a5e0cbf
Compose window for dms
2021-01-29 11:14:18 -08:00
Mouse Reeve
640db7e9e3
Fixes more tests for moved-around views
2021-01-29 10:47:47 -08:00
Mouse Reeve
bae54b6847
Shuffles tests around for feed views
2021-01-29 10:33:44 -08:00
Mouse Reeve
cc5fedb1d1
Fixes template paths in views
2021-01-29 10:29:21 -08:00
Mouse Reeve
b53ef73faf
Feed templates
2021-01-29 10:25:31 -08:00
Mouse Reeve
932acc961f
Fixes template paths in tests
2021-01-29 09:41:32 -08:00
Mouse Reeve
60721fd41e
Fixes user layout
2021-01-29 09:29:59 -08:00
Mouse Reeve
9fa8ee3940
Groups profile settings templates
2021-01-29 09:28:00 -08:00
Mouse Reeve
24af288c52
Refactors user pages
2021-01-29 09:05:53 -08:00
Mouse Reeve
6ccf7841e1
Moves components out of snippets
2021-01-29 08:51:36 -08:00
Mouse Reeve
65db2e63ac
Merge pull request #566 from mouse-reeve/blockquote
...
Allows blockquote markdown
2021-01-29 08:18:05 -08:00
Mouse Reeve
e6a0e5f96c
Merge pull request #554 from bibliotechy/430-add-rss-support
...
First attempt at adding rss support
2021-01-29 08:09:32 -08:00
Mouse Reeve
68d00d590c
Allows blockquote markdown
2021-01-29 08:00:19 -08:00
Chad Nelson
4274bf0508
Patch site settings so this can pass
2021-01-27 22:13:35 -05:00
Chad Nelson
9c2813545c
Closer to some passing tests
2021-01-27 21:23:20 -05:00
Mouse Reeve
7d1c5fb0f2
Patches broadcast call in reading test
2021-01-27 11:01:36 -08:00
Mouse Reeve
c2d0c4b022
Adds missing init file for views tests
...
this is important!!
2021-01-27 09:31:11 -08:00
Mouse Reeve
b52aa5bee9
Fixes status tests
2021-01-27 09:31:01 -08:00
Mouse Reeve
1a54ed875b
easier way to get user statuses queryset
2021-01-27 09:30:03 -08:00
Mouse Reeve
5377a8f187
Fixes reading view
2021-01-27 09:29:34 -08:00
Mouse Reeve
e2935b6364
Fixes shelve tests
2021-01-27 09:27:29 -08:00
Mouse Reeve
662cbf2da9
Merge pull request #555 from mouse-reeve/blocking
...
Blocking
2021-01-26 14:43:01 -08:00
Mouse Reeve
36486ca731
block/unblock view tests
2021-01-26 13:02:14 -08:00
Mouse Reeve
369b24f9ec
null state for block page
2021-01-26 13:02:04 -08:00
Mouse Reeve
22e4138555
unblock
2021-01-26 13:00:36 -08:00
Mouse Reeve
acfc865d4e
Adds blocked users view
...
also refactors the setting view
2021-01-26 10:01:50 -08:00
Mouse Reeve
3f011445e2
Hide user pages to blocked users
2021-01-26 08:31:55 -08:00
Mouse Reeve
12b95c6cd4
Merge pull request #558 from mouse-reeve/image-crop
...
Moves avatar crop into function and adds test
2021-01-26 08:24:52 -08:00
Mouse Reeve
681f5482fd
Don't allow blocked users to access user page
2021-01-26 08:07:38 -08:00
Mouse Reeve
2a6a000e05
Moves avatar crop into function and adds test
2021-01-26 08:03:16 -08:00
Mouse Reeve
ac2ab2981f
ui path to iniate blocks
2021-01-25 14:03:18 -08:00
Mouse Reeve
d994d8d3c8
Moves blocking side effects to model
2021-01-24 17:07:19 -08:00
Joel Bradshaw
ed83032330
Fix migration for if db has multiple empty emails
...
If the database has multiple users with an empty email column, this
migration will fail because multiple empty strings break the unique
constraint.
A fresh database won't have this problem because it won't have any
legacy users with empty strings instead of NULL, but for existing
databases we need to convert the empty strings to NULL so they don't run
awry of the unique constraint.
2021-01-24 16:39:26 -08:00
Mouse Reeve
4e0ec12052
hide blocked content from feed
2021-01-24 16:13:26 -08:00
Chad Nelson
ad2baf3be5
Use display_name instead of username
2021-01-23 18:39:55 -05:00
Mouse Reeve
6cc29a6cf8
Hide content from blocked users
2021-01-23 11:40:41 -08:00
Mouse Reeve
cc8888dea2
Adds incoming handler for blocking
2021-01-23 11:03:10 -08:00
Chad Nelson
0fe2e7a356
First pass at basic RSS
2021-01-23 09:48:34 -05:00
Mouse Reeve
54f8a65ae2
Adds block option to status menu
2021-01-22 20:17:16 -08:00
Mouse Reeve
20758b662d
don't need the showprogress get param any longer
2021-01-22 14:33:03 -08:00
Mouse Reeve
129ca0352f
Consistent progress type form element
2021-01-22 13:00:20 -08:00
Mouse Reeve
12c23836b7
Fixes display of finish date
2021-01-22 12:54:25 -08:00
Mouse Reeve
69c5bf71ed
Uses javascript show/hide for reading progress updates
2021-01-22 12:51:23 -08:00
Mouse Reeve
806b781f15
Adds html form validator for min value
2021-01-22 09:21:58 -08:00
Mouse Reeve
3db0de3dd4
Makes pages/percents toggle-able in sidebar
2021-01-22 09:19:02 -08:00
Mouse Reeve
6c52afeae0
Merge pull request #354 from cincodenada/progress_update
...
Keep track of progress through books over time
2021-01-21 16:57:16 -08:00
Mouse Reeve
2809095966
Merge pull request #548 from mouse-reeve/at-mentions
...
puts @'mentions directly in compose box
2021-01-20 09:35:18 -08:00
Mouse Reeve
fe42c6d853
Remove login decorator from about page
2021-01-20 07:16:25 -08:00
Joel Bradshaw
57607c3590
Regenerate merge migration
2021-01-19 23:53:42 -08:00
Joel Bradshaw
85edee42ef
Merge branch 'main' into progress_update
2021-01-19 23:49:35 -08:00
Joel Bradshaw
070fa04b63
Add validators and more tests
...
I don't think these validators will do anything unless we use them or
are submitting a form, but they're there nonetheless
2021-01-19 23:40:11 -08:00
Joel Bradshaw
edba55f7c2
Flatten and rework sidebar update
2021-01-19 23:04:08 -08:00
Joel Bradshaw
32346cf9a3
Cascade-delete progress updates
...
Add a warning about it, and update test to confirm it works
2021-01-19 22:36:44 -08:00
Mouse Reeve
9f2ca73a58
Tests terminal space in mentions string
2021-01-19 16:48:06 -08:00
Mouse Reeve
2411b4fe79
puts @'mentions directly in compose box
2021-01-19 16:16:22 -08:00
Mouse Reeve
0700a71803
Merge pull request #538 from mouse-reeve/polling
...
Polling to update notification count
2021-01-19 15:13:37 -08:00
Mouse Reeve
1778e8dd46
Uses timeout instead of interval
2021-01-19 14:59:46 -08:00
Mouse Reeve
94a41498cf
Remove counts when notifications are deleted
2021-01-19 14:32:08 -08:00
Mouse Reeve
3fce67a60d
Only update on change
2021-01-19 14:25:04 -08:00
Mouse Reeve
f049c7c3d9
Fixes clashing form ids in rate/review
2021-01-19 09:31:01 -08:00
Mouse Reeve
c1c7b68fc1
Fixes error state for goal
2021-01-19 07:40:37 -08:00
Mouse Reeve
589c128793
Sets min in html
2021-01-19 07:38:18 -08:00
Mouse Reeve
328ebc39c1
Adds migration
2021-01-19 07:38:12 -08:00
Mouse Reeve
6efe4d54f0
Sets minimum goal
2021-01-19 07:30:35 -08:00
Mouse Reeve
1048688284
Fixes import paths
2021-01-19 07:15:08 -08:00
Joel Bradshaw
60b42827f4
Mock the AP publishing to stop hanging tests
2021-01-18 20:00:04 -08:00
Joel Bradshaw
79e284e5be
Just scootch the migration merge up
2021-01-18 19:59:40 -08:00
Joel Bradshaw
29140be78e
Merge branch 'main' into progress_update
2021-01-18 19:41:06 -08:00
Mouse Reeve
0d00857ef8
Render markdown to html in the right order
2021-01-18 17:54:36 -08:00
Mouse Reeve
128dc3be44
Remove a div
2021-01-18 16:52:51 -08:00
Mouse Reeve
a7620c07cb
Fixes edit shelf view
2021-01-18 16:38:04 -08:00
Mouse Reeve
394666357f
Poll for notifications
2021-01-18 16:32:02 -08:00
Mouse Reeve
fc218c5d48
Set reply privacy to parent privacy
2021-01-18 13:02:30 -08:00
Mouse Reeve
7a153a9942
Collapse status content box for empty status (like goal)
...
this is janky... oh well
2021-01-18 12:36:34 -08:00
Mouse Reeve
2a6c67c427
Correct placement of shelve pulldown
2021-01-18 12:25:26 -08:00
Mouse Reeve
69b38bfe91
Show latest read books first in goals page
2021-01-18 12:22:36 -08:00
Mouse Reeve
25643faf72
Fixes misplaced close diff causing cascading nesting on editions page
2021-01-18 12:22:11 -08:00
Mouse Reeve
96cc9d44db
Fixes email migration
2021-01-18 11:57:20 -08:00
Mouse Reeve
8a00c7741a
Nullable email
2021-01-18 11:51:51 -08:00
Mouse Reeve
d8ace7e417
Fixes html error on edit user page
2021-01-18 11:19:30 -08:00
Mouse Reeve
11dd8c8f82
Allow users to log in with email or username
2021-01-18 11:06:28 -08:00
Mouse Reeve
f825709599
Merge pull request #529 from mouse-reeve/html-cleanup
...
Html cleanup
2021-01-18 10:25:31 -08:00
Mouse Reeve
c7b03fec5a
Fixes rate action
2021-01-18 09:57:44 -08:00
Mouse Reeve
debc9696e1
Sets focus for editing and deleting readthroughs
2021-01-18 09:03:21 -08:00
Mouse Reeve
8f0eb84172
Uses actual label text in toggle button, not the word "label"
2021-01-18 08:54:25 -08:00
Mouse Reeve
c3781e7f51
Sets hover to modal header when opened
2021-01-18 08:54:00 -08:00
Mouse Reeve
7308d8d1e9
javascript cleanup
...
I got my linter working!
2021-01-18 08:26:04 -08:00
Mouse Reeve
d6f2740bc8
unneeded classnames
2021-01-17 20:40:33 -08:00
Mouse Reeve
c205126c54
Fixes close button in mobile suggested compose
2021-01-17 20:39:18 -08:00
Mouse Reeve
51ddada8f6
Fixes mobile menu dropdown
2021-01-17 20:31:37 -08:00
Mouse Reeve
3f136c40da
Uses js pattern for tabs
2021-01-17 20:19:09 -08:00
Mouse Reeve
aba5c48af9
uses "plus" button for adding read dates
2021-01-17 17:22:03 -08:00
Mouse Reeve
2937c592c1
Uses css norms for upload cover form
2021-01-17 17:09:43 -08:00
Mouse Reeve
937a7dd1af
Uses clickable dropdowns and improves styling on menu buttons
...
screenreader legible
2021-01-17 16:48:05 -08:00
Mouse Reeve
0a70d6e981
Makes dropdown clickable, and work with screen reader
...
I'm lightly peeved with bulma that it wasn't clear how to make hover
menus accessible, but clickable menus are just fine with my anyway.
2021-01-17 16:29:46 -08:00
Joel Bradshaw
0af4863568
Update merge migration
2021-01-17 13:21:26 -08:00
Joel Bradshaw
49893f49e1
Merge fixes
2021-01-17 13:09:49 -08:00
Joel Bradshaw
a4519d55c9
Merge branch 'main' into progress_update
2021-01-17 13:05:38 -08:00
Joel Bradshaw
ef05ac1f65
Small fixes to old form
2021-01-17 12:48:10 -08:00
Joel Bradshaw
6e05dfde92
Revert "Make the switching work, wows"
...
Actually this is bad, switching on this page is not useful enough for
the UI complexity. Users can switch percent/pages on the book page.
This reverts commit a4796cf5c5
.
2021-01-17 12:40:24 -08:00
Mouse Reeve
48febecf0d
Merge pull request #523 from cincodenada/fix-ordering-warning
...
Add order for shelf books to satisfy warning
2021-01-17 11:35:54 -08:00
Mouse Reeve
9b8e5a4139
Removes unused reply form template
2021-01-17 11:20:32 -08:00
Mouse Reeve
8576bf8ada
Uses new button patttern for content warnings
2021-01-17 11:15:53 -08:00
Mouse Reeve
73c1b5a1ff
Component for dropdowns
...
also use hoverable dropdowns
2021-01-17 11:09:49 -08:00
Mouse Reeve
e64507e50d
Uses has-addons css for interact buttons
2021-01-17 10:45:25 -08:00
Mouse Reeve
c6e5b33970
Uses css has-addons for shelve button
2021-01-17 10:40:40 -08:00
Mouse Reeve
ff743ed9d6
Javascript button for reply form
2021-01-17 10:38:34 -08:00
Mouse Reeve
47d5b907ac
Readthrough interactions
2021-01-17 10:10:59 -08:00
Mouse Reeve
f7e3cbda84
Uses toggle button snippet for content warning
2021-01-17 08:50:47 -08:00
Mouse Reeve
afdf5fc8ec
starts replacing pure css buttons with javascript buttons
...
RIP, but it was time
2021-01-17 08:26:28 -08:00
Joel Bradshaw
a4796cf5c5
Make the switching work, wows
...
Layout's all wonky now, but hey
2021-01-17 03:14:26 -08:00
Joel Bradshaw
2d157137aa
Fix inline form
2021-01-17 02:57:10 -08:00
Joel Bradshaw
da8d8cd434
Add deletion of progress updates
...
And only show progress edit for editing unfinished readthroughs
2021-01-17 02:28:37 -08:00
Joel Bradshaw
ddb5848d32
Move error down into to_ordered_queryset
2021-01-16 23:31:47 -08:00
Mouse Reeve
2e043f9252
Make it doubly clear that the hidden checkbox is hidden
2021-01-16 20:06:19 -08:00
Mouse Reeve
f42fd28c73
Removes unused javascript
2021-01-16 19:59:08 -08:00
Mouse Reeve
3e58163f0d
refactors content warning button
2021-01-16 19:57:20 -08:00
Mouse Reeve
6ab543004e
Uses card component for reading goal announcement
2021-01-16 14:48:17 -08:00
Mouse Reeve
de9fbcef80
Naturally 404 for deleted statuses
2021-01-16 14:38:21 -08:00
Mouse Reeve
d6dc975a2e
Creates re-usable template for cards
2021-01-16 14:38:21 -08:00
Mouse Reeve
fa56ae873b
Screenreader tweaks
2021-01-16 14:33:43 -08:00
Mouse Reeve
8532c9a46b
tests goal views
2021-01-16 13:29:28 -08:00
Mouse Reeve
ec79b10088
Post status about goal
2021-01-16 12:48:04 -08:00
Mouse Reeve
f3f6592e72
Edit goal
2021-01-16 12:39:51 -08:00
Mouse Reeve
112b9f9332
Create goal with privacy
2021-01-16 11:34:19 -08:00
Mouse Reeve
739b6e19e2
Dismiss reading goal using localstorage
2021-01-16 09:21:19 -08:00
Mouse Reeve
11ea829657
Adds icon to goal form
2021-01-16 08:54:16 -08:00
Mouse Reeve
3a7271309e
Adds markup for set goal status on feed page
2021-01-16 08:19:54 -08:00
Mouse Reeve
b648012af5
Adds form and models for reading goal
2021-01-16 08:18:54 -08:00
Mouse Reeve
3866523d57
Fixes merge conflict resolution bug
2021-01-15 13:12:46 -08:00
Mouse Reeve
f61a25cfb1
Merge branch 'main' into html-interaction
2021-01-15 09:45:33 -08:00
Mouse Reeve
6e254e548c
Merge pull request #519 from mouse-reeve/view-actions-tests
...
Overhauls views/view_actions/outgoing
2021-01-15 09:39:07 -08:00
Mouse Reeve
861249080b
Moves toggle menu javascript out of html
2021-01-14 15:45:30 -08:00
Mouse Reeve
7abe39b7d5
Tab change javascript out of html
2021-01-14 15:29:37 -08:00
Mouse Reeve
4d4e692f49
Javascript cleanup
2021-01-14 15:16:18 -08:00
Mouse Reeve
5591024933
Moves interaction javascript out of html
2021-01-14 14:38:33 -08:00
Mouse Reeve
d59c586e55
use snippet for modal close buttons
2021-01-14 14:21:27 -08:00
Mouse Reeve
b1cdddd1a2
Adds titles to icons
2021-01-14 14:13:23 -08:00
Mouse Reeve
aa7320ffe0
Using toggle button snippets on shelf page
2021-01-14 14:00:05 -08:00
Mouse Reeve
e2d341b147
vertical align bottom post button in reply form
2021-01-14 13:51:07 -08:00
Mouse Reeve
f8d5eec60d
cw back on the top
...
it just felt weird on the bottom??
2021-01-14 13:43:52 -08:00
Mouse Reeve
aa564b26c8
Uses snippet for toggle buttons
2021-01-14 13:35:09 -08:00
Mouse Reeve
e57c4f4bcd
Adds focus control javascript
2021-01-14 13:02:28 -08:00
Mouse Reeve
e5155d9402
Removes duplicate start reading modal markup
2021-01-14 11:34:22 -08:00
Joel Bradshaw
b0ea31f2a9
Add order for shelf books to satisfy warning
...
I believe this will sort books by order they were added to the shelf,
which seems reasonable. Should add some tests to make sure though.
2021-01-13 23:44:44 -08:00
Joel Bradshaw
1e13997c5d
Create an actual user, add missing file
...
Also allow `./bw-dev up -d`
I'm not sure why this was necessary, but it makes enough sense
2021-01-13 23:02:56 -08:00
Joel Bradshaw
48147883ce
Merge branch 'main' into progress_update
2021-01-13 19:53:26 -08:00
Mouse Reeve
766c7afdb9
Don't let long titles display past card title box
2021-01-13 19:38:26 -08:00
Mouse Reeve
eb2d414321
Merge pull request #521 from cincodenada/login-multiline-mobile
...
Make login form wrap nicely on mobile
2021-01-13 19:31:36 -08:00
Mouse Reeve
0a9757bf01
A few more templatetag tests
2021-01-13 19:28:44 -08:00
Joel Bradshaw
f985ca0576
Make login form wrap nicely on mobile
...
Changing to columns from a grouped form item isn't my favorite, but I
think it's okay, and it gets us better mobile behavior for free
2021-01-13 19:16:45 -08:00
Mouse Reeve
c0ce38a9d3
landing page tests
2021-01-13 18:48:50 -08:00
Joel Bradshaw
0b703a252b
Make get_rank() a regular method
...
It doesn't act like a property, and we have edition_rank as a proper
property anyway
2021-01-13 18:47:43 -08:00
Joel Bradshaw
ec2a43faa5
Fix error in migrations
...
I was getting the following error when running 0035:
AttributeError: 'Edition' object has no attribute 'get_rank',
But that line seems to be unnecessary, since save() does the same thing,
and we are already calling that.
2021-01-13 18:37:05 -08:00
Mouse Reeve
7d6a06025e
Adds more reading tests
2021-01-13 18:02:01 -08:00
Mouse Reeve
3eceb1e2b8
Fixes interaction tests
2021-01-13 14:31:52 -08:00
Mouse Reeve
90933fa81d
Fixes goodreads import tests
2021-01-13 14:02:01 -08:00
Mouse Reeve
e32a31e020
Fixes tests
2021-01-13 13:54:15 -08:00
Mouse Reeve
3e5ed19643
Removes outgoing and view_actions
2021-01-13 13:36:01 -08:00
Mouse Reeve
a385aa4cb5
Following views
2021-01-13 13:06:26 -08:00
Mouse Reeve
7555d76c3f
Adds reading acitivity views
2021-01-13 12:35:39 -08:00
Mouse Reeve
2e61bd0e7a
Removes old views file
2021-01-13 12:18:19 -08:00
Mouse Reeve
12bf34e242
Adds error page views
2021-01-13 12:08:51 -08:00
Mouse Reeve
ffd403dd47
sorts imports for views
2021-01-13 12:08:35 -08:00
Mouse Reeve
b6bdfab943
Search class views
2021-01-13 12:05:01 -08:00
Mouse Reeve
beeeaaaf39
Adds shelf views
2021-01-13 11:45:08 -08:00
Mouse Reeve
20e280e676
Adds tag class views
2021-01-13 10:24:24 -08:00
Mouse Reeve
99abb2631e
Adds author view
2021-01-13 10:04:44 -08:00
Mouse Reeve
4dea22bef6
Author class view
2021-01-13 09:54:35 -08:00
Mouse Reeve
56e3e98bc1
Adds book class view and re-works pagination
2021-01-13 09:51:51 -08:00
Mouse Reeve
cf2b9937c6
Adds fav/boost class view
2021-01-13 08:10:50 -08:00
Mouse Reeve
c8efa1ffc8
Fixes status tests and adds delete test
2021-01-13 08:04:43 -08:00
Mouse Reeve
5596277d29
tests status class view
2021-01-12 14:43:59 -08:00
Mouse Reeve
6c80b128a4
Adds status tests
2021-01-12 14:02:38 -08:00
Mouse Reeve
4ec64c02f4
Adds status views
2021-01-12 13:47:00 -08:00
Mouse Reeve
85d01d5df0
Moves user views to class view
2021-01-12 12:09:23 -08:00
Mouse Reeve
8693895bc6
Adds import view
2021-01-12 11:28:03 -08:00
Mouse Reeve
b61544b5f5
DM and notification views
2021-01-12 11:11:22 -08:00
Mouse Reeve
aa8b2c2f2b
Creates landing page views
2021-01-12 10:44:17 -08:00
Mouse Reeve
fd6603ee07
Invite views
2021-01-12 10:19:58 -08:00
Mouse Reeve
65fa08633f
Fixes authentication tests
2021-01-12 10:14:24 -08:00
Mouse Reeve
a2d7a97dc3
Updates tests
2021-01-12 09:09:05 -08:00
Mouse Reeve
00a67f1b99
Password reset and change password flows
2021-01-12 08:48:47 -08:00
Mouse Reeve
05b4cb59b0
Adds registration view
2021-01-12 08:19:08 -08:00
Mouse Reeve
6e71ff2aa1
Adds login class view
2021-01-12 08:08:43 -08:00
Mouse Reeve
a8483754c3
Fixes edit book view
2021-01-11 20:21:32 -08:00
Mouse Reeve
4319e58079
Fixes squished avatars
2021-01-11 18:09:12 -08:00
Mouse Reeve
e34ae35e0f
Merge pull request #513 from mouse-reeve/edit-shelf
...
Edit shelf
2021-01-11 15:28:45 -08:00
Mouse Reeve
3d170b3eb0
Merge pull request #514 from mouse-reeve/shelf-status-privacy
...
Use shelf privacy for "wants to read" status privacy
2021-01-11 15:28:20 -08:00
Mouse Reeve
8ade29c4c1
Use shelf privacy for "wants to read" status privacy
2021-01-11 14:49:01 -08:00
Mouse Reeve
1bcb19fde9
Fixes editing shelves
2021-01-11 14:43:34 -08:00
Mouse Reeve
8d88c768cc
Adds test for editing shelf
2021-01-11 14:23:56 -08:00
Mouse Reeve
a6eb444a68
Don't error out user page
2021-01-11 14:05:08 -08:00
Mouse Reeve
5b7f7aa0e3
sort edition list by rank
2021-01-11 11:16:10 -08:00
Mouse Reeve
fe67f65307
Set default edition on bookwyrm import
2021-01-11 10:25:34 -08:00
Mouse Reeve
83852e29eb
Update edition ranks when work is saved
2021-01-11 10:02:49 -08:00
Mouse Reeve
6db64e33e4
set rank on editions
2021-01-11 09:29:23 -08:00
Mouse Reeve
b44b42be7e
Adds rank field to edition model
2021-01-11 09:18:40 -08:00
Mouse Reeve
62fd118016
remove boost notification on delete
2021-01-10 19:51:58 -08:00
Mouse Reeve
ee96c01cc1
Boost unit tests
2021-01-10 19:43:12 -08:00
Mouse Reeve
31aef46564
tweaks notifications for favs
2021-01-10 19:32:05 -08:00
Mouse Reeve
64abdafcba
Resolves timezone warnings
2021-01-10 16:11:02 -08:00
Mouse Reeve
ef9e130669
Adds tests
2021-01-10 15:56:57 -08:00
Mouse Reeve
327020f7b3
views handler for creating readthrough dates
2021-01-10 10:51:56 -08:00
Mouse Reeve
b0e4fc2aa9
Adds ui for creating readthrough
2021-01-10 10:35:28 -08:00
Mouse Reeve
71133c51c6
Set link color on follow button
2021-01-10 10:21:23 -08:00
Mouse Reeve
9c994e893b
Merge pull request #506 from mouse-reeve/readthrough-dupes
...
Don't double-add readthroughs in re-import
2021-01-10 10:18:31 -08:00
Mouse Reeve
df985c571b
Merge pull request #507 from mouse-reeve/discover-page-cover-width
...
Smaller max width for large covers
2021-01-10 10:18:25 -08:00
Mouse Reeve
aa151c111f
Smaller max width for large covers
2021-01-10 09:50:17 -08:00
Mouse Reeve
b1b40e3c98
Don't double-add readthroughs in re-import
2021-01-10 09:36:11 -08:00
Mouse Reeve
9a575beb0b
Merge pull request #505 from mouse-reeve/link-regex-parens
...
Work around parens in the url regex
2021-01-10 09:22:19 -08:00
Mouse Reeve
1e42622b8e
Work around parens in the url regex
2021-01-10 08:39:30 -08:00
Mouse Reeve
6eb7872598
Fixes queryset for shelf page json
2021-01-10 07:54:58 -08:00
Mouse Reeve
a1e8d5c7c2
Fixes showing completed imports and in progress
2021-01-07 09:36:41 -08:00
Mouse Reeve
9a114e1736
Don't match arbitrary results on empty isbn queries
2021-01-07 09:26:05 -08:00
Mouse Reeve
d04271af75
Adds field on import job to check if job completed
...
the task isn't a reliable indicator, unfortunately.
2021-01-07 08:08:12 -08:00
Mouse Reeve
e60a984bea
Merge pull request #497 from mouse-reeve/shelving-actions
...
Shelving actions
2021-01-06 21:05:04 -08:00
Mouse Reeve
453e17f756
Merge pull request #496 from mouse-reeve/status-markup
...
Status markup
2021-01-06 21:04:34 -08:00
Mouse Reeve
b5ba97c385
uses article element instead of div for statuses
2021-01-06 20:05:28 -08:00
Mouse Reeve
b1d4b75926
Fixes tail end of shelving pulldown getting hidden
2021-01-06 19:56:56 -08:00
Mouse Reeve
02aac76acc
Added some grays to the status box
...
why am I doing this instead of the thing I meant to do
2021-01-06 19:52:47 -08:00
Mouse Reeve
5c6aed1b0e
Consistent button sizing in status footer
2021-01-06 19:45:18 -08:00
Mouse Reeve
5f0a788856
Show all readthroughs
2021-01-06 18:34:21 -08:00
Mouse Reeve
551e71162c
Show start reading button in dropdown instead of reshelve button
2021-01-06 18:17:25 -08:00
Mouse Reeve
3eae55ef4e
Adds icon for imports and follow button
2021-01-06 18:02:46 -08:00
Mouse Reeve
e4fbfc369c
Removes print statement
2021-01-06 16:01:37 -08:00
Mouse Reeve
54f27519df
Fixes username regex
2021-01-06 16:01:13 -08:00
Mouse Reeve
03a5f333e1
Cleans up notifications
2021-01-06 15:53:09 -08:00
Mouse Reeve
67f2b3d808
Proper errorhandling for registration with invite
2021-01-06 13:15:33 -08:00
Mouse Reeve
b046547a6e
Merge pull request #493 from mouse-reeve/bidirectional-text
...
Support bidirectional text in status content
2021-01-06 12:20:33 -08:00
Mouse Reeve
29dd2ae863
Merge pull request #492 from mouse-reeve/handle-favorite-error
...
Avoid throwing database error trying to fav unknown statuses
2021-01-06 12:03:01 -08:00
Mouse Reeve
054f69993b
Support bidirectional text in status content
2021-01-06 12:00:34 -08:00
Mouse Reeve
7bf57c60fb
Avoid throwing database error trying to fav unknown statuses
2021-01-06 11:43:39 -08:00
Mouse Reeve
6638c9bb44
Handles query params in urls
2021-01-06 11:36:28 -08:00
Mouse Reeve
9e07f094ad
Improves link detecting regex
2021-01-06 10:08:43 -08:00
Mouse Reeve
a25bc2383b
Improves tagging regex
2021-01-06 09:45:36 -08:00
Mouse Reeve
f87a138d49
Better matching for links in statuses
2021-01-05 21:23:36 -08:00
Mouse Reeve
a60cf0ea22
Merge pull request #485 from mouse-reeve/invite-created-date
...
Adds site invite migration
2021-01-05 11:45:51 -08:00
Mouse Reeve
c8d53ee0df
Adds site invite created date
2021-01-05 11:38:03 -08:00
Mouse Reeve
aa5bf8a382
Merge pull request #483 from mouse-reeve/registration-text-format
...
Fixes html formatting for registration closed text
2021-01-05 11:37:09 -08:00
Mouse Reeve
6261080836
Merge pull request #484 from mouse-reeve/user-page-feed
...
Fixes bug that shows your own posts in every user page
2021-01-05 11:34:57 -08:00
Mouse Reeve
5864c9a6e7
Revert "Add created date and sorting to invites"
...
This reverts commit 11212401a0
.
2021-01-05 11:33:33 -08:00
Mouse Reeve
3d6f113543
Fixes bug that shows your own posts in every user page
2021-01-05 11:16:24 -08:00
Mouse Reeve
11212401a0
Add created date and sorting to invites
2021-01-05 11:08:24 -08:00
Mouse Reeve
7c34889586
Fixes html formatting for registration closed text
2021-01-05 10:46:07 -08:00
Mouse Reeve
ff9caf3d51
Fixes migration version numbering
2021-01-04 21:39:57 -08:00
Mouse Reeve
cc44331073
activity feed should handle looged out users
2021-01-04 19:47:22 -08:00
Mouse Reeve
35696934da
refactors get_activity_feed function
...
is it better? idk
2021-01-04 19:30:05 -08:00
Mouse Reeve
8301bec4ff
Use accurate review count
2021-01-04 17:59:46 -08:00
Mouse Reeve
a0a8ad508a
Book page filters ratings with empty string content
2021-01-04 17:55:29 -08:00
Mouse Reeve
1046aa7ad2
Re-organizes metadata on book page
2021-01-04 17:42:02 -08:00
Mouse Reeve
89e2e75c0b
Only show rate action for logged in users
2021-01-04 16:50:58 -08:00
Mouse Reeve
10523e38e8
Updates fields in edit book form
2021-01-04 16:42:28 -08:00
Mouse Reeve
35e2410642
Show series in book page
2021-01-04 16:33:45 -08:00
Mouse Reeve
a73f51ad78
Merge branch 'main' into review-rate
2021-01-04 13:42:39 -08:00
Mouse Reeve
0f4a30324e
Makes more about instance text customizable
2021-01-04 12:58:31 -08:00
Mouse Reeve
0c0e9bebdf
Use uploaded logos in templates
2021-01-04 12:47:10 -08:00
Mouse Reeve
7cc2dfe517
Merge branch 'main' into logo-default
2021-01-04 12:18:40 -08:00
Mouse Reeve
1d2b56da85
Fixes outgoing tests
2021-01-04 12:00:53 -08:00
Mouse Reeve
9102d81767
Fixes checking invite validity
2021-01-04 11:14:10 -08:00
Mouse Reeve
81e60cea16
Fixes login form
2021-01-04 11:14:07 -08:00
Mouse Reeve
3fe7b95786
Fixes setting remote user username on update
2021-01-04 10:42:31 -08:00
Mouse Reeve
4090b336db
Fixes outgoing test users
2021-01-04 10:20:49 -08:00
Mouse Reeve
15b9f62136
Fixes users in views tests
2021-01-04 10:08:45 -08:00
Mouse Reeve
50f61f5d19
Merge branch 'main' into validate-username
2021-01-04 09:41:17 -08:00
Mouse Reeve
34e9847da3
Still need to remove validator arg in username field
2021-01-04 09:40:23 -08:00
Mouse Reeve
d8eb3454d6
Fixes null value in status attachment array
2021-01-03 20:03:35 -08:00
Mouse Reeve
b608e36946
Filter books for discover page for privacy
2021-01-03 15:44:07 -08:00
Mouse Reeve
c0bd0736d3
Hide join button when registration is closed
2021-01-03 15:41:20 -08:00
Mouse Reeve
6668f54889
Fixes openlibrary test and navbar hover aria unfurl
2021-01-03 14:41:10 -08:00
Mouse Reeve
eec3e6c4b4
Hide top bar login form on login page
2021-01-03 14:35:28 -08:00
Mouse Reeve
7242adadaa
Hide login form for authenticated users
2021-01-03 14:31:32 -08:00
Mouse Reeve
0247f89c0b
Use recent reviews instead of most reviewed books
2021-01-03 14:28:28 -08:00
Mouse Reeve
8e923d6333
User container class in layout
2021-01-03 12:53:51 -08:00
Mouse Reeve
e3fa0afa9a
Hide large logo on mobile
2021-01-03 11:52:37 -08:00
Mouse Reeve
721d20efab
Creates snippets for discover preview boxes
2021-01-03 11:24:26 -08:00
Mouse Reeve
ef42d29bd9
Discovery landing page
2021-01-03 11:10:04 -08:00
Mouse Reeve
04eb518633
Make the top bar dropdown accessible to NVDA screenreaders
...
plus, it's just better for this to be a ul
2021-01-03 10:03:57 -08:00
Mouse Reeve
18e0347077
Merge pull request #470 from mouse-reeve/duplicate-replies-in-feed
...
Fixes replies showing up twice in feed
2021-01-03 08:32:01 -08:00
Mouse Reeve
1187016aba
Merge pull request #469 from mouse-reeve/user-search
...
Search on username and localname in user search
2021-01-03 08:31:46 -08:00
Mouse Reeve
4d4b27e844
Fixes replies showing up twice in feed
2021-01-03 08:17:00 -08:00
Mouse Reeve
e54e1f2459
Tests user search
2021-01-03 07:57:57 -08:00
Mouse Reeve
b5ce7a0c25
Search on username and localname in user search
2021-01-03 07:48:57 -08:00
Renato "Lond" Cerqueira
b389cfb013
Use user-agent to determine whether to show pure representation
...
Together with #434 and #435 , this fixes #429 . Use the user-agent to
determine if the call is coming from a BookWyrm instance or not. If it's
not, give a pure activitypub representation for the status. Otherwise,
give a BookWyrm one, to allow for a complete integration between
instances.
2021-01-03 14:24:03 +01:00
Mouse Reeve
8afd111ff4
Merge pull request #466 from mouse-reeve/search-tweaks
...
Search tweaks
2021-01-02 16:30:28 -08:00
Mouse Reeve
d3c181cacb
Re-sorts search results after deduplication
2021-01-02 16:09:54 -08:00
Mouse Reeve
a413c87963
Separate search for unique identifiers out from text search
2021-01-02 15:58:25 -08:00
Mouse Reeve
a2e8cf1993
Return best matching edition instead of default in search
2021-01-02 15:15:25 -08:00
Mouse Reeve
afa1921968
Deduplicates search results
2021-01-02 14:33:01 -08:00
Mouse Reeve
4c968c417b
cleans up search tests
2021-01-02 14:20:39 -08:00
Mouse Reeve
22f5fa154c
Add readthroughs even when a book is already shelved
2021-01-02 13:26:42 -08:00
Mouse Reeve
b2c22c5b7f
Tests handle import shelving
2021-01-02 13:09:40 -08:00
Mouse Reeve
8c8aae2c92
Check if a book is already shelved after import
2021-01-02 12:08:30 -08:00
Mouse Reeve
3344eed3b9
Tests for goodreads import lookup
2021-01-02 11:35:56 -08:00
Mouse Reeve
97b56e9bc2
Removes references to max entries in views
2021-01-02 09:45:51 -08:00
Mouse Reeve
204967e421
Adds tests file for goodreads import
2021-01-02 09:42:50 -08:00
Mouse Reeve
1f5d95e2be
Removes import limit
2021-01-02 09:42:33 -08:00
Mouse Reeve
1e7aa283c2
Patches celery calls in connector tests
2021-01-02 09:08:37 -08:00
Mouse Reeve
86060f795d
Updates tests
2021-01-02 08:55:42 -08:00
Mouse Reeve
d828b0ead9
Remove books manager at long last
2021-01-02 08:14:28 -08:00
Mouse Reeve
e169565e00
Makes expanding book data fully part of the connector
2021-01-02 07:45:45 -08:00
Mouse Reeve
dad202823a
Moves review re-structing into separate migration
2021-01-01 15:37:32 -08:00
Mouse Reeve
385ec4d70a
Adds ReviewRating model
...
I can't just calling Rating because that would clash with the rating
field
2021-01-01 11:51:52 -08:00
Mouse Reeve
fc8f43273e
Merge pull request #459 from mouse-reeve/status-model-files
...
Moves models that don't inherit Status to their own files
2021-01-01 11:23:23 -08:00
Mouse Reeve
521934b4f3
Moves models that don't inherit Status to their own files
2021-01-01 10:46:15 -08:00
Mouse Reeve
bb5ae850e1
Mention users implicitly (without needing @mentions)
2021-01-01 09:35:14 -08:00
Mouse Reeve
b3449040d9
Fixes server error posting status
2021-01-01 07:27:56 -08:00
Mouse Reeve
1246042c12
move some code around for readability
2020-12-31 16:30:04 -08:00
Mouse Reeve
c5a3e57bb4
Script for removing duplicates in book data
2020-12-31 16:03:54 -08:00
Mouse Reeve
87b8e5f39d
Merge pull request #451 from mouse-reeve/views-tests
...
Views tests
2020-12-31 14:03:34 -08:00
Mouse Reeve
2f9123c206
Add sort order to followers/following ordered collection querysets
2020-12-31 13:47:26 -08:00
Mouse Reeve
e066c53dd0
tests hella views
2020-12-31 13:45:36 -08:00
Mouse Reeve
a444c5f6fc
Fixes model deduplication from data
2020-12-31 12:22:00 -08:00
Mouse Reeve
141e7b90e8
Cleans up abstract connector tests
...
a buncha linting errors and junk we don't need in setup
2020-12-31 11:11:59 -08:00
Mouse Reeve
03ed1cfa94
Small syntax changes in openlibrary connector
2020-12-31 11:03:30 -08:00
Mouse Reeve
9afbf3196f
Cleans up paths in import model tests
2020-12-31 09:49:27 -08:00
Mouse Reeve
171d09599c
Fixes author path in openlibrary connector
2020-12-31 09:32:40 -08:00
Mouse Reeve
c1e1bdac4b
Fixes url formatting in openlibrary connector
2020-12-31 09:19:39 -08:00
Mouse Reeve
69af2f4cd3
Fixes untag
2020-12-31 08:42:09 -08:00
Mouse Reeve
a7a586ea90
Fixes tagging
2020-12-31 08:30:51 -08:00
Mouse Reeve
29ee027f6d
Tests tag page and orders tag collection json
2020-12-31 08:05:24 -08:00
Mouse Reeve
d04a1956f5
Test that editions page loads
2020-12-31 07:52:08 -08:00
Mouse Reeve
7bcf0a1d53
Fixes missing code for editions list json
2020-12-31 07:46:35 -08:00
Mouse Reeve
17b9c6ecc5
Adds label to reply textarea
2020-12-30 17:38:38 -08:00
Mouse Reeve
dc68fdd53e
User generated local paths
2020-12-30 17:36:35 -08:00
Mouse Reeve
d821a08cff
include tags in replies
...
I was against this but apparently it helps the replies actually WORK
2020-12-30 16:33:04 -08:00
Mouse Reeve
d42ebbaf4a
Link to local versions of statuses in notifications
2020-12-30 16:10:32 -08:00
Mouse Reeve
885bb023a3
Sort shelves by shelfbook updated date
2020-12-30 16:07:29 -08:00
Mouse Reeve
670036f8a9
Fixes user preview on rating display
2020-12-30 15:52:17 -08:00
Mouse Reeve
c33095dfe0
Merge pull request #442 from mouse-reeve/views-tests
...
Views tests
2020-12-30 15:51:54 -08:00
Mouse Reeve
4e413a3779
Adds tests for generating feeds
2020-12-30 14:57:57 -08:00
Mouse Reeve
48f002727a
small change and test to get_user_from_username
2020-12-30 14:57:43 -08:00
Mouse Reeve
45c13bd76c
Only get reviews when loading user data
2020-12-30 13:16:09 -08:00
Mouse Reeve
c1243b5c21
Makes outbox filter-able
2020-12-30 13:14:16 -08:00
Mouse Reeve
747167c579
Merge pull request #439 from mouse-reeve/filter-outbox
...
Updates outbox
2020-12-30 13:13:47 -08:00
Mouse Reeve
2e36da3f9e
Merge pull request #438 from mouse-reeve/accept-button-color
...
Makes follow request button a different color than an unread notification
2020-12-30 12:44:18 -08:00
Mouse Reeve
babc604397
Fixes outbox privacy
2020-12-30 12:41:19 -08:00
Mouse Reeve
88d8b6e577
Cleans up outbox function
2020-12-30 12:38:34 -08:00
Mouse Reeve
b71eda6e38
Merge pull request #434 from renatolond/activitypub/use_activitypub_content_type
...
Create a ActivitypubResponse class and use it in the views
2020-12-30 12:37:04 -08:00
Renato "Lond" Cerqueira
44a8184f72
Create a ActivitypubResponse class and use it in the views
...
This improves compatibility with other fediverse software by using the
expected content type for any api calls.
2020-12-30 21:25:28 +01:00
Mouse Reeve
877e3356e5
Merge pull request #436 from mouse-reeve/search-errors
...
Catch error response decoding json in search connector
2020-12-30 12:18:43 -08:00
Mouse Reeve
e290dec035
Merge pull request #437 from mouse-reeve/version-setting
...
Set application version number in settings
2020-12-30 12:16:47 -08:00
Mouse Reeve
8bb7a081c2
Makes follow request button a different color than an unread
...
notification
Fixes #420
2020-12-30 12:12:32 -08:00
Mouse Reeve
e0adb3307b
Gracefully handle unknown status types
...
Fixes #432
2020-12-30 12:05:20 -08:00
Mouse Reeve
5623c268d6
Set application version number in settings
2020-12-30 11:55:13 -08:00
Mouse Reeve
d3161ea361
Send appropriate error codes back with error pages
2020-12-30 11:42:07 -08:00
Mouse Reeve
490591623f
Adds test for search view
2020-12-30 11:37:49 -08:00
Mouse Reeve
e5a914c3c2
Fixes API search causing 500 error
2020-12-30 11:37:26 -08:00
Mouse Reeve
8ffb22291a
Add connector to tested fields on search result
2020-12-30 09:51:37 -08:00
Mouse Reeve
c8d031e311
Tests connector search
2020-12-30 09:48:37 -08:00
Mouse Reeve
6a8353de09
Adds test for SearchResult dataclass
...
also just cleans up the styles in the test file for linting
2020-12-30 09:26:02 -08:00
Mouse Reeve
d7db6d50ba
Log errors in conenctor search
2020-12-30 09:14:07 -08:00
Mouse Reeve
21f67c9e28
Catch error response decoding json in search connector
2020-12-30 09:11:00 -08:00
Renato "Lond" Cerqueira
fb10cb35ad
Add BookWyrm user-agent to http requests
...
This allows other software to identify BookWyrm in calls, as well as
will allow BookWyrm to differentiate between calls done from other
fediverse software and BookWyrm to answer with specific BookWyrm data.
2020-12-30 12:36:50 +01:00
Mouse Reeve
74a25f205b
Validator for username field
2020-12-28 14:14:22 -08:00
Mouse Reeve
7e987fc446
Updates unit tests for new username handling
...
still some failing tho
2020-12-27 17:21:01 -08:00
Mouse Reeve
26c0880fe4
Merge pull request #425 from mouse-reeve/import-error
...
Fixes goodreads import failing on every book
2020-12-27 14:45:31 -08:00
Mouse Reeve
ac261d7b1a
Send connector with search result
...
also fix typo in get_work_from_edition_data function
2020-12-27 14:33:34 -08:00
Anton Strömkvist
97a5364b70
Fix docstring for to_reject_activity
2020-12-27 23:31:14 +01:00
Mouse Reeve
9f74e95b00
stylistic cleanup of import model tests
2020-12-27 13:32:27 -08:00
Mouse Reeve
e89bfdc572
Makes registration user/localname fields more sensible
2020-12-24 11:39:57 -08:00
Mouse Reeve
25d72c5d1e
Save attachments on incoming statuses
2020-12-23 13:38:36 -08:00
Mouse Reeve
365408e86b
Handle reverse serialized fields with no serialized field
2020-12-23 13:33:46 -08:00
Mouse Reeve
a3df0847e1
Fixes celery tasks expanding data not setting many to many fields
2020-12-23 12:45:40 -08:00
Mouse Reeve
e7e90360b3
Adds model import
2020-12-22 10:28:04 -08:00
Mouse Reeve
c34d90051f
Merge pull request #416 from mouse-reeve/book-data-model
...
Remove sync fields and share fields between book and author
2020-12-22 10:25:12 -08:00
Mouse Reeve
9977fed007
Merge pull request #419 from mouse-reeve/close-suggested-post
...
Close suggested post
2020-12-22 10:23:23 -08:00
Mouse Reeve
7c3f2373c7
Adds noopener to link
2020-12-22 10:19:01 -08:00
Mouse Reeve
f2f2f3dd3e
Remove useless if/else on null state radio button
2020-12-22 10:12:41 -08:00
Mouse Reeve
7d1cbb7be1
Adds tests for edit author view
2020-12-22 10:10:36 -08:00
Mouse Reeve
77948f64d2
Merge branch 'main' into book-data-model
2020-12-22 09:29:32 -08:00
Mouse Reeve
6ca8728d7c
Merge pull request #418 from mouse-reeve/edit-user-view
...
Edit user view
2020-12-22 09:28:21 -08:00
Mouse Reeve
25dee8362d
Adds edit author form and stores last edited by
2020-12-22 09:26:55 -08:00
Mouse Reeve
fd2f452b46
Adds title along with alt attributes on images
2020-12-22 08:26:02 -08:00
Mouse Reeve
fdbce5d05e
Adds close button to suggested post window on mobile
2020-12-22 08:21:43 -08:00
Mouse Reeve
db281d5154
Simplifies update user view
2020-12-21 16:19:36 -08:00
Mouse Reeve
fcce1a5a36
Fixes outgoing tests
2020-12-21 15:52:06 -08:00
Mouse Reeve
e6105c6cb0
Simplify edit user function
2020-12-21 14:54:45 -08:00
Mouse Reeve
65e9afd271
Fixes user in outgoing tests
2020-12-21 14:54:27 -08:00
Mouse Reeve
98aa946519
Merge branch 'main' into outgoing-tests
2020-12-21 14:39:39 -08:00
Mouse Reeve
fa1ddf359a
create single outgoing tests file
2020-12-21 14:37:28 -08:00
Mouse Reeve
b4c60c0591
Catches exception thrown when boosting unknown statuses
2020-12-21 14:25:10 -08:00
Mouse Reeve
830aaf9d1c
Add identifier fields to author activity
2020-12-21 13:21:17 -08:00
Mouse Reeve
15c22fa6c9
Merge branch 'main' into book-data-model
2020-12-21 13:16:40 -08:00
Mouse Reeve
1fb728edbd
Merge pull request #415 from mouse-reeve/author_text
...
Generate author_text field dynamically
2020-12-21 13:09:40 -08:00
Mouse Reeve
0de479a89f
Fixes authors set in tests
2020-12-21 13:03:48 -08:00
Mouse Reeve
adfb1e696a
typo in test
2020-12-21 12:49:33 -08:00
Mouse Reeve
bc64ae0504
Fixes assigning authors in test
2020-12-21 12:49:00 -08:00
Mouse Reeve
bcb972ddf7
Merge pull request #414 from mouse-reeve/openlibrary-covers
...
Fixes openlibrary import to prefer editions with covers
2020-12-21 12:45:09 -08:00
Mouse Reeve
862f1d2580
Fixes cover unit test
2020-12-21 12:22:47 -08:00
Mouse Reeve
cfa1a1b42c
Remove sync fields and share fields between book and author
2020-12-21 12:17:18 -08:00
Mouse Reeve
aac264c998
Generate author_text field dynamically
2020-12-21 12:10:42 -08:00
Mouse Reeve
c3d0e8e7f7
Fixes openlibrary import to prefer editions with covers
2020-12-21 11:47:47 -08:00
Mouse Reeve
c4b9b82000
Use author name as a deduplication field
...
I feel iffy about this but openlibrary has hella duplicates
2020-12-20 13:31:11 -08:00
Mouse Reeve
e72c3e11dd
Fixes incoming user test
2020-12-20 12:54:30 -08:00
Mouse Reeve
79973687d5
Updates tests
2020-12-20 12:50:35 -08:00
Mouse Reeve
3597ca460c
Don't let author and book remote ids get overridden
2020-12-20 12:40:20 -08:00
Mouse Reeve
23cbeab4c1
cleans up remote version of quote status
2020-12-20 12:31:39 -08:00
Mouse Reeve
689cc65790
keep saved version of bio and description field as markdown
2020-12-20 12:24:17 -08:00
Mouse Reeve
60738011a2
user's name and bio field are optional
...
get it together, mouse
2020-12-20 12:09:19 -08:00
Mouse Reeve
7f1ac33859
Format html on book descriptions
2020-12-20 12:09:13 -08:00
Mouse Reeve
646df03d81
show books for authors who only have editions
2020-12-20 11:51:17 -08:00
Mouse Reeve
3f95f9257d
Merge pull request #411 from mouse-reeve/markdown-refinement
...
Only parse mardown on outgoing activities
2020-12-20 11:42:06 -08:00
Mouse Reeve
a6efd51bb2
Only parse mardown on outgoing activities
2020-12-20 11:38:13 -08:00
Mouse Reeve
fdb9b71030
Merge pull request #410 from mouse-reeve/atomicity
...
Change transaction atomic to avoid cascading errors
2020-12-20 11:24:37 -08:00
Mouse Reeve
592721ec76
Fixes unit tests
2020-12-19 20:26:29 -08:00
Mouse Reeve
ffa354be7c
html format links and mentions
2020-12-19 20:03:33 -08:00
Mouse Reeve
ef696782ab
Allow markdown in html fields
2020-12-19 18:54:56 -08:00
Mouse Reeve
1204679cbd
Change transaction atomic to avoid cascading errors
2020-12-19 18:34:37 -08:00
Mouse Reeve
c407015a82
Fixes tests
2020-12-19 16:33:56 -08:00
Mouse Reeve
3e61f48da2
Fixes loading more data
2020-12-19 16:16:39 -08:00
Mouse Reeve
d3671d981f
Use author activitypub in OL connector
2020-12-19 15:20:31 -08:00
Mouse Reeve
2128219b05
Use activitypub to_model de-serializer in openlibrary connector
2020-12-19 14:56:03 -08:00
Mouse Reeve
0c6049b81c
Discard remote boosts
2020-12-18 12:38:27 -08:00
Mouse Reeve
606e93fb12
Hacky fix for serializing boost
2020-12-18 11:34:21 -08:00
Mouse Reeve
80de6079fa
User p tags for pure status serializer
2020-12-18 11:00:30 -08:00
Mouse Reeve
40c4f4f5de
Disable boosting private statuses
2020-12-18 09:30:08 -08:00
Mouse Reeve
3649642653
Show all authors
2020-12-17 15:14:52 -08:00
Mouse Reeve
be43e0772c
box around create status on feed page
2020-12-17 14:13:28 -08:00
Mouse Reeve
73f94a76d2
Show subtitle in book page
2020-12-17 14:11:24 -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
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
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
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
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
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
d79a756813
Fixes pure status serializer
2020-12-16 15:59:42 -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
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
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
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
Mouse Reeve
8787599692
tests unfavorite
2020-12-14 13:04:07 -08:00
Mouse Reeve
1bcae45145
Remove notifications related to deleted statuses
2020-12-14 12:54:39 -08:00
Mouse Reeve
d49e49f021
Notify mentioned users
2020-12-14 12:31:11 -08:00
Mouse Reeve
8d27f02a9a
Fixes typo in handle_unfollow
2020-12-14 11:46:31 -08:00
Mouse Reeve
171b8c75ae
use require_POST decorator in inbox
2020-12-14 11:29:22 -08:00
Mouse Reeve
7f6390f722
Test incoming in one file
2020-12-14 10:25:43 -08:00
Mouse Reeve
badc5d0dab
Adds another shelf model test
2020-12-14 10:18:14 -08:00
Mouse Reeve
61041a0dba
Adds migration for privacy field
...
no actual change here, but it's a new field type
2020-12-13 21:11:53 -08:00
Mouse Reeve
b36eaef172
Merge branch 'main' into switch-edition
2020-12-13 21:10:37 -08:00
Mouse Reeve
693dfc42ac
Match privacy level in reply
2020-12-13 16:20:59 -08:00
Mouse Reeve
943d97c0bc
Adds direct messages UI
2020-12-13 16:17:14 -08:00
Mouse Reeve
4fcdbe5299
Fixes clashing test model name
2020-12-13 15:56:30 -08:00
Mouse Reeve
c75f5a1598
Unit tests for privacy model field
2020-12-13 15:50:02 -08:00
Mouse Reeve
5c7ac46116
Fixes foreign key field setting wrong value on activity
2020-12-13 14:53:25 -08:00
Mouse Reeve
44cbf7c07f
Fixes checking privacy when serializing status
2020-12-13 14:35:56 -08:00
Mouse Reeve
b6907f39e9
Creates Privacy field that handles setting to/cc
2020-12-13 13:03:17 -08:00
Mouse Reeve
c470aeb3ce
Create helper function on field for settings values
2020-12-13 12:02:26 -08:00
Mouse Reeve
b67aea22fc
Aggregates (de)serializable model fields
2020-12-13 11:40:46 -08:00
Mouse Reeve
957f0889aa
Clean up models
...
removes unused function and sorts replies correctly
2020-12-13 11:15:42 -08:00
Mouse Reeve
d65657882e
Keep any status that mentions a local user
2020-12-12 21:11:51 -08:00
Mouse Reeve
ffc4cc2018
Fixes create status handler
2020-12-12 20:59:41 -08:00
Mouse Reeve
d3371991e1
Remove deleted util file from migrations
2020-12-12 20:18:03 -08:00
Mouse Reeve
ae435a3165
Removes sqlite support 😢
...
RIP, things have gotten too complicated for this I think
2020-12-12 20:11:23 -08:00
Mouse Reeve
47981dc15e
Show year in time_since when ambiguous
2020-12-12 20:02:14 -08:00
Mouse Reeve
b61a7cccff
Use trimmedwords_html instead of a custom filter
2020-12-12 19:34:51 -08:00
Mouse Reeve
1e08eeb4c2
Renames custom template tags file
2020-12-12 18:25:57 -08:00
Mouse Reeve
2b3daa0227
disable some warnings
2020-12-12 18:13:00 -08:00
Mouse Reeve
1e01e76ac2
removes unneeded imports
2020-12-12 18:06:48 -08:00
Mouse Reeve
aacf5b7ba4
fields for content warnings
2020-12-12 18:00:39 -08:00
Mouse Reeve
823da2e7de
Re-create migration
2020-12-12 16:14:41 -08:00
Mouse Reeve
ae07bbffb7
Merge branch 'main' into logo-default
2020-12-12 16:03:23 -08:00
Mouse Reeve
9b7f0366e7
Adds site settings to initdb
2020-12-12 16:01:43 -08:00
Mouse Reeve
e58ef83f20
Fixes image fields breaking user import
2020-12-12 15:44:17 -08:00
Mouse Reeve
37aaaa97b2
Catch http erros for remote_id
2020-12-12 15:33:07 -08:00
Mouse Reeve
cb28c19abc
Use get_data in resolving remote id
2020-12-12 15:19:57 -08:00
Mouse Reeve
49979fabef
More user serialization tests
2020-12-12 15:00:20 -08:00
Mouse Reeve
eb28708230
Reverts site settings to correct state
...
this was just changed to debug tests
2020-12-12 14:33:51 -08:00
Mouse Reeve
e7f400533e
Fixes missing book and user objects
2020-12-12 14:15:10 -08:00
Mouse Reeve
4ed713662e
Fixes skipping refresh on matched object
2020-12-12 13:59:44 -08:00
Mouse Reeve
804066c523
a couple more assertions for testing fk field
2020-12-12 13:47:51 -08:00
Mouse Reeve
7c43fa1f7c
Adds deduplication fields
2020-12-12 13:39:55 -08:00
Mouse Reeve
31a407d74a
Use name field only for author name
...
It feels janky to remove a more granular name designation, but all these
first/last name fields were algorithmically populated by a dubious
process of splitting the name by a space character. If it makes sense to
have first/last name fields, it should be re-added with some
consideration.
2020-12-12 09:53:21 -08:00
Mouse Reeve
5cf9e24ae5
Fixes name import in openlibrary
2020-12-12 09:43:07 -08:00
Mouse Reeve
a176c6cd35
Creates merge migration
2020-12-12 09:38:05 -08:00
Mouse Reeve
801b6c3a77
Merge branch 'main' into follow-remote-ids
2020-12-12 09:34:54 -08:00
Mouse Reeve
733e0e19ac
Don't show boost and original status in timeline
...
Fixes #381
2020-12-11 17:39:17 -08:00
Mouse Reeve
716068474e
Merge branch 'main' into switch-edition
2020-12-11 16:59:59 -08:00
Mouse Reeve
2d7f8ada61
Functional switch editions button
2020-12-11 16:57:38 -08:00
Mouse Reeve
72eb94315a
Adds shelf info to book page
...
- includes change shelf button
- WIP button for switching to the current edition
2020-12-11 16:40:48 -08:00
Mouse Reeve
e2bc751ee4
Merge pull request #380 from mouse-reeve/site-settings
...
Site settings
2020-12-11 12:50:21 -08:00
Mouse Reeve
117d243577
Expand site settings and add footer
2020-12-11 12:31:02 -08:00
Mouse Reeve
b33ea40da2
Use context processor to include site settings in templates
2020-12-11 12:07:37 -08:00
Mouse Reeve
adbc8c3f4c
Preview statuses in notifications
...
Fixes #363
2020-12-11 11:26:34 -08:00
Mouse Reeve
7204068d2a
Removes unnecessary override of field_from_activity on foreign key
2020-12-09 13:35:36 -08:00
Mouse Reeve
6b9db97ab8
tests set_related_field
2020-12-09 13:11:42 -08:00
Mouse Reeve
ef2a07884f
Throws validation error when remote_id is None
2020-12-09 11:57:29 -08:00
Mouse Reeve
cc42e9d149
Asyncronously set related fields
2020-12-08 09:43:12 -08:00
Mouse Reeve
4d4ee8b8c3
Starts getting reverse fields working for deserialization
...
also fixes the fields on the image model and runs a long overdue
migration
2020-12-07 18:28:42 -08:00
Mouse Reeve
d0c1a68df6
Patches celery call in field tests and fixes tag field
2020-12-07 13:39:05 -08:00
Mouse Reeve
0a576c325c
Fixes deserializing tags of varied types
2020-12-07 13:16:42 -08:00
Mouse Reeve
6817babf3c
adds some tests for to_model
2020-12-07 12:19:15 -08:00
Mouse Reeve
f61fcb1261
Adds tests for resolve_remote_id
2020-12-07 10:46:41 -08:00
Mouse Reeve
74ac8d60f8
Starts adding tests for base_activity
...
includes init and find_existing_by_remote_id
2020-12-07 10:32:31 -08:00
Mouse Reeve
4599df752d
Adds tests for many to many field deserialization
2020-12-07 09:31:12 -08:00
Mouse Reeve
69bb3f2751
Fixes validation error in many to many field deserializer
2020-12-07 09:14:30 -08:00
Mouse Reeve
7a90aa8f6c
Start moving serializing from to_model to fields
2020-12-05 21:33:48 -08:00
Mouse Reeve
8500a7cfe1
Unit test fails in CI but not local
2020-12-05 15:38:12 -08:00
Mouse Reeve
ef1558628f
Fixes transient failure in image field test
2020-12-05 14:48:47 -08:00
Mouse Reeve
05cde33a0c
Adds tests for remaining nontrivial model fields
2020-12-05 14:42:54 -08:00
Mouse Reeve
8a900689d3
Generalizes link format in many to many field
2020-12-04 17:57:14 -08:00
Mouse Reeve
f116ce378d
Fixes foreign key test
2020-12-04 17:42:41 -08:00
Mouse Reeve
aa6e312cfb
Starts adding tests for custom model fields
2020-12-04 17:38:39 -08:00
Mouse Reeve
142a39cf55
Updates remote user when refreshing key
2020-12-04 16:26:07 -08:00
Mouse Reeve
9c9da35d9a
Tests base_model to_activity
2020-12-04 15:14:26 -08:00
Mouse Reeve
800ddf2a6b
fixes inconsistency in to_undo activity helper
2020-12-04 11:53:50 -08:00
Mouse Reeve
39307ce1cd
Fixes remote_id on Update activities
2020-12-04 11:48:34 -08:00
Mouse Reeve
2e4aff90a3
Fixes signing Create activities
...
and some tests for the base_model
2020-12-04 11:29:38 -08:00
Mouse Reeve
9989641f4c
fixes bug in update user public key
2020-12-04 09:46:40 -08:00
Mouse Reeve
1ae3830ae4
Removes test state of signatures
2020-12-04 08:42:34 -08:00
Mouse Reeve
de6147ecfa
Ignore many to many activitypub serialization of non-lists
2020-12-04 08:29:54 -08:00
Mouse Reeve
ae8d0e1974
Adds sort order for outbox
2020-12-04 08:07:47 -08:00
Mouse Reeve
d92fb53333
Handle absent remote ids
...
it oughtent get to this state, but...
2020-12-03 17:23:08 -08:00
Mouse Reeve
646ced80ce
Test fixes
2020-12-03 17:18:23 -08:00
Mouse Reeve
bbbfbe721e
Removes update user test
2020-12-03 16:23:13 -08:00
Mouse Reeve
27c45c0584
Catch json decode error in loading data
2020-12-03 13:42:02 -08:00
Mouse Reeve
b1640c5dc9
Sets mocks up for incoming tests
2020-12-03 13:35:51 -08:00
Mouse Reeve
9c6db1cc0e
Updates connector tests
2020-12-03 13:22:50 -08:00
Mouse Reeve
de7e64932a
Fixes name of book field on status
2020-12-03 13:15:05 -08:00
Mouse Reeve
3a75127301
Removes half-baked field serializers
2020-12-03 13:00:04 -08:00
Mouse Reeve
e87236d78f
Remove unnecessary user create action
2020-12-03 12:57:44 -08:00
Mouse Reeve
6d137ccada
mock celery task in test signing
2020-12-03 12:50:21 -08:00
Mouse Reeve
77a1fc26f1
Save key pair when creating new User
2020-12-03 12:45:01 -08:00
Mouse Reeve
a85043b351
Updates to_model to use fields
2020-12-03 12:35:57 -08:00
Mouse Reeve
8fb8e93e37
Merge pull request #375 from mouse-reeve/username-regex
...
Allow usernames with dots
2020-12-02 15:27:03 -08:00
Mouse Reeve
2cf73188f2
fixes localname regex
2020-12-02 15:24:43 -08:00
Mouse Reeve
b5e92fe65e
Allow usernames with dots
2020-12-02 15:21:15 -08:00
Mouse Reeve
d7e9a00cf1
Fixes password reset flow
2020-12-02 15:19:29 -08:00
Mouse Reeve
1610d81ce6
fixes some of the signing test issues
2020-11-30 19:53:42 -08:00
Mouse Reeve
fee5846aa8
Fixes generating new key paris for user
...
and the broadcast test
2020-11-30 19:33:50 -08:00
Mouse Reeve
eb6206252d
cleans up ordered collection mixin
2020-11-30 19:24:31 -08:00
Mouse Reeve
1ec2f20486
avoid naming clash is to_activity for field vs model
2020-11-30 14:54:45 -08:00
Mouse Reeve
77aead722d
serialize book and author models
2020-11-30 14:40:26 -08:00
Mouse Reeve
3966c84e08
Updates status model and serializer
2020-11-30 14:24:31 -08:00
Mouse Reeve
8bc0a57bd4
Remove outdated user fields
2020-11-30 11:40:04 -08:00
Mouse Reeve
74a58e5267
Use custom model fields in user model
2020-11-30 10:32:29 -08:00
Mouse Reeve
96563598bf
mock celery tasks for broadcast tests
2020-11-29 10:13:30 -08:00
Mouse Reeve
205fa0d465
set user's remote server in a celery task
2020-11-29 10:08:19 -08:00
Mouse Reeve
9ddd60ce16
Fixes broadcast tests
2020-11-29 09:40:15 -08:00
Mouse Reeve
e9be31e9c1
merge migrations
2020-11-28 19:06:40 -08:00
Mouse Reeve
d8fdc66450
removes outdated update book code
2020-11-28 19:03:37 -08:00
Mouse Reeve
c9433a3c7e
Simplify bookwyrm connector abstract
2020-11-28 18:56:28 -08:00
Mouse Reeve
9d84346d3c
remove need for get_or_create_book
2020-11-28 18:46:50 -08:00
Mouse Reeve
34e8fb3e5c
style fix and removing stray print statement
2020-11-28 18:28:09 -08:00
Mouse Reeve
1789b091d6
not all that better way to distinguish add book to shelf vs tag
2020-11-28 18:23:34 -08:00
Mouse Reeve
b4fe9f160f
Correctly look up books by remote/origin id
2020-11-28 18:11:52 -08:00
Mouse Reeve
dfd730757d
handle unset default editions
2020-11-28 17:42:09 -08:00
Mouse Reeve
72c7829bab
Preserve remote_id syntax for authors and books
2020-11-28 17:29:03 -08:00
Mouse Reeve
7ed2e310c0
User origin ids for books and authors
2020-11-28 13:40:09 -08:00
Mouse Reeve
1483b0b62c
Merge branch 'main' into follow-remote-ids
2020-11-28 13:14:53 -08:00
Mouse Reeve
0a8ef98854
use localized remote_ids for books
2020-11-28 13:14:18 -08:00
Mouse Reeve
421a13fda0
automatically load authors and editions
2020-11-28 13:00:04 -08:00
Mouse Reeve
e99394e6f7
User serializer to create follow request
2020-11-28 12:25:53 -08:00
Mouse Reeve
76ce20a5e0
Fixes tests
2020-11-28 11:52:00 -08:00
Mouse Reeve
b0202eb8e8
Remove special remote user handling code
...
also fixes date parsing
2020-11-28 11:48:17 -08:00
Joel Bradshaw
7fadbeeb55
Merge branch 'main' into progress_update
2020-11-28 11:06:01 -08:00
Mouse Reeve
fd7e476c9b
refactors tag model to fit ordered collection structure
2020-11-28 11:04:54 -08:00
Mouse Reeve
a93b5cf5bc
Use remote_id resolver to load books, user
2020-11-28 10:18:24 -08:00
Mouse Reeve
e0fec9f570
fixes incorrect decorators
2020-11-28 09:17:24 -08:00
Mouse Reeve
81bdd2b3f1
Merge branch 'main' into follow-remote-ids
2020-11-28 08:40:37 -08:00
Mouse Reeve
1c8a0c942a
Merge branch 'main' into quick-add-description
2020-11-28 08:36:46 -08:00
Mouse Reeve
b2ca67a67c
Make adding a description require edit perms
2020-11-28 08:29:55 -08:00
Mouse Reeve
9c33d0ebfa
use require_GET decorator
2020-11-28 08:22:25 -08:00
Mouse Reeve
78fa949237
Inline form to add description to book
2020-11-28 07:55:31 -08:00
Joel Bradshaw
a951f20ff6
Add a couple forgotten files
2020-11-28 00:36:01 -08:00
Joel Bradshaw
500f05266a
Add option for progress percentage
...
And rework display on book page as well
2020-11-28 00:07:04 -08:00
Mouse Reeve
ebb82287c2
First pass at recursively resolving foreign keys
2020-11-27 22:10:38 -08:00
Mouse Reeve
5638597112
Fixes errors caught in tests
2020-11-27 20:27:56 -08:00
Mouse Reeve
86cbb3edbd
Merge branch 'main' into activitypub-cleanup
2020-11-27 20:13:32 -08:00
Mouse Reeve
4626d94ab9
handle image attachments recursively
2020-11-27 20:11:46 -08:00
Mouse Reeve
2480690378
Automatically handle image fields in model serializer
2020-11-27 18:26:07 -08:00
Joel Bradshaw
9ed7d23000
Test updating a progress
...
Also remove spurious whitespace change
2020-11-27 18:19:12 -08:00
Joel Bradshaw
6455cc7fe9
Add initial tests and some fixes
...
Make timezones aware, and create a progress update if we can upon
starting a readthrough
2020-11-27 18:16:13 -08:00
Mouse Reeve
4ae785a7f7
move image activity to its own file
2020-11-27 17:59:46 -08:00
Mouse Reeve
624ff71a11
Makes attachment Images a serializable class
2020-11-27 17:20:01 -08:00
Joel Bradshaw
3cb28273c4
Merge branch 'main' into progress_update
2020-11-27 17:05:54 -08:00
Joel Bradshaw
d8b2afff3d
Replace naive datetimes with aware ones
2020-11-27 16:35:03 -08:00
Joel Bradshaw
5f2ac6d961
Rename fr_* to bw_*
2020-11-27 16:12:47 -08:00
Joel Bradshaw
3b0b8f16f6
Merge migration branches
...
Also add $@ to bw-dev migrations, and factor the shift 1 out
2020-11-27 16:08:04 -08:00
Joel Bradshaw
85026b837c
Merge branch 'main' into progress_update
2020-11-27 15:52:55 -08:00
Mouse Reeve
69a6644011
Corrects activitypub fields to camelcase in Book
2020-11-27 15:34:47 -08:00
Mouse Reeve
7b6035898b
Serialize activitypub authors from data in connector
2020-11-27 14:54:08 -08:00
Mouse Reeve
f593970332
Merge branch 'main' into refactor-bookwyrm-connector
2020-11-27 14:26:02 -08:00
Mouse Reeve
9e48328e9e
Mocks broadcast task for outgoing shelve tests
2020-11-27 14:18:45 -08:00
Mouse Reeve
4ec557fc5d
fixes unit tests for incoming and outgoing follows
2020-11-27 14:15:13 -08:00
Mouse Reeve
f173d674ac
Mock fetch_user function which makes http request
2020-11-27 13:53:38 -08:00
Mouse Reeve
a8f3ddec05
Trying to avoid issues from execusing http requests
2020-11-27 13:39:33 -08:00
Mouse Reeve
829615cdd7
Fixes celery mocks on more signature unit tests
2020-11-27 13:18:10 -08:00
Mouse Reeve
73279d65d7
Fix test remote signer and comment out failing tests
2020-11-27 13:08:01 -08:00
Mouse Reeve
48ab993861
Mocks celery task for follow request
2020-11-27 13:02:26 -08:00
Mouse Reeve
0c01af4042
Another nondeterministic list order problem
2020-11-27 12:42:01 -08:00
Mouse Reeve
44a0ef3b0b
Fixes nondeterministic order of query causing test failure
2020-11-27 12:25:01 -08:00
Mouse Reeve
257a29dcfd
Comment out failing tests
...
Obviously this is not a SOLUTION, it's an intermediary step in resolving
the redis dependency issues. this PR isn't mergable until the tests are
restored.
2020-11-27 11:53:30 -08:00
Joel Bradshaw
97e49c4bd2
Undo stray css edit
2020-11-25 23:12:05 -08:00
Joel Bradshaw
692aa08364
Remove unneeded class, wrap line
2020-11-25 23:11:30 -08:00
Joel Bradshaw
64fb88cc10
ProgressUpdate doesn't need its own date field
...
Just use the base model's created_date
2020-11-25 23:03:32 -08:00
Joel Bradshaw
090cf2aea7
Make inline progress form actually work
2020-11-25 23:03:27 -08:00
Joel Bradshaw
e7c0368168
PR feedback
2020-11-25 22:36:55 -08:00
Mouse Reeve
9b79eb5fc3
Removes outdated test of bookwyrm connector updater
2020-11-25 11:44:19 -08:00
Mouse Reeve
4f6ce0307d
fixes import in abstract connector unit test
2020-11-25 11:24:36 -08:00
Mouse Reeve
0ec40ae748
Merge branch 'main' into refactor-bookwyrm-connector
2020-11-25 11:21:13 -08:00
Mouse Reeve
aed360d07e
Fixes serializer handling default dataclass fields
2020-11-25 11:16:01 -08:00
Mouse Reeve
9b57cfd331
Fixes default lists on activitypub dataclasses
2020-11-25 10:45:39 -08:00
Mouse Reeve
641ac22786
remove outdated tests
2020-11-24 16:26:28 -08:00
Mouse Reeve
847014720e
Refactors bookwyrm connector to use activitypub serializer
2020-11-24 16:05:00 -08:00
Mouse Reeve
7b4847852a
Merge migrations manually
2020-11-24 13:42:47 -08:00
Mouse Reeve
3dc0fc7e8f
Merge branch 'main' into edit-books-erros
2020-11-24 13:40:53 -08:00
Mouse Reeve
1fd498c306
Display error messages in edit book form
2020-11-24 13:37:35 -08:00
Mouse Reeve
9bbedc5d9a
Fixes field causing form invalidation when editing books
2020-11-24 13:25:58 -08:00
Mouse Reeve
6cc1e241fe
display images at a reasonable size
2020-11-24 12:07:00 -08:00
Mouse Reeve
ff5a0f7bc2
Adds alt text to status images
2020-11-24 11:44:13 -08:00
Mouse Reeve
45a0bd79fd
Very basic image display
2020-11-24 11:28:17 -08:00
Mouse Reeve
ad7ce6595b
Receive and save incoming images
2020-11-24 11:25:07 -08:00
Mouse Reeve
88e4705717
Use attachment database table
2020-11-23 20:42:05 -08:00
Mouse Reeve
17fca8181b
Simplify user creation code
2020-11-23 13:50:14 -08:00
Mouse Reeve
e2debd855c
Convert activitypub Image into model ImageField
2020-11-23 13:43:46 -08:00
Mouse Reeve
5526b4773e
Formatter for converting model images to AP Images
...
Replaces reduntant properties on user and book models
2020-11-23 13:07:26 -08:00
Mouse Reeve
dab0aeffb2
Adds image attachment field to status model
2020-11-23 12:48:41 -08:00
Mouse Reeve
56638f79cf
Merge pull request #359 from mouse-reeve/activity-tags
...
Serialize and deserialize activitypub "Tags" on statuses
2020-11-22 09:35:19 -08:00
Mouse Reeve
5e34d136fd
Merge pull request #361 from cincodenada/fix-navbar
...
Fix navbar on mobile, make search an addon
2020-11-20 21:51:33 -08:00
Joel Bradshaw
f57d9ee45d
Rework to use bulma better
2020-11-20 21:45:12 -08:00
Joel Bradshaw
df2dc5a8a1
Remove placebo class
...
is-third-mobile was the wrong class, it turns out just column is what
was making it work like I wanted it to
2020-11-20 21:27:50 -08:00
Joel Bradshaw
8945e70e42
Fix navbar on mobile, make search an addon
...
In reading up on Bulma I found the has-addons option which is a nice
touch, I think
2020-11-20 21:19:26 -08:00
Mouse Reeve
56b6fb9c97
Merge pull request #360 from mouse-reeve/shelve_buttons
...
Fixes unset active shelf in shelve button pulldown
2020-11-20 21:18:28 -08:00
Mouse Reeve
448efff648
Fixes unset active shelf in shelve button pulldown
2020-11-20 10:05:37 -08:00
Mouse Reeve
9a55dba315
Special handling for setting many to many fields in serializer
2020-11-20 09:59:55 -08:00
Mouse Reeve
72b4c150f6
(De)serializers for tag fields
2020-11-20 09:28:54 -08:00
Mouse Reeve
73e41d568e
Serialize model user and book tags to activitypub
2020-11-20 08:14:16 -08:00
Joel Bradshaw
a579ea52f4
Add initial inline progress update
...
Doesn't work yet
2020-11-19 19:38:38 -08:00
Joel Bradshaw
1d0c0ae5c5
Add rename_app command and use it
...
This allows users to migrate from a pre-rename database without
resetting their database, hopefully
2020-11-19 13:49:53 -08:00
Joel Bradshaw
ff7d87b1c4
Make progress updates toggle-able
...
Also move into their own section
2020-11-18 19:05:52 -08:00
Mouse Reeve
6553e5df34
Makes sure pages have h1 header heirarchy
2020-11-18 12:31:53 -08:00
Joel Bradshaw
c9b2b4efac
Add migration for ProgressUpdate
2020-11-16 23:54:03 -08:00
Joel Bradshaw
f524f0cd4d
Add basic view logic for testing
2020-11-16 23:53:46 -08:00
Joel Bradshaw
00b8608a50
Make ProgressUpdate attached to a readthrough
2020-11-16 23:53:17 -08:00
Joel Bradshaw
13229ea937
Add progress updates as their own table
2020-11-16 23:29:32 -08:00
Joel Bradshaw
7ffc3114a6
Add display and form for existing pages_read
...
Commented out the new update type because it was breaking and I don't
need it quite yet
2020-11-16 22:47:55 -08:00
Joel Bradshaw
3beebe4727
Add initial draft of progress update
2020-11-16 22:33:04 -08:00
Mouse Reeve
680211cff5
refactors re-shelve button dropdown to be accessible
...
still looks janky as heck, but fixes #350
2020-11-16 16:34:26 -08:00
Mouse Reeve
699a661f00
Remove broken add book link
2020-11-13 12:18:13 -08:00
Mouse Reeve
28e1c9525c
tweaks search rankings for better results
2020-11-13 11:03:39 -08:00
Mouse Reeve
6300c37a4e
Select all checkbox
2020-11-13 10:14:24 -08:00
Mouse Reeve
86504989b4
fixes import matching with local books
2020-11-13 09:59:57 -08:00
Mouse Reeve
e3a803b907
Allow import retry
2020-11-13 09:02:41 -08:00
Mouse Reeve
083b576bc4
fixes broken activity serializer error import
2020-11-13 07:34:37 -08:00
Mouse Reeve
211ac4241b
Merge pull request #348 from mouse-reeve/incoming-errors
...
Incoming errors
2020-11-12 14:38:57 -08:00
Mouse Reeve
1ad347ffdb
Merge pull request #346 from mouse-reeve/trim-text
...
Collapse long review text
2020-11-12 14:38:43 -08:00
Mouse Reeve
1f11ffd646
Uses task.ready for checking if the job is running
2020-11-12 14:11:39 -08:00
Mouse Reeve
932b4f8b81
Small fix in goodreads import error handling
2020-11-12 14:01:17 -08:00
Mouse Reeve
032ce8efba
Show failed books
2020-11-12 13:52:57 -08:00
Mouse Reeve
799496bb86
Move past all book loading exceptions during import
2020-11-12 13:33:12 -08:00
Mouse Reeve
74236c4810
Handle errors tryingt o load covers from instances
2020-11-12 13:20:32 -08:00
Mouse Reeve
0a2d762d3b
Fixes error state when there are author duplicates
...
there shouldn't be, but it shouldn't crash a goodreads import either
2020-11-12 13:16:26 -08:00
Mouse Reeve
ffeed6047e
Fixes reporting import task status
2020-11-12 13:12:08 -08:00
Mouse Reeve
123fe5e769
Error handling in remote user
2020-11-12 12:27:49 -08:00
Mouse Reeve
4ccf1c4818
Small html style changes on import pages
2020-11-12 12:22:06 -08:00
Mouse Reeve
c0bc4f3903
Catch error trying to get status id in delete
2020-11-12 12:02:43 -08:00
Mouse Reeve
648e7a7581
Special error for catching activitypub serialization issues
2020-11-12 11:59:34 -08:00
Mouse Reeve
2f0b91d843
Merge pull request #343 from mouse-reeve/readthrough-ui
...
Make readthrough edit/delete toggle a button
2020-11-12 11:41:34 -08:00
Mouse Reeve
23ef1e8b7d
Collapse long review text
2020-11-12 11:40:20 -08:00
Mouse Reeve
44b798b423
Puts reply form below button that shows it
...
still think this is janky.
2020-11-11 18:32:52 -08:00
Mouse Reeve
801c2cdad2
Make readthrough edit/delete toggle a button
2020-11-11 16:47:11 -08:00
Mouse Reeve
ad948e7313
Remove more info box when it's not used
2020-11-11 11:52:14 -08:00
Mouse Reeve
c1567826ca
Paginate reviews page
2020-11-11 10:50:51 -08:00
Mouse Reeve
90d0d721dd
Paginates user activity feed
2020-11-11 10:43:47 -08:00
Mouse Reeve
91a32c014e
Uses django paginator for feed page
2020-11-11 10:35:34 -08:00
Mouse Reeve
1d0b7fa64f
Proper privacy on user page shelf previews
2020-11-11 10:14:04 -08:00
Mouse Reeve
c08be903b1
Merge pull request #338 from mouse-reeve/code-cleanup
...
Code cleanup
2020-11-10 22:29:30 -08:00
Mouse Reeve
56850b9574
Merge pull request #336 from mouse-reeve/user-shelves
...
User-created shelves
2020-11-10 22:06:40 -08:00
Mouse Reeve
1e7b5f7981
remove unused forms
...
also some more get_object_or_404s
2020-11-10 22:06:06 -08:00
Mouse Reeve
de7de3d3d5
json view for tags page
2020-11-10 21:50:05 -08:00
Mouse Reeve
c3d2018411
Unused forms
2020-11-10 21:47:28 -08:00
Mouse Reeve
d71b451eef
More model ids in urls
2020-11-10 21:45:22 -08:00
Mouse Reeve
4297e8647d
put status id in path for delete-status
2020-11-10 21:39:24 -08:00
Mouse Reeve
7f9cc31040
consistent style for urls
2020-11-10 21:34:26 -08:00
Mouse Reeve
8ae05c1350
Use get_object_or_404
2020-11-10 21:13:13 -08:00
Mouse Reeve
a6796275b8
Fixes duplicate ids
2020-11-10 20:50:46 -08:00
Mouse Reeve
60e699efeb
Make shelves delete-able
2020-11-10 20:33:46 -08:00
Mouse Reeve
ee59c64a10
Edit shelf
2020-11-10 20:11:21 -08:00
Mouse Reeve
c16047d0bc
Control display of shelves based on privacy settings
2020-11-10 16:43:52 -08:00
Mouse Reeve
176257eb85
SHow privacy icon on shelves
2020-11-10 16:18:48 -08:00
Mouse Reeve
81d09a3d1b
Fixes aria that should be role
2020-11-10 14:57:44 -08:00
Mouse Reeve
0e13616e73
lowercase shelf identifier
2020-11-10 14:56:53 -08:00
Mouse Reeve
408ca6609c
Let users create shelves
2020-11-10 14:52:04 -08:00
Mouse Reeve
c3fe8e041a
Disentangles user pages
2020-11-10 14:07:12 -08:00
Mouse Reeve
4ee2fab58f
Refactors menu for re-shelving a book in shelf page
2020-11-10 13:40:42 -08:00
Mouse Reeve
ab0f9230c7
Adds privacy setting to shelves
2020-11-10 13:39:58 -08:00
Mouse Reeve
a5a1af418c
Adds ui for editing and adding shelves
2020-11-10 13:39:37 -08:00
Mouse Reeve
de744483ec
Merge pull request #334 from mouse-reeve/comment-form
...
More interactive clickable elements
2020-11-10 12:48:45 -08:00