Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								684c20c4ea
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 14:09:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								6ef522df7e
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 14:05:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								3b771f2976
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 14:03:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								afc56c12fe
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 14:01:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								5eeed03dcd
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 13:53:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								0d98b4ce5e
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 13:37:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								ae2ec43a82
								
							
						 | 
						
							
							
								
								Avoid having to wait until all tests are processed to exit upon error/failure.
							
							
							
							
							
						 | 
						
							2017-07-17 13:35:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								265ed34ffd
								
							
						 | 
						
							
							
								
								Update travis.yml to try and solve the test issue around LDAP.
							
							
							
							
							
						 | 
						
							2017-07-17 13:34:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								711dcb4a48
								
							
						 | 
						
							
							
								
								Update travis.yml to try and solve the test issue around LDAP.
							
							
							
							
							
						 | 
						
							2017-07-17 13:29:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								67bc7007aa
								
							
						 | 
						
							
							
								
								Support new lines for book/chapter descriptions
							
							
							
							
							
							
							
							Avoid ignoring new lines when renderring the book/chapter descriptions on their respective detailed views. 
							
						 | 
						
							2017-07-14 16:05:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								2ea7e10923
								
							
						 | 
						
							
							
								
								Set ldap to not follow referrals by default
							
							
							
							
							
							
							
							Added LDAP_FOLLOW_REFERRALS .env option to override.
Fixes #317 
							
						 | 
						
							2017-07-10 19:43:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e7f8188ee5
								
							
						 | 
						
							
							
								
								Prevented textarea styles interfering with codemirror
							
							
							
							
							
							
							
							Closes #424 
							
						 | 
						
							2017-07-10 19:29:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								314d98abc3
								
							
						 | 
						
							
							
								
								Removed logs, Updated version, Fixed inconsistent subheader
							
							
							
							
							
						 | 
						
							2017-07-02 20:33:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b2dfc069c5
								
							
						 | 
						
							
							
								
								Updated readme attribution
							
							
							
							
							
						 | 
						
							2017-07-02 19:38:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								69c50b9b48
								
							
						 | 
						
							
							
								
								Migrated markdown editor actions to new cm editor
							
							
							
							
							
						 | 
						
							2017-07-02 19:35:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								f101e4f010
								
							
						 | 
						
							
							
								
								Fixed quoting db/table names in encoding migration.
							
							
							
							
							
							
							
							Also fixed incorrect if statement in db config. 
							
						 | 
						
							2017-07-02 17:34:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								005f0eb4fc
								
							
						 | 
						
							
							
								
								Updated default encoding and added conversion migration.
							
							
							
							
							
							
							
							Also updated how DB port is defined so that the DB_PORT
