e9831a7507 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master  
							
							
							
						 
						
							2017-08-01 19:24:33 +01:00  
				
					
						
							
							
								 
						
							
								ec83f83017 
								
							 
						 
						
							
							
								
								Added breadcrumbs to pages in entity select  
							
							... 
							
							
							
							Fixes  #391  
						
							2017-07-27 16:10:58 +01:00  
				
					
						
							
							
								 
						
							
								433cb9b3b2 
								
							 
						 
						
							
							
								
								Improved breadcrumb responsiveness  
							
							... 
							
							
							
							Closes  #426  
						
							2017-07-22 15:20:36 +01:00  
				
					
						
							
							
								 
						
							
								968e7b8b72 
								
							 
						 
						
							
							
								
								Finished off main functionality of custom tinymce code editor  
							
							
							
						 
						
							2017-07-01 13:23:46 +01:00  
				
					
						
							
							
								 
						
							
								fd50efb503 
								
							 
						 
						
							
							
								
								#47  - Putting the comments right under the page.  
							
							
							
						 
						
							2017-06-11 11:41:33 +05:30  
				
					
						
							
							
								 
						
							
								0bda5554dd 
								
							 
						 
						
							
							
								
								Getting the latest changes  
							
							
							
						 
						
							2017-06-04 10:20:01 +05:30  
				
					
						
							
							
								 
						
							
								e5fc6bf5fa 
								
							 
						 
						
							
							
								
								Moved from highlight.js to codemirror  
							
							
							
						 
						
							2017-05-28 13:16:21 +01:00  
				
					
						
							
							
								 
						
							
								3368fe42d8 
								
							 
						 
						
							
							
								
								Merge pull request  #10  from BookStackApp/master  
							
							... 
							
							
							
							Latest changes 
							
						 
						
							2017-05-03 01:41:08 +05:30  
				
					
						
							
							
								 
						
							
								c3ea0d333e 
								
							 
						 
						
							
							
								
								#47  - Adds functionality to display child comments. Also has some code towards the reply functionality.  
							
							
							
						 
						
							2017-04-27 02:35:29 +05:30  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d447355a61 
								
							 
						 
						
							
							
								
								Adding the view templates and styles.  
							
							
							
						 
						
							2017-04-19 01:24:33 +05:30  
				
					
						
							
							
								 
						
							
								8e2437498f 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							
							
						 
						
							2017-04-19 01:23:27 +05:30  
				
					
						
							
							
								 
						
							
								b3d4c199ae 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							... 
							
							
							
							Conflicts:
	.gitignore 
							
						 
						
							2017-04-19 01:21:45 +05:30  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d4e790d3cf 
								
							 
						 
						
							
							
								
								Added lang tests and update export text keys  
							
							
							
						 
						
							2017-03-05 15:10:06 +00:00  
				
					
						
							
							
								 
						
							
								e3eefba745 
								
							 
						 
						
							
							
								
								Fixed export testing and updated travis settings  
							
							
							
						 
						
							2017-02-26 21:39:15 +00:00  
				
					
						
							
							
								 
						
							
								eded8abded 
								
							 
						 
						
							
							
								
								Added book export and created export tests to cover  
							
							... 
							
							
							
							In reference to #177  
							
						 
						
							2017-02-26 13:26:51 +00:00  
				
					
						
							
							
								 
						
							
								22077d4181 
								
							 
						 
						
							
							
								
								Updated DOMPDF to latest version  
							
							
							
						 
						
							2017-02-25 14:59:56 +00:00  
				
					
						
							
							
								 
						
							
								56d58ad8e5 
								
							 
						 
						
							
							
								
								Updated pointer to be able to show includes  
							
							... 
							
							
							
							Also fixed pointer copying on flash-blocked browsers 
							
						 
						
							2017-01-21 14:58:03 +00:00  
				
					
						
							
							
								 
						
							
								e4e3b25c22 
								
							 
						 
						
							
							
								
								Started page transclusion system  
							
							
							
						 
						
							2017-01-16 21:24:48 +00:00  
				
					
						
							
							
								 
						
							
								969ad8911c 
								
							 
						 
						
							
							
								
								Updated page nav to hide when empty  
							
							
							
						 
						
							2017-01-14 15:34:52 +00:00  
				
					
						
							
							
								 
						
							
								7c8c4c2a05 
								
							 
						 
						
							
							
								
								Normalised page nav header inset when only small headers are used  
							
							
							
						 
						
							2017-01-02 12:13:03 +00:00  
				
					
						
							
							
								 
						
							
								3f0ef57d31 
								
							 
						 
						
							
							
								
								Added wkhtmltopdf support and done some style tweaks  
							
							... 
							
							
							
							Closes  #248  
						
							2017-01-01 12:20:30 +00:00  
				
					
						
							
							
								 
						
							
								a24f3d7d47 
								
							 
						 
						
							
							
								
								Merge branch 'master' into translations  
							
							
							
						 
						
							2016-12-31 14:32:52 +00:00  
				
					
						
							
							
								 
						
							
								c9700e38e2 
								
							 
						 
						
							
							
								
								Created solution for JS translations  
							
							... 
							
							
							
							Also tidied up existing components and JS 
							
						 
						
							2016-12-31 14:27:40 +00:00  
				
					
						
							
							
								 
						
							
								05316c90ba 
								
							 
						 
						
							
							
								
								converted image picker to blade-based component  
							
							... 
							
							
							
							Also updated some other JS translations 
							
						 
						
							2016-12-24 15:21:19 +00:00  
				
					
						
							
							
								 
						
							
								573357a08c 
								
							 
						 
						
							
							
								
								Extracted text from logic files  
							
							
							
						 
						
							2016-12-04 16:51:39 +00:00  
				
					
						
							
							
								 
						
							
								96075dee7b 
								
							 
						 
						
							
							
								
								Extracted text from page views & standardised breadcrumbs  
							
							
							
						 
						
							2016-12-03 18:35:40 +00:00  
				
					
						
							
							
								 
						
							
								286f9b0c7d 
								
							 
						 
						
							
							
								
								Moved page tags to sidebar  
							
							... 
							
							
							
							Fixed  #238  
						
							2016-11-27 19:37:57 +00:00  
				
					
						
							
							
								 
						
							
								57dc53ceff 
								
							 
						 
						
							
							
								
								Extracted text from book & chapter views  
							
							
							
						 
						
							2016-11-17 13:33:07 +00:00  
				
					
						
							
							
								 
						
							
								d3c7aada89 
								
							 
						 
						
							
							
								
								Fixed attachments on draft pages  
							
							
							
						 
						
							2016-11-12 14:21:54 +00:00  
				
					
						
							
							
								 
						
							
								e639600ba5 
								
							 
						 
						
							
							
								
								Renamed files to attachments  
							
							
							
						 
						
							2016-11-12 14:12:26 +00:00  
				
					
						
							
							
								 
						
							
								ac80723058 
								
							 
						 
						
							
							
								
								Merge fixes from branch 'v0.12'  
							
							
							
						 
						
							2016-11-12 11:40:54 +00:00  
				
					
						
							
							
								 
						
							
								91fe7f0bee 
								
							 
						 
						
							
							
								
								Fixed PDF export table width  
							
							... 
							
							
							
							Closes  #203 
