Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b12e2ceada
								
							
						 | 
						
							
							
								
								Added included content into page's text view
							
							
							
							
							
							
							
							Allows rendered content to be shown in listings and used in searches.
Also prevented angular tags in content being parsed in listings.
Fixes #442 
							
						 | 
						
							2017-07-22 14:21:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Dan Brown
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								bc067e9ad4
								
							
						 | 
						
							
							
								
								Updated dropdowns to hide after option click
							
							
							
							
							
							
							
							Fixes #429 
							
						 | 
						
							2017-07-22 14:03:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								245294fbc5
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 14:42:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								f38bc75ab4
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 14:21:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Clément Blanco
							
						 | 
						
							
							
							
							
							
								
							
							
								3407900abb
								
							
						 | 
						
							
							
								
								Trying to make the tests green.
							
							
							
							
							
						 | 
						
							2017-07-17 14:18:03 +01:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								JachuPL
							
						 | 
						
							
							
							
							
							
								
							
							
								9e0c931573
								
							
						 | 
						
							
							
								
								Polish translation
							
							
							
							
							
						 | 
						
							2017-07-13 16:00:42 +02: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 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								574ee820a9
								
							
						 | 
						
							
							
								
								#47 - Fixes the issues with the test case.
							
							
							
							
							
						 | 
						
							2017-06-13 02:37:50 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								7d02f77e67
								
							
						 | 
						
							
							
								
								#47 - Added more test cases to test the APIs and permission for comments.
							
							
							
							
							
						 | 
						
							2017-06-13 02:31:17 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								fd50efb503
								
							
						 | 
						
							
							
								
								#47 - Putting the comments right under the page.
							
							
							
							
							
						 | 
						
							2017-06-11 11:41:33 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								9dbd7fa618
								
							
						 | 
						
							
							
								
								#47 - Adding comments to the dummy content seeder.
							
							
							
							
							
						 | 
						
							2017-06-11 11:40:37 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								8dab31b87a
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/Abijeet/BookStack
							
							
							
							
							
						 | 
						
							2017-06-10 22:56:07 +05:30 |