591c4d9b75  
						 
						
							
							
								
								
								Fixes numbering on book lists  
							
							 
							
							
							
						 
						
							2022-07-09 13:33:58 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	85f811022f 
 
						 
						
							
							
								
								
								Merge pull request  #2210  from bookwyrm-social/notification-cw  
							
							 
							
							... 
							
							
							
							Show content warning in notification status previews 
							
						 
						
							2022-07-09 13:29:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	be5e1be5f6  
						 
						
							
							
								
								
								Use content warnings in notifications  
							
							 
							
							
							
						 
						
							2022-07-09 13:12:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	11a0c1691b  
						 
						
							
							
								
								
								Move status_preview snippet to notifications directory  
							
							 
							
							... 
							
							
							
							That's the only place it's used, always nice to de-clutter the snippets
directory 
							
						 
						
							2022-07-09 12:40:21 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f92b4548b1  
						 
						
							
							
								
								
								Fixes get_or_create error when multiple matching notifications exist  
							
							 
							
							
							
						 
						
							2022-07-09 12:30:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c092d952bd  
						 
						
							
							
								
								
								Adds test to catch notification error  
							
							 
							
							
							
						 
						
							2022-07-09 12:29:29 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a7553c0b8c  
						 
						
							
							
								
								
								Return HttpResponse instead of redirects for AJAX follows  
							
							 
							
							... 
							
							
							
							This is more efficient, and most follow activities are ajax 
							
						 
						
							2022-07-09 12:20:18 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	923495e454  
						 
						
							
							
								
								
								More accurate button display  
							
							 
							
							... 
							
							
							
							Now, a follow button will show as pending even if the user doesn't
manually approve followers, if that's the state the request is in. 
							
						 
						
							2022-07-09 12:19:28 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ab5e4128e6  
						 
						
							
							
								
								
								Merge branch 'main' into tour  
							
							 
							
							... 
							
							
							
							Also fixes conflict 
							
						 
						
							2022-07-09 20:54:48 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8fbd634ee8  
						 
						
							
							
								
								
								add id to dm box  
							
							 
							
							
							
						 
						
							2022-07-09 20:52:03 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	48bcb85e24  
						 
						
							
							
								
								
								resolve conflict  
							
							 
							
							
							
						 
						
							2022-07-09 20:12:46 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	02c6932409  
						 
						
							
							
								
								
								lint migration file  
							
							 
							
							
							
						 
						
							2022-07-09 20:10:28 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	245120e7ca  
						 
						
							
							
								
								
								resolve git conflict with main branch  
							
							 
							
							
							
						 
						
							2022-07-09 20:08:23 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	baad1314d8  
						 
						
							
							
								
								
								default existing users to no tour  
							
							 
							
							
							
						 
						
							2022-07-09 19:51:05 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	495bac2b50  
						 
						
							
							
								
								
								transfer tour from group to DM  
							
							 
							
							
							
						 
						
							2022-07-09 19:38:44 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2f2ab5c24a  
						 
						
							
							
								
								
								add DM tour  
							
							 
							
							... 
							
							
							
							- rearrange script includes on feed pages
- add DM tour to close 
							
						 
						
							2022-07-09 19:27:42 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	791847d75e  
						 
						
							
							
								
								
								add timeline info to home tour  
							
							 
							
							
							
						 
						
							2022-07-09 19:27:12 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c68c7216f3  
						 
						
							
							
								
								
								minor wording updates for tour  
							
							 
							
							
							
						 
						
							2022-07-09 17:49:56 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6df09eb5d7  
						 
						
							
							
								
								
								update user groups tour  
							
							 
							
							... 
							
							
							
							- use strong instead of code
- clean up templates
- use notification styling for actions
- update wording 
							
						 
						
							2022-07-09 17:39:22 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	07a882692c  
						 
						
							
							
								
								
								update lists tour  
							
							 
							
							... 
							
							
							
							- cleaner templates
- send user directly to their Groups page at end of section 
							
						 
						
							2022-07-09 17:31:04 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d67c6dc92b  
						 
						
							
							
								
								
								user books tour update  
							
							 
							
							... 
							
							
							
							- add element highlights
- fix template text
- replace code with strong 
							
						 
						
							2022-07-09 16:56:07 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e85e4a5467  
						 
						
							
							
								
								
								update book page tour  
							
							 
							
							... 
							
							
							
							- styling for next action
- replace code with strong
- clean up wording
- make translation templates cleaner 
							
						 
						
							2022-07-09 15:30:45 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	bb85d3cdb2  
						 
						
							
							
								
								
								update search tour  
							
							 
							
							... 
							
							
							
							- action styling
- code to strong 
							
						 
						
							2022-07-09 15:16:27 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	bb4b1a14fd  
						 
						
							
							
								
								
								update user profile tour styles  
							
							 
							
							
							
						 
						
							2022-07-09 15:10:52 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5472cdcad7  
						 
						
							
							
								
								
								update homepage tour  
							
							 
							
							... 
							
							
							
							- add highlights to some elements
- consolidate message text for easier translation
- emphasise action with notification style 
							
						 
						
							2022-07-09 15:00:30 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b36968166e  
						 
						
							
							
								
								
								fix import message  
							
							 
							
							... 
							
							
							
							import files don't import shelves, only books. 
							
						 
						
							2022-07-09 14:47:31 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3c317d509d  
						 
						
							
							
								
								
								fix sass styles import bug  
							
							 
							
							... 
							
							
							
							Using @import caused styles to double up on elements, in some cases preventing the correct override behaviour.