Signed-off-by: Dan Brown <ssddanbrown@googlemail.com> 
						
							2016-10-30 10:41:18 +00:00  
				
					
						
							
							
								 
						
							
								30458405ce 
								
							 
						 
						
							
							
								
								Page Attachments - Improved UI, Now initially complete  
							
							... 
							
							
							
							Closes  #62  
						
							2016-10-23 17:55:48 +01:00  
				
					
						
							
							
								 
						
							
								91220239e5 
								
							 
						 
						
							
							
								
								Added in attachment tests  
							
							
							
						 
						
							2016-10-23 15:25:04 +01:00  
				
					
						
							
							
								 
						
							
								867fc8be64 
								
							 
						 
						
							
							
								
								Added basic attachment editing functionality  
							
							
							
						 
						
							2016-10-11 20:39:11 +01:00  
				
					
						
							
							
								 
						
							
								89509b487a 
								
							 
						 
						
							
							
								
								Added attachment creation from link/name  
							
							
							
						 
						
							2016-10-10 21:13:18 +01:00  
				
					
						
							
							
								 
						
							
								ac0b29fb6d 
								
							 
						 
						
							
							
								
								Added view, deletion and permissions for files  
							
							
							
						 
						
							2016-10-10 20:30:27 +01:00  
				
					
						
							
							
								 
						
							
								673c74ddfc 
								
							 
						 
						
							
							
								
								Started work on attachments  
							
							... 
							
							
							
							Created base models and started user-facing controls. 
							
						 
						
							2016-10-09 18:58:22 +01:00  
				
					
						
							
							
								 
						
							
								b662670efc 
								
							 
						 
						
							
							
								
								Prevented guest users creating draft pages.  
							
							
							
						 
						
							2016-09-29 15:56:57 +01:00  
				
					
						
							
							
								 
						
							
								f15cc5bdfa 
								
							 
						 
						
							
							
								
								Separated revision preview and diff & fixed chosen diff html  
							
							... 
							
							
							
							Closes  #8  
						
							2016-09-29 10:10:46 +01:00  
				
					
						
							
							
								 
						
							
								fff5bbcee4 
								
							 
						 
						
							
							
								
								Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff  
							
							
							
						 
						
							2016-09-29 09:32:40 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f06770d91d 
								
							 
						 
						
							
							
								
								Updated TinyMCE version from 4.3.7 to 4.4.3  
							
							
							
						 
						
							2016-09-06 19:29:09 +01:00  
				
					
						
							
							
								 
						
							
								0dbb8babee 
								
							 
						 
						
							
							
								
								Merge branch 'page_link_selector'  
							
							
							
						 
						
							2016-09-03 10:40:27 +01:00  
				
					
						
							
							
								 
						
							
								781f0e7887 
								
							 
						 
						
							
							
								
								Added draft save indicator and fixed notification positions  
							
							
							
						 
						
							2016-09-02 19:26:12 +01:00  
				
					
						
							
							
								 
						
							
								23e014cb25 
								
							 
						 
						
							
							
								
								Added link selector to markdown editor  
							
							
							
						 
						
							2016-09-02 18:54:26 +01:00  
				
					
						
							
							
								 
						
							
								5b64358ef1 
								
							 
						 
						
							
							
								
								Added link selector interface to WYSIWYG editor  
							
							
							
						 
						
							2016-09-01 20:36:22 +01:00