Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								b3d4c199ae 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							 
							
							... 
							
							
							
							Conflicts:
	.gitignore 
							
						 
						
							2017-04-19 01:21:45 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								668ce26269 
								
							 
						 
						
							
							
								
								Fixed back button behaviour on books edit  
							
							 
							
							... 
							
							
							
							As reported in #339  
							
						 
						
							2017-03-19 08:32:04 +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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9b35aa42a2 
								
							 
						 
						
							
							
								
								Fixed spanish encoding, Added new lang to settings  
							
							 
							
							
							
						 
						
							2017-03-05 14:43:43 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								7163997367 
								
							 
						 
						
							
							
								
								Merge pull request  #334  from diegoseso/master  
							
							 
							
							... 
							
							
							
							First spanish translation effort 
							
						 
						
							2017-03-05 14:18:55 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								2385a6c29b 
								
							 
						 
						
							
							
								
								Merge pull request  #325  from arietimmerman/dutchbranch  
							
							 
							
							... 
							
							
							
							Dutch Language Files 
							
						 
						
							2017-03-05 14:15:47 +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  
						
					 
				
					
						
							
							
								 
								Diego Jose Sosa Diaz
							
						 
						
							 
							
							
							
							
								
							
							
								f7645824d9 
								
							 
						 
						
							
							
								
								First spanish translation effort  
							
							 
							
							
							
						 
						
							2017-03-03 00:21:33 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e3eefba745 
								
							 
						 
						
							
							
								
								Fixed export testing and updated travis settings  
							
							 
							
							
							
						 
						
							2017-02-26 21:39:15 +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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								22077d4181 
								
							 
						 
						
							
							
								
								Updated DOMPDF to latest version  
							
							 
							
							
							
						 
						
							2017-02-25 14:59:56 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b0e849f413 
								
							 
						 
						
							
							
								
								Added checkbox sytax parsing to markdown lists  
							
							 
							
							... 
							
							
							
							Closes  #319  
							
						 
						
							2017-02-25 13:16:26 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								af3c0e43a5 
								
							 
						 
						
							
							
								
								Prevented custom HTML being inserted on settings page  
							
							 
							
							... 
							
							
							
							Gives option for fixing if badly formatted HTML is inserted.
Closes  #310  
							
						 
						
							2017-02-25 12:41:32 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								4a2a539c08 
								
							 
						 
						
							
							
								
								Merge pull request  #295  from ReeseSebastian/master  
							
							 
							
							... 
							
							
							
							Updated and improved german translation 
							
						 
						
							2017-02-23 19:19:21 +00:00  
						
					 
				
					
						
							
							
								 
								Arie Timmerman
							
						 
						
							 
							
							
							
							
								
							
							
								4214fcd2fa 
								
							 
						 
						
							
							
								
								Updated Dutch language files  
							
							 
							
							
							
						 
						
							2017-02-11 11:58:45 +01:00  
						
					 
				
					
						
							
							
								 
								Arie Timmerman
							
						 
						
							 
							
							
							
							
								
							
							
								b2b64fb853 
								
							 
						 
						
							
							
								
								Started with Dutch translation  
							
							 
							
							
							
						 
						
							2017-02-10 22:10:41 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								a6128a1df1 
								
							 
						 
						
							
							
								
								Merge bugfixes from  branch 'v0.14'  
							
							 
							
							
							
						 
						
							2017-02-05 21:24:15 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								6638ee47d3 
								
							 
						 
						
							
							
								
								Fixed entities wrongly visible on 404  
							
							 
							
							... 
							
							
							
							Also ensured header state as expected on 404.
In reference to BookStackApp/website#9  
							
						 
						
							2017-02-05 21:19:29 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								86625a7642 
								
							 
						 
						
							
							
								
								Neatened up social login/register buttons  
							
							 
							
							
							
						 
						
							2017-02-05 15:28:53 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								ee495450cc 
								
							 
						 
						
							
							
								
								Improved multi-line callout rendering  
							
							 
							
							... 
							
							
							
							Closes  #300  
							
						 
						
							2017-02-05 14:47:26 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7c9937e924 
								
							 
						 
						
							
							
								
								Converted sort tests to non browserkit testing  
							
							 
							
							... 
							
							
							
							Added testing to cover book sort endpoint.
Closes  #283  
							
						 
						
							2017-02-05 14:20:59 +00:00  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								410e967eb1 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							 
							
							
							
						 
						
							2017-02-05 16:46:32 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								076693efc9 
								
							 
						 
						
							
							
								
								Added facebook, slack & twitter sign in options.  
							
							 
							
							... 
							
							
							
							Also added icon svg blade helper.
