Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8022b1bb36 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'english/master'  
						
						 
						
						
						
					 
					
						2023-01-21 15:19:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							b3335f6733 
							
						 
					 
					
						
						
							
							English Language Updates - V3  
						
						 
						
						
						
					 
					
						2023-01-04 13:30:13 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fbac3e38ac 
							
						 
					 
					
						
						
							
							Eenabled send epubs to E-Reader devices  
						
						 
						
						
						
					 
					
						2022-05-08 12:55:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fe21d15194 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cn/fix/bootstrap-table-locale'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js 
						
					 
					
						2021-10-16 11:48:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							56a9c62421 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cn/chinese/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/search_form.html 
						
					 
					
						2021-10-16 11:41:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							50919d4721 
							
						 
					 
					
						
						
							
							Added handling for missing flask-wtf dependency  
						
						 
						
						... 
						
						
						
						Added CSRF protection (via flask-wtf)
Moved upload function to js file
Fixed error page in case of csrf failure 
						
					 
					
						2021-10-04 19:23:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b82d03c12c 
							
						 
					 
					
						
						
							
							Removed js from search_form, tasks  
						
						 
						
						... 
						
						
						
						Added translation of bootstrap-select in user table 
						
					 
					
						2021-10-03 08:01:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								xlivevil 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							deb91996a8 
							
						 
					 
					
						
						
							
							fix:bootstrap-table locale  
						
						 
						
						... 
						
						
						
						Add data-locale in table tag
Add bootstrap-table-locale-all-min-js
Remove bootstrap-table locale dir 
						
					 
					
						2021-09-30 20:09:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								xlivevil 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1b8410e786 
							
						 
					 
					
						
						
							
							Update Simplified Chinese translation  
						
						 
						
						
						
					 
					
						2021-09-25 23:15:44 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1d79d9ded2 
							
						 
					 
					
						
						
							
							Bugfix from tests (displaying of book languages in user list)  
						
						 
						
						
						
					 
					
						2021-08-29 11:31:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1fa267ce1b 
							
						 
					 
					
						
						
							
							Final fix for escaping html special chars in tables  
						
						 
						
						
						
					 
					
						2021-08-28 15:47:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							41ca85268f 
							
						 
					 
					
						
						
							
							Update translation files  
						
						 
						
						
						
					 
					
						2021-08-01 17:27:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e15324d2cd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2021-05-16 09:38:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							20b84a9459 
							
						 
					 
					
						
						
							
							Unified translations  
						
						 
						
						... 
						
						
						
						Update translations for release 
						
					 
					
						2021-05-16 09:37:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d95838309e 
							
						 
					 
					
						
						
							
							Added config option for shelf sync behavior  
						
						 
						
						
						
					 
					
						2021-05-15 10:45:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eba94f430c 
							
						 
					 
					
						
						
							
							Updated js libs  
						
						 
						
						
						
					 
					
						2021-05-14 09:29:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							64696fe973 
							
						 
					 
					
						
						
							
							Bugfixes edit user list ( Fix   #1938 )  
						
						 
						
						
						
					 
					
						2021-05-01 08:36:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							97e4707f72 
							
						 
					 
					
						
						
							
							user list column value and tags editor ( #1938 )  
						
						 
						
						... 
						
						
						
						Bugfixes for massedit in user list (#1938 )
Changed no. of debug messages 
						
					 
					
						2021-04-25 10:43:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							04ac5b69ac 
							
						 
					 
					
						
						
							
							Further improvements on user list  #1938  
						
						 
						
						
						
					 
					
						2021-04-18 12:01:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a4addf30 
							
						 
					 
					
						
						
							
							Cancel button in User edit now leads to the right page back  #1938  
						
						 
						
						
						
					 
					
						2021-04-17 18:30:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							04971f8672 
							
						 
					 
					
						
						
							
							Bugfix wrong js file in user list  
						
						 
						
						
						
					 
					
						2021-04-11 20:01:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b6177b27f4 
							
						 
					 
					
						
						
							
							Sorting of users in table according to selection possible  
						
						 
						
						
						
					 
					
						2021-04-11 19:59:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fac232229e 
							
						 
					 
					
						
						
							
							Added missing ead/unread category in user list  #1938  
						
						 
						
						
						
					 
					
						2021-04-07 17:49:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a43021e87c 
							
						 
					 
					
						
						
							
							Fix for  #1938  
						
						 
						
						
						
					 
					
						2021-04-07 17:46:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8acd1f1fe4 
							
						 
					 
					
						
						
							
							Code refactoring and improved error handling for edit user list  
						
						 
						
						... 
						
						
						
						Update teststatus 
						
					 
					
						2021-04-06 17:29:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							665210e506 
							
						 
					 
					
						
						
							
							Fixes for book edit with title sort and author sort  
						
						 
						
						
						
					 
					
						2021-04-04 14:01:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9864d932e0 
							
						 
					 
					
						
						
							
							Changed user.nickname to user.name  
						
						 
						
						... 
						
						
						
						Added function to view downloads of all users for admins 
						
					 
					
						2021-03-21 18:55:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b070ba142f 
							
						 
					 
					
						
						
							
							Selects are working in user management with generic confirm dialog  
						
						 
						
						
						
					 
					
						2021-03-16 15:52:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bd7c6828bf 
							
						 
					 
					
						
						
							
							Selects are working in user management  
						
						 
						
						
						
					 
					
						2021-03-16 15:03:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							da2c3e9ed7 
							
						 
					 
					
						
						
							
							Edit user mass change checkbox working  
						
						 
						
						
						
					 
					
						2021-03-15 16:46:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							81c30d5fd5 
							
						 
					 
					
						
						
							
							Add missing files from bootstrap editable  
						
						 
						
						... 
						
						
						
						Added user-table single-select header for locale and default-language 
						
					 
					
						2021-02-20 19:55:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e64a504bb1 
							
						 
					 
					
						
						
							
							Working Locale and default language selection in user table edit  
						
						 
						
						
						
					 
					
						2021-02-20 14:18:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a3a11bdf3f 
							
						 
					 
					
						
						
							
							Changed checkbox states are saved on server  
						
						 
						
						
						
					 
					
						2021-02-14 17:49:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0992bafe30 
							
						 
					 
					
						
						
							
							Bulk User management  
						
						 
						
						
						
					 
					
						2021-02-13 13:17:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eeb7974e05 
							
						 
					 
					
						
						
							
							User table:  
						
						 
						
						... 
						
						
						
						Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled 
						
					 
					
						2021-01-31 14:54:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							62447d6b89 
							
						 
					 
					
						
						
							
							Basic User edit in tables  
						
						 
						
						
						
					 
					
						2021-01-31 10:17:57 +01:00