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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								33642c20ec 
								
							 
						 
						
							
							
								
								Fixed faulty text rendering calls and LDAP tests  
							
							 
							
							
							
						 
						
							2017-07-22 17:10:52 +01:00  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								7c6fe8c4e2 
								
							 
						 
						
							
							
								
								#47  - Changes the location of the reply and edit comment box.  
							
							 
							
							
							
						 
						
							2017-06-05 00:20:37 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								06d75e1804 
								
							 
						 
						
							
							
								
								#47  - Updates the total comments when a comment is added.  
							
							 
							
							
							
						 
						
							2017-06-04 20:12:01 +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
							
						 
						
							 
							
							
							
							
								
							
							
								34802ff8a6 
								
							 
						 
						
							
							
								
								#47  Inserts null for updated_at when the user is creating a comment.  
							
							 
							
							
							
						 
						
							2017-05-25 08:02:49 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								03e5d61798 
								
							 
						 
						
							
							
								
								#47  Implements the reply and edit functionality for comments.  
							
							 
							
							
							
						 
						
							2017-05-16 00:40:14 +05:30  
						
					 
				
					
						
							
							
								 
								Abijeet Patro
							
						 
						
							 
							
							
							
							
								
							
							
								3368fe42d8 
								
							 
						 
						
							
							
								
								Merge pull request  #10  from BookStackApp/master  
							
							 
							
							... 
							
							
							
							Latest changes 
							
						 
						
							2017-05-03 01:41:08 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f8ae4c335e 
								
							 
						 
						
							
							
								
								Made single entity updates more efficent  
							
							 
							
							
							
						 
						
							2017-04-30 19:44:59 +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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								01cb22af37 
								
							 
						 
						
							
							
								
								Added tag searches and advanced filters to new search  
							
							 
							
							
							
						 
						
							2017-03-27 18:05:34 +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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								070d4aeb6c 
								
							 
						 
						
							
							
								
								Started implementation of new search system  
							
							 
							
							
							
						 
						
							2017-03-19 12:48:44 +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
							
						 
						
							 
							
							
							
							
								
							
							
								410e967eb1 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							 
							
							
							
						 
						
							2017-02-05 16:46:32 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9eecaea31a 
								
							 
						 
						
							
							
								
								Attempt to fix bookchildren and user getThumb  
							
							 
							
							... 
							
							
							
							Hopefully Fixes  #292  and #294  and #287  
							
						 
						
							2017-02-01 22:16:32 +00:00  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								70991fc1e5 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							 
							
							
							
						 
						
							2017-01-29 09:35:46 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								33d4844f17 
								
							 
						 
						
							
							
								
								Fixed role 'manage own permissions' permission  
							
							 
							
							
							
						 
						
							2017-01-22 12:16:02 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a4f6bc63f0 
								
							 
						 
						
							
							
								
								Updated page include logic to use blade-style tags  
							
							 
							
							... 
							
							
							
							It will also snippets of a page if and id is provided in a tag 
							
						 
						
							2017-01-21 13:53:00 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e4e3b25c22 
								
							 
						 
						
							
							
								
								Started page transclusion system  
							
							 
							
							
							
						 
						
							2017-01-16 21:24:48 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ee5ded6e1e 
								
							 
						 
						
							
							
								
								Updated permission bookChildrenQuery to use QueryBuilder  
							
							 
							
							
							
						 
						
							2017-01-15 15:00:29 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								969ad8911c 
								
							 
						 
						
							
							
								
								Updated page nav to hide when empty  
							
							 
							
							
							
						 
						
							2017-01-14 15:34:52 +00:00  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								397db04428 
								
							 
						 
						
							
							
								
								Added comments controller, model, repo, and the database schema. Modified existing Page model to associate with comments.  
							
							 
							
							
							
						 
						
							2017-01-13 21:45:48 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7c8c4c2a05 
								
							 
						 
						
							
							
								
								Normalised page nav header inset when only small headers are used  
							
							 
							
							
							
						 
						
							2017-01-02 12:13:03 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8453191dfb 
								
							 
						 
						
							
							
								
								Finished refactor of entity repos  
							
							 
							
							... 
							
							
							
							Removed entity-specific repos and standardised
the majority of repo calls to be applicable to
all entity types 
							
						 
						
							2017-01-02 11:07:27 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								65796cfc7b 
								
							 
						 
						
							
							
								
								Rewrote book children query  
							
							 
							
							
							
						 
						
							2017-01-01 21:21:11 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								241278226f 
								
							 
						 
						
							
							
								
								Refactored search and slug repo components  
							
							 
							
							
							
						 
						
							2017-01-01 16:57:47 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7f9de2c8ab 
								
							 
						 
						
							
							
								
								Started refactor to merge entity repos  
							
							 
							
							
							
						 
						
							2017-01-01 16:05:44 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								573357a08c 
								
							 
						 
						
							
							
								
								Extracted text from logic files  
							
							 
							
							
							
						 
						
							2016-12-04 16:51:39 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0fb1fc87c8 
								
							 
						 
						
							
							
								
								Enabled utf8 slugs  
							
							 
							
							... 
							
							
							
							Prevents slug change when using only non-ascii chars
Allows use of more localised urls.
Closes  #233  
							
						 
						
							2016-11-12 17:16:52 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e639600ba5 
								
							 
						 
						
							
							
								
								Renamed files to attachments  
							
							 
							
							
							
						 
						
							2016-11-12 14:12:26 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								672b15d36c 
								
							 
						 
						
							
							
								
								Fixed attachment base-url usage and non-existant images  
							
							 
							
							... 
							
							
							
							Images now self-delete if the original file does not exist.
Prevents simply getting non-fixable errors.
Also cleaned some JS. 
							
						 
						
							2016-11-12 12:41:34 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7ee695d74a 
								
							 
						 
						
							
							
								
								File upload deletion complete & added extension handling  
							
							 
							
							... 
							
							
							
							Also fixed issue with file editing on JS side 
							
						 
						
							2016-10-23 13:36:45 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								673c74ddfc 
								
							 
						 
						
							
							
								
								Started work on attachments  
							
							 
							
							... 
							
							
							
							Created base models and started user-facing controls. 
							
						 
						
							2016-10-09 18:58:22 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								771626b6ec 
								
							 
						 
						
							
							
								
								Started work on making the public role/user configurable  
							
							 
							
							... 
							
							
							
							Create a new 'public' guest user and made the public
role visible on role setting screens. 
							
						 
						
							2016-09-29 12:43:46 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f15cc5bdfa 
								
							 
						 
						
							
							
								
								Separated revision preview and diff & fixed chosen diff html  
							
							 
							
							... 
							
							
							
							Closes  #8  
							
						 
						
							2016-09-29 10:10:46 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1d681e53e4 
								
							 
						 
						
							
							
								
								Added page navigation and tweaked header styles  
							
							 
							
							... 
							
							
							
							Changed header selection in editor to be more descriptive and
to provide a wider range of styles.
Closes  #68  
							
						 
						
							2016-09-18 14:49:36 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e0235fda8b 
								
							 
						 
						
							
							
								
								Made registration gravatar/email requests fail gracefully  
							
							 
							
							... 
							
							
							
							* Extracted any email confirmation text into langs.
* Added new notification on confirmation email send fail.
Closes  #187  
							
						 
						
							2016-09-17 21:33:55 +01:00