Closes  #125 . Starts #213 .
Requires documentation. 
							
						 
						
							2017-02-04 11:01:49 +00:00  
						
					 
				
					
						
							
							
								 
								Sebastian Reese
							
						 
						
							 
							
							
							
							
								
							
							
								54d1fcde5b 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/BookStackApp/BookStack  
							
							 
							
							
							
						 
						
							2017-02-02 00:43:54 +01:00  
						
					 
				
					
						
							
							
								 
								Sebastian Reese
							
						 
						
							 
							
							
							
							
								
							
							
								1c656d6556 
								
							 
						 
						
							
							
								
								Updated and improved german translation  
							
							 
							
							
							
						 
						
							2017-02-02 00:43:24 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								80f844139c 
								
							 
						 
						
							
							
								
								Fixed missing subscript styling  
							
							 
							
							... 
							
							
							
							Closes  #284  
							
						 
						
							2017-02-01 22:20:44 +00:00  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								148350009c 
								
							 
						 
						
							
							
								
								#47  Adds comment permission to each role.  
							
							 
							
							
							
						 
						
							2017-01-29 14:25:20 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								33d4844f17 
								
							 
						 
						
							
							
								
								Fixed role 'manage own permissions' permission  
							
							 
							
							
							
						 
						
							2017-01-22 12:16:02 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								5c60f27a7d 
								
							 
						 
						
							
							
								
								Merge branch 'page_transclusion'  
							
							 
							
							... 
							
							
							
							Closes  #123  
							
						 
						
							2017-01-21 16:17:33 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								26da81a3b0 
								
							 
						 
						
							
							
								
								Added pt_BR to language dropdown and renamed folder  
							
							 
							
							
							
						 
						
							2017-01-18 20:04:29 +00:00  
						
					 
				
					
						
							
							
								 
								NakaharaL
							
						 
						
							 
							
							
							
							
								
							
							
								a0035e4de2 
								
							 
						 
						
							
							
								
								Brazilian Portuguese Localization  
							
							 
							
							... 
							
							
							
							Translated files for messages from English to Brazilian Portuguese 
							
						 
						
							2017-01-18 08:29:18 -03:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e4e3b25c22 
								
							 
						 
						
							
							
								
								Started page transclusion system  
							
							 
							
							
							
						 
						
							2017-01-16 21:24:48 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d8c5f72258 
								
							 
						 
						
							
							
								
								Updated issue template and added TinyMCE autolinking  
							
							 
							
							... 
							
							
							
							Closes  #267  
							
						 
						
							2017-01-16 19:33:29 +00:00  
						
					 
				
					
						
							
							
								 
								sirgix
							
						 
						
							 
							
							
							
							
								
							
							
								d3dc73ca06 
								
							 
						 
						
							
							
								
								remove trailing spaces  
							
							 
							
							
							
						 
						
							2017-01-16 15:34:34 +01:00  
						
					 
				
					
						
							
							
								 
								sirgix
							
						 
						
							 
							
							
							
							
								
							
							
								d5ea15e6dd 
								
							 
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							2017-01-16 14:51:45 +01:00  
						
					 
				
					
						
							
							
								 
								sirgix
							
						 
						
							 
							
							
							
							
								
							
							
								5d45286646 
								
							 
						 
						
							
							
								
								french translation  
							
							 
							
							
							
						 
						
							2017-01-16 14:51:33 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								dabf149411 
								
							 
						 
						
							
							
								
								Added user setting system and added user-lang option  
							
							 
							
							... 
							
							
							
							Supports #115  
							
						 
						
							2017-01-15 16:27:24 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0bcf608e0b 
								
							 
						 
						
							
							
								
								Fixed page navigation with special chars in id  
							
							 
							
							... 
							
							
							
							Also made so it smooth-scrolls and uses app theme color.
Fixes  #254  
							
						 
						
							2017-01-14 16:36:12 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								969ad8911c 
								
							 
						 
						
							
							
								
								Updated page nav to hide when empty  
							
							 
							
							
							
						 
						
							2017-01-14 15:34:52 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								581c382f65 
								
							 
						 
						
							
							
								
								Fixed image delete permission issue  
							
							 
							
							... 
							
							
							
							Also fixed missing translations and wrote tests to cover issue.
Fixes  #258  
							
						 
						
							2017-01-08 19:19:30 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								33c44d3c0f 
								
							 
						 
						
							
							
								
								Merge pull request  #263  from Abijeet/typo-fix  
							
							 
							
							... 
							
							
							
							Typo fix 
							
						 
						
							2017-01-08 13:55:44 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0faa130cfd 
								
							 
						 
						
							
							
								
								Fixed offset code blocks when editing in markdown.  
							
							 
							
							... 
							
							
							
							Fixes  #264  
							
						 
						
							2017-01-08 13:31:53 +00:00  
						
					 
				
					
						
							
							
								 
								Abijeet Patro
							
						 
						
							 
							
							
							
							
								
							
							
								af76580b98 
								
							 
						 
						
							
							
								
								Fixes typo causing the message not to be displayed  
							
							 
							
							
							
						 
						
							2017-01-03 22:18:13 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f2917fc462 
								
							 
						 
						
							
							
								
								Added tests to cover social login actions  
							
							 
							
							... 
							
							
							
							Closes  #244  
							
						 
						
							2017-01-02 14:56:58 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								7c8c4c2a05 
								
							 
						 
						
							
							
								
								Normalised page nav header inset when only small headers are used  
							
							 
							
							
							
						 
						
							2017-01-02 12:13:03 +00:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								3f0ef57d31 
								
							 
						 
						
							
							
								
								Added wkhtmltopdf support and done some style tweaks  
							
							 
							
							... 
							
							
							
							Closes  #248  
							
						 
						
							2017-01-01 12:20:30 +00:00