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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								03e5d61798 
								
							 
						 
						
							
							
								
								#47  Implements the reply and edit functionality for comments.  
							
							 
							
							
							
						 
						
							2017-05-16 00:40:14 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								8b82753218 
								
							 
						 
						
							
							
								
								#47  - Gets rid of simplemde  
							
							 
							
							
							
						 
						
							2017-05-03 02:42:04 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet Patro
							
						 
						
							 
							
							
							
							
								
							
							
								3368fe42d8 
								
							 
						 
						
							
							
								
								Merge pull request  #10  from BookStackApp/master  
							
							 
							
							... 
							
							
							
							Latest changes 
							
						 
						
							2017-05-03 01:41:08 +05:30  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								c3ea0d333e 
								
							 
						 
						
							
							
								
								#47  - Adds functionality to display child comments. Also has some code towards the reply functionality.  
							
							 
							
							
							
						 
						
							2017-04-27 02:35:29 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								8e2437498f 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							 
							
							
							
						 
						
							2017-04-19 01:23:27 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								b3d4c199ae 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							 
							
							... 
							
							
							
							Conflicts:
	.gitignore 
							
						 
						
							2017-04-19 01:21:45 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								dcde599709 
								
							 
						 
						
							
							
								
								Added chapter search  
							
							 
							
							... 
							
							
							
							Migrated book search to vue-based system.
Updated old tag seached.
Made chapter page layout widths same as book page.
Closes  #344  
							
						 
						
							2017-04-15 19:16:07 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0e0945ef84 
								
							 
						 
						
							
							
								
								Finished off UI for search system  
							
							 
							
							
							
						 
						
							2017-04-15 15:04:30 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1338ae2fc3 
								
							 
						 
						
							
							
								
								Started search interface, Added in vue and moved fonts  
							
							 
							
							
							
						 
						
							2017-04-09 20:59:57 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								070d4aeb6c 
								
							 
						 
						
							
							
								
								Started implementation of new search system  
							
							 
							
							
							
						 
						
							2017-03-19 12:48:44 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								36173eb47d 
								
							 
						 
						
							
							
								
								Removed extension from translation script link  
							
							 
							
							... 
							
							
							
							Also fixed bug causing EN translation backup to not be passed
to javascript translation system.
Closes  #328  
							
						 
						
							2017-03-05 14:10:55 +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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								387047f262 
								
							 
						 
						
							
							
								
								Fixed inaccessible revisions, added regression tests  
							
							 
							
							... 
							
							
							
							Fixes  #309  
							
						 
						
							2017-02-25 12:29:01 +00:00  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								70991fc1e5 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							 
							
							
							
						 
						
							2017-01-29 09:35:46 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6669998c10 
								
							 
						 
						
							
							
								
								Upgraded to Laravel 5.4  
							
							 
							
							
							
						 
						
							2017-01-25 19:35:40 +00:00