OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ad144922fb 
							
						 
					 
					
						
						
							
							Merge with master  
						
						 
						
						
						
					 
					
						2020-08-22 09:23:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							94ad93ebd7 
							
						 
					 
					
						
						
							
							Added series like custom columns  #1501  
						
						 
						
						
						
					 
					
						2020-08-11 18:56:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a1d105fae 
							
						 
					 
					
						
						
							
							Fix   #1538  (Floating point numbers showing 2 decimals on details page  
						
						 
						
						
						
					 
					
						2020-07-23 19:31:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f8139f3198 
							
						 
					 
					
						
						
							
							Store last selected view for sidebar (not for categories, series, publishers, ..)  
						
						 
						
						... 
						
						
						
						Started making search paged 
						
					 
					
						2020-07-11 12:09:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f80c67828b 
							
						 
					 
					
						
						
							
							Fix   #1500  (Custom ratings of increment 0.5 are allowed)  
						
						 
						
						
						
					 
					
						2020-07-05 14:35:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4306b1d6 
							
						 
					 
					
						
						
							
							UI improvements (same colors of buttons, etc.)  
						
						 
						
						... 
						
						
						
						Changed Editable default value 
						
					 
					
						2020-06-09 20:46:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4516cc0d65 
							
						 
					 
					
						
						
							
							Listen button only visible if user has read permissions  
						
						 
						
						... 
						
						
						
						Audioformat fix