env var can be used or it can be take from the host name.
Fixes #405 
							
						 | 
						
							2017-07-02 17:30:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								7293ad7b24
								
							
						 | 
						
							
							
								
								Merge branch 'S64-japanese-translation'
							
							
							
							
							
						 | 
						
							2017-07-02 16:13:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								c5b58d8fd2
								
							
						 | 
						
							
							
								
								Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation
							
							
							
							
							
						 | 
						
							2017-07-02 16:09:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								4db2c274e2
								
							
						 | 
						
							
							
								
								Prevent empty-state actions visible without permission.
							
							
							
							
							
							
							
							Fixes #411 
							
						 | 
						
							2017-07-02 15:59:40 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								cbff801aec
								
							
						 | 
						
							
							
								
								Added test to cover f99c8ff.
							
							
							
							
							
							
							
							Closes #409 
							
						 | 
						
							2017-07-02 15:40:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								d5d83da766
								
							
						 | 
						
							
							
								
								Added diff and sh code types
							
							
							
							
							
							
							
							Verified changes to ensure fixes #296. 
							
						 | 
						
							2017-07-01 16:10:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								de6d8a811c
								
							
						 | 
						
							
							
								
								Added quick lang-selection options to code editor
							
							
							
							
							
						 | 
						
							2017-07-01 15:50:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								a94844b6b7
								
							
						 | 
						
							
							
								
								Fixed code block selection and drag/drop issues
							
							
							
							
							
						 | 
						
							2017-07-01 15:38:11 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								968e7b8b72
								
							
						 | 
						
							
							
								
								Finished off main functionality of custom tinymce code editor
							
							
							
							
							
						 | 
						
							2017-07-01 13:23:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								5f461c9796
								
							
						 | 
						
							
							
								
								Add `ja` locale to config
							
							
							
							
							
						 | 
						
							2017-07-01 16:40:06 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								b2b8706d05
								
							
						 | 
						
							
							
								
								Translate errors.php
							
							
							
							
							
						 | 
						
							2017-07-01 16:38:43 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								2d345fe454
								
							
						 | 
						
							
							
								
								Translate entities.php
							
							
							
							
							
						 | 
						
							2017-07-01 16:38:20 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								7bec70d429
								
							
						 | 
						
							
							
								
								Translate common.php
							
							
							
							
							
						 | 
						
							2017-07-01 16:37:07 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								60710e7fb4
								
							
						 | 
						
							
							
								
								Translate auth.php
							
							
							
							
							
						 | 
						
							2017-07-01 16:33:54 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								f10d3a8564
								
							
						 | 
						
							
							
								
								Translate validation.php
							
							
							
							
							
						 | 
						
							2017-07-01 16:32:36 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								b020520366
								
							
						 | 
						
							
							
								
								Translate passwords.php
							
							
							
							
							
						 | 
						
							2017-07-01 16:32:02 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								52010e5820
								
							
						 | 
						
							
							
								
								Translate pagination.php
							
							
							
							
							
						 | 
						
							2017-07-01 16:31:32 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								75eca03b05
								
							
						 | 
						
							
							
								
								Translate settings.php
							
							
							
							
							
						 | 
						
							2017-06-24 20:49:24 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								b8ebefd803
								
							
						 | 
						
							
							
								
								Translate components.php
							
							
							
							
							
						 | 
						
							2017-06-24 20:48:34 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								168c66815e
								
							
						 | 
						
							
							
								
								add `ja` to settings
							
							
							
							
							
						 | 
						
							2017-06-24 20:46:38 +09:00 | 
						
					
				
					
						
							
							
								 
								Shuma Yoshioka
							
						 | 
						
							
							
							
							
							
								
							
							
								26e703a1cd
								
							
						 | 
						
							
							
								
								translate activities.php
							
							
							
							
							
						 | 
						
							2017-06-19 00:02:09 +09:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								c8be214ee0
								
							
						 | 
						
							
							
								
								Started tinymce code editor components
							
							
							
							
							
						 | 
						
							2017-06-17 15:07:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								2060cdb931
								
							
						 | 
						
							
							
								
								Added code highlighting syntax modes
							
							
							
							
							
						 | 
						
							2017-06-17 12:41:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								0528e98d9c
								
							
						 | 
						
							
							
								
								Merge branch 'v0.16'
							
							
							
							
							
						 | 
						
							2017-06-04 15:39:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								f99c8ff99a
								
							
						 | 
						
							
							
								
								Fixed role permission removal bug
							
							
							
							
							
						 | 
						
							2017-06-04 15:37:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								88f93f76dd
								
							
						 | 
						
							
							
								
								Updated the markdown editor to use codemirror as editor
							
							
							
							
							
							
							
							Improved scroll sync system to be smarter 
							
						 | 
						
							2017-05-28 16:02:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e5fc6bf5fa
								
							
						 | 
						
							
							
								
								Moved from highlight.js to codemirror
							
							
							
							
							
						 | 
						
							2017-05-28 13:16:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								8990a9817f
								
							
						 | 
						
							
							
								
								Updated tinymce to latest version
							
							
							
							
							
						 | 
						
							2017-05-28 11:57:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								75981c2412
								
							
						 | 
						
							
							
								
								Fixed chapter check for non-mysqlnd instances
							
							
							
							
							
							
							
							Fixes #383 
							
						 | 
						
							2017-05-07 19:34:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								f8ae4c335e
								
							
						 | 
						
							
							
								
								Made single entity updates more efficent
							
							
							
							
							
						 | 
						
							2017-04-30 19:44:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								5570e858e5
								
							
						 | 
						
							
							
								
								Made more efficiency improvements to permission system
							
							
							
							
							
						 | 
						
							2017-04-30 11:38:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								1859a4d356
								
							
						 | 
						
							
							
								
								Refactored permission system components
							
							
							
							
							
							
							
							Split joint permission creation into chunks
Fixes #374 
							
						 | 
						
							2017-04-29 22:01:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ad4642c2c4
								
							
						 | 
						
							
							
								
								Enabled translation when not logged in
							
							
							
							
							
							
							
							Reads from the Accept-Language HTTP header.
Also fixed some encoding for ES translations.
Fixes #375 
							
						 | 
						
							2017-04-29 16:47:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								92108d710d
								
							
						 | 
						
							
							
								
								Re-enabled html in markdown editor
							
							
							
							
							
							
							
							Fixes #378 
							
						 | 
						
							2017-04-29 16:10:38 +01:00 |