Bharadwaja G 
							
						 
					 
					
						
						
							
						
						c1a1bc0135 
					 
					
						
						
							
							Books grid view  
						
						
						
						
					 
					
						2017-09-04 20:27:52 +05:30 
						 
				 
			
				
					
						
							
							
								Bharadwaja G 
							
						 
					 
					
						
						
							
						
						6200948eec 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master  
						
						... 
						
						
						
						Conflicts:
	app/Http/Controllers/BookController.php
	resources/lang/en/common.php
	resources/views/books/create.blade.php
	resources/views/books/form.blade.php
	resources/views/books/index.blade.php
	resources/views/users/edit.blade.php
	tests/Entity/EntityTest.php 
						
						
					 
					
						2017-08-29 12:19:00 +05:30 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						0a402e3c63 
					 
					
						
						
							
							Made custom home ignore permissions and added tests  
						
						... 
						
						
						
						Closes  #126  and #372  
					
						2017-08-28 13:55:39 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						2f8b8c580d 
					 
					
						
						
							
							Resolved current failing tests  
						
						
						
						
					 
					
						2017-08-26 14:41:46 +01:00 
						 
				 
			
				
					
						
							
							
								Bharadwaja G 
							
						 
					 
					
						
						
							
						
						7f902e41c7 
					 
					
						
						
							
							Resolved conflicts  
						
						
						
						
					 
					
						2017-08-24 12:21:43 +05:30 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						e9831a7507 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master  
						
						
						
						
					 
					
						2017-08-01 19:24:33 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						c1fc06ae34 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master  
						
						
						
						
					 
					
						2017-07-27 16:20:38 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						ec83f83017 
					 
					
						
						
							
							Added breadcrumbs to pages in entity select  
						
						... 
						
						
						
						Fixes  #391  
					
						2017-07-27 16:10:58 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						f200b4183d 
					 
					
						
						
							
							Defined LDAP constant for testing without LDAP installed  
						
						
						
						
					 
					
						2017-07-22 17:22:31 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						33642c20ec 
					 
					
						
						
							
							Fixed faulty text rendering calls and LDAP tests  
						
						
						
						
					 
					
						2017-07-22 17:10:52 +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 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						3079a9f4de 
					 
					
						
						
							
							Reverted required changes.  
						
						
						
						
					 
					
						2017-07-15 19:07:32 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						a7d2cfdee2 
					 
					
						
						
							
							Resolving test cases  
						
						
						
						
					 
					
						2017-07-15 19:03:02 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						a149e87ca7 
					 
					
						
						
							
							Resolving test cases  
						
						
						
						
					 
					
						2017-07-15 19:00:23 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						854fd52a27 
					 
					
						
						
							
							Resolving test cases  
						
						
						
						
					 
					
						2017-07-15 18:57:09 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						3d808ac75f 
					 
					
						
						
							
							Test for cover image  
						
						
						
						
					 
					
						2017-07-15 18:39:13 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						39b924f158 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/OsmosysSoftware/BookStack  
						
						
						
						
					 
					
						2017-07-15 18:37:55 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						a488ef6b00 
					 
					
						
						
							
							Test for cover image.  
						
						
						
						
					 
					
						2017-07-15 18:36:49 +05:30 
						 
				 
			
				
					
						
							
							
								abijeetp 
							
						 
					 
					
						
						
							
						
						6d66c38c12 
					 
					
						
						
							
							Fixes issues with the test case, now creating a user with the required profile setting.  
						
						
						
						
					 
					
						2017-07-15 18:00:39 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						0c70416b5c 
					 
					
						
						
							
							Test books display options.  
						
						
						
						
					 
					
						2017-07-15 16:33:52 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						770f30c3a8 
					 
					
						
						
							
							Test books display options.  
						
						
						
						
					 
					
						2017-07-15 16:29:42 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						9872767f20 
					 
					
						
						
							
							Test for cover image upload  
						
						
						
						
					 
					
						2017-07-15 16:19:35 +05:30 
						 
				 
			
				
					
						
							
							
								abijeetp 
							
						 
					 
					
						
						
							
						
						832f8eaa94 
					 
					
						
						
							
							Fixes the test case related to UserProfileTest.  
						
						
						
						
					 
					
						2017-07-15 15:50:42 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						1ed74b8598 
					 
					
						
						
							
							Test for grid and list layout selection.  
						
						
						
						
					 
					
						2017-07-15 13:19:49 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						fd36978c13 
					 
					
						
						
							
							Test for layout selection.  
						
						
						
						
					 
					
						2017-07-15 12:26:57 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						1278a0b818 
					 
					
						
						
							
							Test for layout selection.  
						
						
						
						
					 
					
						2017-07-15 11:40:51 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						6a6516ddd5 
					 
					
						
						
							
							Test for layout selection.  
						
						
						
						
					 
					
						2017-07-15 11:31:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						1fe8f13503 
					 
					
						
						
							
							Cover image test case  
						
						
						
						
					 
					
						2017-07-14 18:36:50 +05:30 
						 
				 
			
				
					
						
							
							
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						8f3adcda5d 
					 
					
						
						
							
							Cover image test case  
						
						
						
						
					 
					
						2017-07-14 18:02:45 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						9e704fcae4 
					 
					
						
						
							
							Updated testing database connection issue  
						
						
						
						
					 
					
						2017-04-23 17:51:01 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						82e2c523e6 
					 
					
						
						
							
							Fixed chapter breadcrumbs and testing issues  
						
						
						
						
					 
					
						2017-04-22 14:08:12 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						a323b0d49c 
					 
					
						
						
							
							Allowed child entity permissions to override parent permissions  
						
						... 
						
						
						
						Updated elements of a page display and sidebar render to allow