Table edit functions only available if user has edit rights 
						
					 
					
						2020-06-08 21:57:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							308784c601 
							
						 
					 
					
						
						
							
							Hide listen button if user has no read/listen permissions  
						
						 
						
						
						
					 
					
						2020-06-08 21:56:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							827b0c6e50 
							
						 
					 
					
						
						
							
							Changed pubdate to timestamp  
						
						 
						
						
						
					 
					
						2020-06-06 09:52:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eef2112e1e 
							
						 
					 
					
						
						
							
							#1430  (changed color of rating stars)  
						
						 
						
						
						
					 
					
						2020-06-03 20:14:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce0fab8d2f 
							
						 
					 
					
						
						
							
							Fix duplicate shelf names in "search"  
						
						 
						
						
						
					 
					
						2020-05-12 14:37:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0a02caad04 
							
						 
					 
					
						
						
							
							Improvements  
						
						 
						
						
						
					 
					
						2020-05-09 11:01:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							456550a943 
							
						 
					 
					
						
						
							
							Bugfix view shelfs on detiled page  
						
						 
						
						... 
						
						
						
						bugfix datetime in archive mode 
						
					 
					
						2020-04-26 11:34:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7bb5afa585 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo/shelves' into Develop  
						
						 
						
						
						
					 
					
						2020-04-18 21:12:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5864637f1c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-04-04 06:22:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bab14a1fbf 
							
						 
					 
					
						
						
							
							Update shelfs handling, bugfix changed updater  
						
						 
						
						
						
					 
					
						2020-04-02 18:23:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							09e7d76c6f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo_book_delete' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py 
						
					 
					
						2020-03-12 20:43:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							9b49125776 
							
						 
					 
					
						
						
							
							English Language Updates  
						
						 
						
						... 
						
						
						
						Changes to provide consistency for English language. 
						
					 
					
						2020-02-03 14:22:00 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							c0239a659c 
							
						 
					 
					
						
						
							
							Add UI support for archived books.  
						
						 
						
						... 
						
						
						
						Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view. 
						
					 
					
						2020-01-26 00:27:54 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4708347c16 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt 
						
					 
					
						2019-07-13 20:54:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ecedf92783 
							
						 
					 
					
						
						
							
							Update version  
						
						 
						
						... 
						
						
						
						Make custom columns visible (#904 ) 
						
					 
					
						2019-05-30 10:21:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4552208c02 
							
						 
					 
					
						
						
							
							Fix   #848  
						
						 
						
						
						
					 
					
						2019-04-14 16:37:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fbe2e135 
							
						 
					 
					
						
						
							
							Fix   #766  
						
						 
						
						... 
						
						
						
						Update pdf upload
Translation of uploadprogress dialog 
						
					 
					
						2019-02-24 19:23:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc4b318e8 
							
						 
					 
					
						
						
							
							cover folders beautified  
						
						 
						
						
						
					 
					
						2019-02-03 20:29:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt 
							
						 
					 
					
						
						
						
						
							
						
						
							aa27e0e476 
							
						 
					 
					
						
						
							
							Revert "Update ID of button from sendbtn2 to sendbtn"  
						
						 
						
						... 
						
						
						
						This reverts commit a9277da85a . 
						
					 
					
						2019-01-18 10:43:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f4977c3767 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'theme/master'  
						
						 
						
						
						
					 
					
						2019-01-15 18:22:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hexeth 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a9277da85a 
							
						 
					 
					
						
						
							
							Update ID of button from sendbtn2 to sendbtn  
						
						 
						
						... 
						
						
						
						The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states. 
						
					 
					
						2019-01-14 11:43:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32568c9009 
							
						 
					 
					
						
						
							
							Update testing  
						
						 
						
						... 
						
						
						
						Update custom columns unicode enums 
						
					 
					
						2019-01-14 20:27:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hexeth 
							
						 
					 
					
						
						
						
						
							
						
						
							eb1c87fbae 
							
						 
					 
					
						
						
							
							Patch 4 ( #752 )  
						
						 
						
						... 
						
						
						
						* Target new class 
Target new class for caliblur language support
* Move publishing date into div
Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme.
* Target newly created div 
						
					 
					
						2019-01-08 07:10:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							863b77a5d7 
							
						 
					 
					
						
						
							
							Fix   #711  
						
						 
						
						... 
						
						
						
						Fixing for send to kindle after uploading
codecleaning 
						
					 
					
						2018-11-25 11:25:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dfa17956c9 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'  
						
						 
						
						... 
						
						
						
						Changed function for 295, azw3 is preferred format for sending to kindle 
						
					 
					
						2018-11-18 17:09:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6ec9bc9e5c 
							
						 
					 
					
						
						
							
							Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)  
						
						 
						
						... 
						
						
						
						404 messages on non existing categorys, languages, series
Updated Testresult 
						
					 
					
						2018-10-28 21:33:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7253f583cf 
							
						 
					 
					
						
						
							
							Fix   #650  
						
						 
						
						... 
						
						
						
						Improved testablility
Added feedback for book_edit -> stay on edit page 
						
					 
					
						2018-10-03 21:18:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							40cc25de7a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'bbb/621'  
						
						 
						
						... 
						
						
						
						Fixes after testing 
						
					 
					
						2018-10-03 14:03:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								bodybybuddha 
							
						 
					 
					
						
						
						
						
							
						
						
							5d34fd7fec 
							
						 
					 
					
						
						
							
							Send to Kindle button precheck added  
						
						 
						
						... 
						
						
						
						Based on existing book formats and which converter (if any) determine if button can be seen. 
						
					 
					
						2018-10-01 14:19:29 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							5129bc3601 
							
						 
					 
					
						
						
							
							Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page  
						
						 
						
						
						
					 
					
						2018-09-30 18:30:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba7c734657 
							
						 
					 
					
						
						
							
							Fixes from testing:  
						
						 
						
						... 
						
						
						
						Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates) 
						
					 
					
						2018-09-23 19:15:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3a9a59b751 
							
						 
					 
					
						
						
							
							Fix   #497  
						
						 
						
						
						
					 
					
						2018-07-17 18:24:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8896b3c5d2 
							
						 
					 
					
						
						
							
							Requests from  #454  
						
						 
						
						
						
					 
					
						2018-07-15 18:50:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mingyue Gao 
							
						 
					 
					
						
						
						
						
							
						
						
							c6f568534f 
							
						 
					 
					
						
						
							
							fix(template): download book with capital ext by kindle's browser  
						
						 
						
						
						
					 
					
						2018-03-23 22:39:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							21c2ee4d63 
							
						 
					 
					
						
						
							
							Fix for  #443  
						
						 
						
						
						
					 
					
						2018-02-04 08:05:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5809acfa9e 
							
						 
					 
					
						
						
							
							anonymous user now have always the right to read books (as any other user, too)  
						
						 
						
						... 
						
						
						
						(Fix  #287 ) 
						
					 
					
						2017-12-02 14:25:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cory Sitko 
							
						 
					 
					
						
						
						
						
							
						
						
							7ade2ecd35 
							
						 
					 
					
						
						
							
							make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing  
						
						 
						
						
						
					 
					
						2017-10-10 10:18:28 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0512e5a940 
							
						 
					 
					
						
						
							
							Fix   #342  
						
						 
						
						
						
					 
					
						2017-09-30 16:25:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c56a02bab6 
							
						 
					 
					
						
						
							
							Fix   #339  
						
						 
						
						
						
					 
					
						2017-09-30 15:24:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							8171943b8e 
							
						 
					 
					
						
						
							
							Update to ES5 standards  
						
						 
						
						... 
						
						
						
						Also fix ESLint issues 
						
					 
					
						2017-08-12 22:46:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							c86fa268c2 
							
						 
					 
					
						
						
							
							Fix/remove duplicate id's  
						
						 
						
						
						
					 
					
						2017-07-28 20:02:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							5162e2eed7 
							
						 
					 
					
						
						
							
							Add img alt attributes  
						
						 
						
						
						
					 
					
						2017-07-28 20:01:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cb5f196f4b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'adv/modal-details'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/static/js/main.js
#	cps/templates/detail.html 
						
					 
					
						2017-07-23 14:03:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							693c26c2b3 
							
						 
					 
					
						
						
							
							Attach events to button toolbar  
						
						 
						
						... 
						
						
						
						Since this is closer to the elements, we can be more sure that we won't have events fire when we don't want them to. For example, if we're viewing the page in a modal, we don't want the event handler living longer than the content itself. 
						
					 
					
						2017-07-22 11:24:47 -07:00