Usint @use instead fixes this, and is recommended by Sass for exactly this reason. 
							
						 
						
							2022-07-09 14:42:42 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b41c826a0d  
						 
						
							
							
								
								
								custom style for highlighting tour anchorpoints  
							
							 
							
							
							
						 
						
							2022-07-09 14:29:04 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	68308aaa79  
						 
						
							
							
								
								
								update tour colour scheme  
							
							 
							
							... 
							
							
							
							- use info instead of default
- increase box shadow
- arrows at top should match header colour 
							
						 
						
							2022-07-09 12:35:06 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	56b91f4c6d  
						 
						
							
							
								
								
								fix incorrect tour step header  
							
							 
							
							
							
						 
						
							2022-07-09 10:37:08 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4d843b583d  
						 
						
							
							
								
								
								move shelve button tour id to prevent duplicates  
							
							 
							
							
							
						 
						
							2022-07-09 10:32:04 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	389da79af4  
						 
						
							
							
								
								
								fix missing hyphen  
							
							 
							
							
							
						 
						
							2022-07-09 10:31:40 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	53a89f69e7  
						 
						
							
							
								
								
								guided tour only for request.user  
							
							 
							
							
							
						 
						
							2022-07-09 10:23:09 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3365bb6d35  
						 
						
							
							
								
								
								show_guided_tour is not added to AP serialisation  
							
							 
							
							
							
						 
						
							2022-07-09 10:17:10 +10:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	bd6774fca8 
 
						 
						
							
							
								
								
								Merge pull request  #2202  from bookwyrm-social/settings-warnings  
							
							 
							
							... 
							
							
							
							New and improved warnings on the admin dashboard 
							
						 
						
							2022-07-08 15:39:23 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	147d092eac  
						 
						
							
							
								
								
								Removes line breaks from warning links  
							
							 
							
							
							
						 
						
							2022-07-08 15:29:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	36553ef2a9  
						 
						
							
							
								
								
								Suppress protected-access warning on admin dashboard  
							
							 
							
							
							
						 
						
							2022-07-08 12:22:23 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d0e986c283  
						 
						
							
							
								
								
								Hide DMs from profile page  
							
							 
							
							
							
						 
						
							2022-07-08 12:19:51 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	441fef9e86  
						 
						
							
							
								
								
								Use javascript to send DMs  
							
							 
							
							... 
							
							
							
							This fixes the draft cache issue and also the weird redirects 
							
						 
						
							2022-07-08 12:11:00 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ba7ae46c75  
						 
						
							
							
								
								
								Adds warnings for missing privacy policies and codes of conduct  
							
							 
							
							
							
						 
						
							2022-07-08 11:59:21 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4a2e191d92  
						 
						
							
							
								
								
								Refactors dashboard warnings  
							
							 
							
							... 
							
							
							
							This cleans up the display so that they don't get all squished when a
bunch are present, and creates a layout to make them more DRY 
							
						 
						
							2022-07-08 11:38:27 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b62bb157c0  
						 
						
							
							
								
								
								Fixes links to documentation pages  
							
							 
							
							
							
						 
						
							2022-07-08 09:44:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	65f55fe324  
						 
						
							
							
								
								
								Fixes link to remote instance user list  
							
							 
							
							
							
						 
						
							2022-07-08 09:26:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	be86fef42d  
						 
						
							
							
								
								
								Move deleted users to a separate tab  
							
							 
							
							... 
							
							
							
							Since there's nothing to be done with them, they get their own tab. 
							
						 
						
							2022-07-08 09:21:48 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5bb001e15f  
						 
						
							
							
								
								
								Show avatars in user admin view  
							
							 
							
							... 
							
							
							
							I find this helpful as a rough hueristic for how engaged a user is -- if
they've never added an avatar, it's often the case that they never
really got further in to using the app than just registering a username.
Also, on one occassion, a user had an avatar that violated the instance
ToS, which would have been handy to see at a glance in this list. 
							
						 
						
							2022-07-08 09:10:29 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a972c58f3b  
						 
						
							
							
								
								
								Fixes errors in permissions  
							
							 
							
							
							
						 
						
							2022-07-07 14:01:51 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	948f2964ac  
						 
						
							
							
								
								
								Updates admin tests to use perms instead of superuser  
							
							 
							
							... 
							
							
							
							Superuser overrides all perms, so this was hiding simple typo-related
bugs in the permissions system 
							
						 
						
							2022-07-07 14:01:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	742d97b177  
						 
						
							
							
								
								
								Python formatting  
							
							 
							
							
							
						 
						
							2022-07-07 12:23:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	76c466ee45  
						 
						
							
							
								
								
								Fixes cache invalidation for editions  
							
							 
							
							... 
							
							
							
							Your reading status is shown across all editions of a work, so when you
change your status in relation to the edition you're currently reading,
it needs to invalidate the cached values for all editions of that work. 
							
						 
						
							2022-07-07 12:21:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	076ba6f0ae  
						 
						
							
							
								
								
								Dramatically reduce cache duration for reading statuses  
							
							 
							
							... 
							
							
							
							I originally set this for a very long timeout because this value should
be invalidated when it needs to be by the models, and if that worked
perfectly, this would reduce queries dramatically for books that show up
in ones feed frequently, but don't change status (for example, a book
you read and your friend is currently posting about). In practice, of
course, there are errors in invalidating this cache which leave this
value appearing extremely broken and it's next to impossible to fix.
This change makes each of the timeouts related to reading an hour, which
will still give performance benefit when browsing the site (especially
for loading the same book multiple times on a page), but resolve
naturally if the cache gets into a bad state. 
							
						 
						
							2022-07-07 12:06:06 -07:00