Dan Brown 
							
						 
					 
					
						
						
							
						
						281da59bae 
					 
					
						
						
							
							Refactored book sort using collections  
						
						 
						
						
						
						
					 
					
						2018-01-13 16:44:47 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						0afa417b0a 
					 
					
						
						
							
							Added ability to secure images behind auth  
						
						 
						
						... 
						
						
						
						Still in testing.
Adds STORAGE_TYPE=local_secure option for setting images to be behind
auth. Stores images alongside attachments in /storage/uploads/images. 
						
						
					 
					
						2018-01-13 11:11:23 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						a77756a2da 
					 
					
						
						
							
							Refactored the code to first check for the permissions before sorting the book.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abijeet <abijeetpatro@gmail.com > 
						
						
					 
					
						2018-01-06 01:04:48 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						e13e71cbe0 
					 
					
						
						
							
							Changed the sort view to only show books to which we have an update permission.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abijeet <abijeetpatro@gmail.com > 
						
						
					 
					
						2017-12-31 16:44:46 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						4a24d1c31b 
					 
					
						
						
							
							Checks the target and the source book before performing the sort.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abijeet <abijeetpatro@gmail.com > 
						
						
					 
					
						2017-12-31 16:25:21 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						920964a561 
					 
					
						
						
							
							Enabled system-storage of drawings made via draw.io  
						
						 
						
						
						
						
					 
					
						2017-12-30 15:26:39 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						141bf22725 
					 
					
						
						
							
							Updated book view change to PATCH + other amends  
						
						 
						
						... 
						
						
						
						Moved toggle to right of header bar and added unique text and icon for
each view type.
Removed old profile setting to keep things clean. 
						
						
					 
					
						2017-12-29 16:49:03 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						1aa4d0dc59 
					 
					
						
						
							
							Merge branch 'feature-613' of git://github.com/Abijeet/BookStack into Abijeet-feature-613  
						
						 
						
						
						
						
					 
					
						2017-12-29 16:25:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						afe781bc39 
					 
					
						
						
							
							Enabled session in 404 responses  
						
						 
						
						... 
						
						
						
						Fixes  #634  
						
						
					 
					
						2017-12-28 13:19:02 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						d5a2529775 
					 
					
						
						
							
							Adds test cases and fixes an issue with the permission checking.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abijeet <abijeetpatro@gmail.com > 
						
						
					 
					
						2017-12-26 15:46:20 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						0d4db603a4 
					 
					
						
						
							
							Adds button to allow users to toggle the book view via the books list page.  
						
						 
						
						... 
						
						
						
						Closes  #613 
Signed-off-by: Abijeet <abijeetpatro@gmail.com > 
						
						
					 
					
						2017-12-26 12:38:16 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						03eb63ec77 
					 
					
						
						
							
							Made it possible to pre-fill login via url  
						
						 
						
						... 
						
						
						
						Allows email to be passed to email field.
Also allows password only if in demo mode (Due to security concerns). 
						
						
					 
					
						2017-12-10 13:56:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						90bf13c1ab 
					 
					
						
						
							
							Updated okta config keys, made SVG fully vector  
						
						 
						
						... 
						
						
						
						Also added some additional error handling to login. 
						
						
					 
					
						2017-12-09 13:32:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						d7edc389a6 
					 
					
						
						
							
							Enabled custom HTML head content to work within editors  
						
						 
						
						... 
						
						
						
						Closes  #562  
						
						
					 
					
						2017-12-08 11:52:43 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						b65abd25e0 
					 
					
						
						
							
							Made small var name and formatting tweaks  
						
						 
						
						
						
						
					 
					
						2017-12-07 19:19:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						a5e49f642b 
					 
					
						
						
							
							Merge branch 'disable-comments' of git://github.com/Abijeet/BookStack into Abijeet-disable-comments  
						
						 
						
						
						
						
					 
					
						2017-12-07 19:15:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						261e57fc4e 
					 
					
						
						
							
							Converted books view setting to user setting  
						
						 
						
						... 
						
						
						
						Also cleaned up/moved new CSS and removed redundant new book methods. 
						
						
					 
					
						2017-12-06 16:34:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						bc1302a8d8 
					 
					
						
						
							
							Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack into OsmosysSoftware-BookStackApp-master  
						
						 
						
						
						
						
					 
					
						2017-12-06 15:52:54 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						873b1099f8 
					 
					
						
						
							
							Updated to laravel 5.5  
						
						 
						
						... 
						
						
						
						Closes  #590  
						
						
					 
					
						2017-11-19 15:56:19 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						6bb7b5465f 
					 
					
						
						
							
							Added code in the settings to disable comments. Based on that hiding the comments section on the page display.  
						
						 
						
						
						
						
					 
					
						2017-11-16 00:05:24 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						d89440d198 
					 
					
						
						
							
							Fixed required email confirmation with domain restriction  
						
						 
						
						... 
						
						
						
						Added test to cover scenario.
