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 | 
						
					
				
					
						
							
							
								 
								Nilesh Deepak
							
						 | 
						
							
							
							
							
							
								
							
							
								af72f0d490
								
							
						 | 
						
							
							
								
								Bookstack grid view.
							
							
							
							
							
						 | 
						
							2017-06-29 18:54:04 +05:30 | 
						
					
				
					
						
							
							
								 
								Nilesh Deepak
							
						 | 
						
							
							
							
							
							
								
							
							
								8924618d12
								
							
						 | 
						
							
							
								
								test
							
							
							
							
							
						 | 
						
							2017-06-28 18:56:17 +05:30 | 
						
					
				
					
						
							
							
								 
								Nilesh Deepak
							
						 | 
						
							
							
							
							
							
								
							
							
								6557fbb666
								
							
						 | 
						
							
							
								
								commit
							
							
							
							
							
						 | 
						
							2017-06-28 18:51:32 +05:30 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								e155c52256
								
							
						 | 
						
							
							
								
								#47 - Fixes a few issues with the code.
							
							
							
							
							
						 | 
						
							2017-06-10 22:55:36 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet Patro
							
						 | 
						
							
							
							
							
							
								
							
							
								c76e7c706c
								
							
						 | 
						
							
							
								
								adding a comment on top.
							
							
							
							
							
						 | 
						
							2017-06-10 19:47:45 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								552943c033
								
							
						 | 
						
							
							
								
								#47 - Undos changes in config files.
							
							
							
							
							
						 | 
						
							2017-06-10 19:46:00 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								4efe3b41da
								
							
						 | 
						
							
							
								
								#47 - Added translations for other language files using Google translate.
							
							
							
							
							
						 | 
						
							2017-06-10 15:21:28 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								218376a41c
								
							
						 | 
						
							
							
								
								#47 - Fetching values from language files.
							
							
							
							
							
						 | 
						
							2017-06-08 01:30:43 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								e647ec22b1
								
							
						 | 
						
							
							
								
								#47 - Adds direct linking to comments.
							
							
							
							
							
						 | 
						
							2017-06-08 01:14:53 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								38fe756725
								
							
						 | 
						
							
							
								
								#47 - Fixes a couple of issues found during testing - delete not updating the UI, delete none not working properly.
							
							
							
							
							
						 | 
						
							2017-06-07 23:45:29 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								652a67ad65
								
							
						 | 
						
							
							
								
								Removes some unncessary code.
							
							
							
							
							
						 | 
						
							2017-06-06 23:20:40 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								5bd9da6054
								
							
						 | 
						
							
							
								
								#47 - Adds various translations in English, and a few code improvements.
							
							
							
							
							
						 | 
						
							2017-06-06 01:46:59 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								7c6fe8c4e2
								
							
						 | 
						
							
							
								
								#47 - Changes the location of the reply and edit comment box.
							
							
							
							
							
						 | 
						
							2017-06-05 00:20:37 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								689d1eb082
								
							
						 | 
						
							
							
								
								#47 - Adds a cancel button for edit and reply button.
							
							
							
							
							
						 | 
						
							2017-06-04 20:43:56 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								06d75e1804
								
							
						 | 
						
							
							
								
								#47 - Updates the total comments when a comment is added.
							
							
							
							
							
						 | 
						
							2017-06-04 20:12:01 +05:30 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								9558f84b97
								
							
						 | 
						
							
							
								
								#47 - Adds functionality to delete a comment. Also reduces the number of watchers.
							
							
							
							
							
						 | 
						
							2017-06-04 18:52:44 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								2fd421b115
								
							
						 | 
						
							
							
								
								#47 - Adds comment level permissions to the front-end.
							
							
							
							
							
						 | 
						
							2017-06-04 11:17:14 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								6ff440e677
								
							
						 | 
						
							
							
								
								Merge branch 'BookStackApp-master'
							
							
							
							
							
						 | 
						
							2017-06-04 10:20:25 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								0bda5554dd
								
							
						 | 
						
							
							
								
								Getting the latest changes
							
							
							
							
							
						 | 
						
							2017-06-04 10:20:01 +05:30 | 
						
					
				
					
						
							
							
								 
								Abijeet
							
						 | 
						
							
							
							
							
							
								
							
							
								860d4d4be5
								
							
						 | 
						
							
							
								
								#47 - Changes the way we are handling fetching of data for the comment section.
							
							
							
							
							
						 | 
						
							2017-05-30 09:02:47 +05:30 |