child permissions to work even when parent entitites have permission
set. This allows a page with a 'view' permission to be viewable even
when the parent book or chapter is not viewable.
Fixes  #366  
						
						
					 
					
						2017-04-22 13:39:34 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						4c985aac7e 
					 
					
						
						
							
							Added page revision counting  
						
						... 
						
						
						
						Adds stored revision counts to pages and the revisions themselves.
Closes  #321  
						
						
					 
					
						2017-04-20 20:58:54 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						5fee7c4db1 
					 
					
						
						
							
							Merge pull request  #340  from BookStackApp/search_system  
						
						... 
						
						
						
						Implementation of new search system 
						
						
					 
					
						2017-04-16 11:01:00 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						a15b179676 
					 
					
						
						
							
							Updated testcases for new search system.  
						
						... 
						
						
						
						Finishes implementation of new search system.
Closes  #271 
Closes  #344 
Fixes  #285 
Fixes  #269 
Closes  #64  
						
						
					 
					
						2017-04-16 10:47:44 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						cc0ce7c630 
					 
					
						
						
							
							Fixed bug preventing page revision restore  
						
						... 
						
						
						
						Added regression tests to cover.
Fixes  #341  
						
						
					 
					
						2017-03-23 22:19:14 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						4499ae84bb 
					 
					
						
						
							
							Made fixes to es languge files and users page  
						
						... 
						
						
						
						Fixed PHP formatting error in ES lang file and added tests to cover.
Made user edit page more responsive on smaller devices.
Fixed 'cancel' button on profile screen when the user does not have
permission to manage users. 
						
						
					 
					
						2017-03-05 15:34:54 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						d4e790d3cf 
					 
					
						
						
							
							Added lang tests and update export text keys  
						
						
						
						
					 
					
						2017-03-05 15:10:06 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						253132afdf 
					 
					
						
						
							
							Added chapter export options  
						
						... 
						
						
						
						Closes  #177  
					
						2017-02-26 14:25:02 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						eded8abded 
					 
					
						
						
							
							Added book export and created export tests to cover  
						
						... 
						
						
						
						In reference to #177  
						
						
					 
					
						2017-02-26 13:26:51 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						0abed1afe5 
					 
					
						
						
							
							Added clear activity/revision commands. Cleaned commands.  
						
						... 
						
						
						
						Added testing to cover each command.
Removed example laravel inspire command.
Standardised command names to be behind 'bookstack' naming.
In reference to #320 . 
						
						
					 
					
						2017-02-26 09:16:24 +00:00