Closes  #573  
						
						
					 
					
						2017-11-11 18:09:48 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						db51cee2d8 
					 
					
						
						
							
							Prevented custom homepage being deleted  
						
						 
						
						... 
						
						
						
						Fixes  #546  
						
						
					 
					
						2017-10-15 19:14:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						74a5e3113e 
					 
					
						
						
							
							Fixed page includes erroring on save  
						
						 
						
						... 
						
						
						
						Closes  #514  
						
						
					 
					
						2017-09-20 21:03:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						0275d2ad58 
					 
					
						
						
							
							Added loading icons, Added comment activity  
						
						 
						
						
						
						
					 
					
						2017-09-09 17:06:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharadwaja G 
							
						 
					 
					
						
						
							
						
						c1a1bc0135 
					 
					
						
						
							
							Books grid view  
						
						 
						
						
						
						
					 
					
						2017-09-04 20:27:52 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						fea5630ea4 
					 
					
						
						
							
							Made some changes to the comment system  
						
						 
						
						... 
						
						
						
						Changed to be rendered server side along with page content.
Changed deletion to fully delete comments from the database.
Added 'local_id' to comments for referencing.
Updated reply system to be non-nested (Incomplete)
Made database comment format entity-agnostic to be more future proof.
Updated designs of comment sections. 
						
						
					 
					
						2017-09-03 16:37:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
							
						
						55759bd22a 
					 
					
						
						
							
							Added ability to set a page to view on the homepage.  
						
						 
						
						... 
						
						
						
						Relates to #372  and #126  
						
						
					 
					
						2017-08-28 13:38:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						4cb4c9e568 
					 
					
						
						
							
							Updated remaining views to 2017 design update.  
						
						 
						
						... 
						
						
						
						Also fixed issue with duplicate confirmation email. 
						
						
					 
					
						2017-08-26 17:17:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						36f524a354 
					 
					
						
						
							
							Updated page view styles to align with 2017 update  
						
						 
						
						
						
						
					 
					
						2017-08-26 15:41:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						8fcbe44d3e 
					 
					
						
						
							
							Updated styles for auth and books views.  
						
						 
						
						... 
						
						
						
						Also added sourcemaps to gulp sass build 
						
						
					 
					
						2017-08-26 13:24:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharadwaja G 
							
						 
					 
					
						
						
							
						
						7f902e41c7 
					 
					
						
						
							
							Resolved conflicts  
						
						 
						
						
						
						
					 
					
						2017-08-24 12:21:43 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						3da8c01c1f 
					 
					
						
						
							
							Rolled out new design further  
						
						 
						
						
						
						
					 
					
						2017-08-20 13:57:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Brown 
							
						 
					 
					
						
						
							
						
						a04b31866d 
					 
					
						
						
							
							Cleaned social callback  
						
						 
						
						
						
						
					 
					
						2017-08-17 19:44:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						844976c85b 
					 
					
						
						
							
							Revert "Revert "Bookstack grid view.""  
						
						 
						
						
						
						
					 
					
						2017-07-12 11:40:50 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						3fd61a3600 
					 
					
						
						
							
							Revert "Bookstack grid view."  
						
						 
						
						
						
						
					 
					
						2017-07-07 17:28:34 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						144a6e469d 
					 
					
						
						
							
							Updated cover image upload and delete function.  
						
						 
						
						
						
						
					 
					
						2017-07-07 16:29:38 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						16a09e8ff6 
					 
					
						
						
							
							Deletion of image file on book deletion.  
						
						 
						
						
						
						
					 
					
						2017-07-06 10:03:40 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						6ad24a6bee 
					 
					
						
						
							
							Changed public getImageURL function to private.  
						
						 
						
						
						
						
					 
					
						2017-07-05 18:32:38 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						d99fd1fd65 
					 
					
						
						
							
							Applied required changes  
						
						 
						
						
						
						
					 
					
						2017-07-05 12:26:02 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						947c58f227 
					 
					
						
						
							
							Applied required changes in BookStack.  
						
						 
						
						
						
						
					 
					
						2017-07-05 12:09:01 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nilesh Deepak 
							
						 
					 
					
						
						
							
						
						bce5fdd5cd 
					 
					
						
						
							
							Merge branch 'master' into issue-181  
						
						 
						
						
						
						
					 
					
						2017-07-04 15:16:46 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abijeet 
							
						 
					 
					
						
						
							
						
						5bd9da6054 
					 
					
						
						
							
							#47  - Adds various translations in English, and a few code improvements.  
						
						 
						
						
						
						
					 
					
						2017-06-06 01:46:59 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
							
						
						860d4d4be5 
					 
					
						
						
							
							#47  - Changes the way we are handling fetching of data for the comment section.  
						
						 
						
						
						
						
					 
					
						2017-05-30 09:02:47 +05:30