Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4fecce0a0d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt 
						
					 
					
						2019-05-31 11:17:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ecedf92783 
							
						 
					 
					
						
						
							
							Update version  
						
						 
						
						... 
						
						
						
						Make custom columns visible (#904 ) 
						
					 
					
						2019-05-30 10:21:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f70c839014 
							
						 
					 
					
						
						
							
							Added additional permission viewer  
						
						 
						
						
						
					 
					
						2019-05-19 18:39:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0c80f5c63a 
							
						 
					 
					
						
						
							
							Update Teststatus  
						
						 
						
						
						
					 
					
						2019-05-12 19:44:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							406d1c76c9 
							
						 
					 
					
						
						
							
							Sorting and filtering of lists working (except file formats)  
						
						 
						
						... 
						
						
						
						Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view 
						
					 
					
						2019-04-22 19:11:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4ae9d4a749 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py
#	cps/worker.py 
						
					 
					
						2019-04-14 18:18:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4552208c02 
							
						 
					 
					
						
						
							
							Fix   #848  
						
						 
						
						
						
					 
					
						2019-04-14 16:37:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e5593d9a7f 
							
						 
					 
					
						
						
							
							Integrated author in sorting functions  
						
						 
						
						
						
					 
					
						2019-03-16 21:14:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							baf83b2f5a 
							
						 
					 
					
						
						
							
							Refactored generating download links  
						
						 
						
						
						
					 
					
						2019-03-16 16:23:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fbe2e135 
							
						 
					 
					
						
						
							
							Fix   #766  
						
						 
						
						... 
						
						
						
						Update pdf upload
Translation of uploadprogress dialog 
						
					 
					
						2019-02-24 19:23:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cc3088c52f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering 
						
					 
					
						2019-02-24 10:39:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0facb8fffa 
							
						 
					 
					
						
						
							
							Fix   #766  
						
						 
						
						
						
					 
					
						2019-02-23 18:28:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4230226716 
							
						 
					 
					
						
						
							
							Link fixes  
						
						 
						
						... 
						
						
						
						Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub 
						
					 
					
						2019-02-16 07:23:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f5235b1d4c 
							
						 
					 
					
						
						
							
							Uploader progress bar  
						
						 
						
						... 
						
						
						
						Fixes imports and routes
Merge branch 'master' into Develop
Finished routing 
						
					 
					
						2019-02-09 18:46:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a00d93a2d9 
							
						 
					 
					
						
						
							
							Working again (basically)  
						
						 
						
						
						
					 
					
						2019-02-06 21:52:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							561d40f8ff 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2019-02-03 20:30:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc4b318e8 
							
						 
					 
					
						
						
							
							cover folders beautified  
						
						 
						
						
						
					 
					
						2019-02-03 20:29:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5971194678 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'audiobook/Branch_c27805b'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md 
						
					 
					
						2019-01-27 11:14:38 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							5c3a5b6c39 
							
						 
					 
					
						
						
							
							Use ajax to add/remove books from shelves  
						
						 
						
						... 
						
						
						
						Gracefully fall back to standard requests if JavaScript is disabled 
						
					 
					
						2017-07-21 21:15:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							979bcdffd4 
							
						 
					 
					
						
						
							
							Bugfix non working download links  
						
						 
						
						... 
						
						
						
						Bugfix missing divider in detail page 
						
					 
					
						2017-07-09 12:41:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							649579eccd 
							
						 
					 
					
						
						
							
							Move jquery.form to layout.html  
						
						 
						
						... 
						
						
						
						This prevents it from getting loaded each time the details are viewed in a modal dialog. 
						
					 
					
						2017-07-08 09:15:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							675e8dd5cd 
							
						 
					 
					
						
						
							
							Show book details in modal dialog  
						
						 
						
						... 
						
						
						
						With them shown in a modal, you don't lose your place in the pagination. If the request comes via Ajax, the minimal layout is used. If via a normal request, the full layout is used. That lets you open the details in a new tab and have the full experience, but if you're clicking through the results of a search, you can view many without losing your place. 
						
					 
					
						2017-07-08 09:15:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							254e1f5262 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'button_padding/simplify-read-code'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/static/css/style.css 
						
					 
					
						2017-07-08 11:25:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4f08608d75 
							
						 
					 
					
						
						
							
							Move download button to top of detail page ( #174 )  
						
						 
						
						
						
					 
					
						2017-07-08 11:01:40 +02:00