Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								9469c04eab 
								
							 
						 
						
							
							
								
								Merge pull request  #517  from leomartinez/master  
							
							 
							
							... 
							
							
							
							Added 'Spanish Argentina' translation 
							
						 
						
							2017-09-20 20:17:39 +01:00  
						
					 
				
					
						
							
							
								 
								Leonardo Martinez
							
						 
						
							 
							
							
							
							
								
							
							
								941bb73a68 
								
							 
						 
						
							
							
								
								Added missing colon  
							
							 
							
							
							
						 
						
							2017-09-19 14:25:44 -03:00  
						
					 
				
					
						
							
							
								 
								Leonardo Martinez
							
						 
						
							 
							
							
							
							
								
							
							
								8e652f5d8f 
								
							 
						 
						
							
							
								
								Added 'Spanish Argentina' translation.  
							
							 
							
							
							
						 
						
							2017-09-19 13:43:17 -03:00  
						
					 
				
					
						
							
							
								 
								Leonardo Martinez
							
						 
						
							 
							
							
							
							
								
							
							
								eec1b21928 
								
							 
						 
						
							
							
								
								Added 'Spanish Argentina' translation.  
							
							 
							
							
							
						 
						
							2017-09-19 13:42:39 -03:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								1baeb7bec9 
								
							 
						 
						
							
							
								
								Merge pull request  #510  from sanderdw/patch-1  
							
							 
							
							... 
							
							
							
							Update entities.php 
							
						 
						
							2017-09-17 11:09:12 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								61475ca0a3 
								
							 
						 
						
							
							
								
								Merge pull request  #506  from turbotankist/master  
							
							 
							
							... 
							
							
							
							Russian lang added 
							
						 
						
							2017-09-14 20:44:19 +01:00  
						
					 
				
					
						
							
							
								 
								sanderdw
							
						 
						
							 
							
							
							
							
								
							
							
								244c5a3ebb 
								
							 
						 
						
							
							
								
								Update entities.php  
							
							 
							
							
							
						 
						
							2017-09-14 21:43:47 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								39e7ac1c15 
								
							 
						 
						
							
							
								
								Updated social login to redirect to intended page.  
							
							 
							
							... 
							
							
							
							Closes  #508 . 
							
						 
						
							2017-09-14 20:20:47 +01:00  
						
					 
				
					
						
							
							
								 
								alexey
							
						 
						
							 
							
							
							
							
								
							
							
								ab7f5def04 
								
							 
						 
						
							
							
								
								Russian lang added  
							
							 
							
							
							
						 
						
							2017-09-12 16:42:04 +03:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								cd7e727f8c 
								
							 
						 
						
							
							
								
								Modified IT comment translations as per recent changes  
							
							 
							
							
							
						 
						
							2017-09-10 16:43:05 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								2329a5cedf 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:BookStackApp/BookStack  
							
							 
							
							
							
						 
						
							2017-09-10 16:36:47 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								d1a4ff9308 
								
							 
						 
						
							
							
								
								Merge pull request  #501  from cipi1965/master  
							
							 
							
							... 
							
							
							
							Added Italian language 
							
						 
						
							2017-09-10 16:29:44 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9a3bc27ef4 
								
							 
						 
						
							
							
								
								Fixed bullet styles and added code highlight on comments  
							
							 
							
							
							
						 
						
							2017-09-10 16:14:04 +01:00  
						
					 
				
					
						
							
							
								 
								Matteo Piccina
							
						 
						
							 
							
							
							
							
								
							
							
								f8315fb9c4 
								
							 
						 
						
							
							
								
								Added Italian language  
							
							 
							
							
							
						 
						
							2017-09-10 16:55:23 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								bb62dee5a2 
								
							 
						 
						
							
							
								
								Merge pull request  #500  from timoschwarzer/translation_update_de  
							
							 
							
							... 
							
							
							
							Update german translation 
							
						 
						
							2017-09-10 14:08:23 +01:00  
						
					 
				
					
						
							
							
								 
								Timo Schwarzer
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8acc188e16 
								
							 
						 
						
							
							
								
								Update german translation  
							
							 
							
							
							
						 
						
							2017-09-10 15:01:25 +02:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								874386ceab 
								
							 
						 
						
							
							
								
								Used trans_choice on profile view  
							
							 
							
							... 
							
							
							
							Closes  #417  
							
						 
						
							2017-09-10 13:43:08 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9dfbea8bf9 
								
							 
						 
						
							
							
								
								Restored seeder and fixed scroll on firefox  
							
							 
							
							
							
						 
						
							2017-09-10 13:29:48 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c1627a1468 
								
							 
						 
						
							
							
								
								Fixed sidebar scroll on mobile  
							
							 
							
							
							
						 
						
							2017-09-10 13:19:47 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								576a59a693 
								
							 
						 
						
							
							
								
								Fixed line-height difference in tinymce  
							
							 
							
							
							
						 
						
							2017-09-10 13:08:12 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								fec6c65b78 
								
							 
						 
						
							
							
								
								Fixed quick save shortcut in wysiwyg editor  
							
							 
							
							... 
							
							
							
							Fixes  #467  
							
						 
						
							2017-09-10 13:01:48 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								f8c046d182 
								
							 
						 
						
							
							
								
								Fixed markdown callout tags and cursor pos  
							
							 
							
							... 
							
							
							
							Closes  #470  
							
						 
						
							2017-09-09 19:41:11 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								9ca2184f09 
								
							 
						 
						
							
							
								
								Attempt to fix travis switching phpunit version  
							
							 
							
							
							
						 
						
							2017-09-09 19:17:00 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								fd449582bd 
								
							 
						 
						
							
							
								
								Removed comments from seeder since they are not used by tests  
							
							 
							
							
							
						 
						
							2017-09-09 18:48:47 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								621142a46e 
								
							 
						 
						
							
							
								
								Removed outdated translations and updated tests  
							
							 
							
							
							
						 
						
							2017-09-09 18:41:59 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								0275d2ad58 
								
							 
						 
						
							
							
								
								Added loading icons, Added comment activity  
							
							 
							
							
							
						 
						
							2017-09-09 17:06:30 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								41f56e659d 
								
							 
						 
						
							
							
								
								Added comment reply and delete confirmation.  
							
							 
							
							... 
							
							
							
							Also fixed local_id bug
Added component helpers
Added global scroll & Highlight helpers 
							
						 
						
							2017-09-09 15:56:24 +01:00  
						
					 
				
					
						
							
							
								 
								Bharadwaja G
							
						 
						
							 
							
							
							
							
								
							
							
								5034f21394 
								
							 
						 
						
							
							
								
								Added migration file.  
							
							 
							
							
							
						 
						
							2017-09-05 19:53:29 +05:30  
						
					 
				
					
						
							
							
								 
								Bharadwaja G
							
						 
						
							 
							
							
							
							
								
							
							
								e02fcbe983 
								
							 
						 
						
							
							
								
								Added Book cover image description in all languages.  
							
							 
							
							
							
						 
						
							2017-09-05 12:46:31 +05:30  
						
					 
				
					
						
							
							
								 
								Bharadwaja G
							
						 
						
							 
							
							
							
							
								
							
							
								1c88d21abf 
								
							 
						 
						
							
							
								
								Fixed books cover image ratio.  
							
							 
							
							
							
						 
						
							2017-09-04 20:50:24 +05:30  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e3f2bde26d 
								
							 
						 
						
							
							
								
								Merge branch 'Abijeet-master' to convert comment system to vue  
							
							 
							
							
							
						 
						
							2017-09-02 17:40:40 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								756ee0b172 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master  
							
							 
							
							
							
						 
						
							2017-09-02 17:36:58 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								c81b63b56f 
								
							 
						 
						
							
							
								
								Fixed broken page content includes  
							
							 
							
							
							
						 
						
							2017-09-02 16:06:03 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								70ee28ee13 
								
							 
						 
						
							
							
								
								Fixed long attachment names breaking outer boxes  
							
							 
							
							... 
							
							
							
							Closes  #460  
							
						 
						
							2017-09-02 15:21:05 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1c9ecc3edd 
								
							 
						 
						
							
							
								
								Reformatted sortable toolbox components  
							
							 
							
							
							
						 
						
							2017-09-02 15:06:52 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								9bd5d6a422 
								
							 
						 
						
							
							
								
								Merge pull request  #483  from msaus/japanese_lang_update  
							
							 
							
							... 
							
							
							
							Japanese lang update 
							
						 
						
							2017-09-02 14:39:14 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								1e41ccbc7a 
								
							 
						 
						
							
							
								
								Added ability to override codemirror theme  
							
							 
							
							... 
							
							
							
							Also cleaned codemirror file while there.
In referece to #455  
							
						 
						
							2017-09-02 13:34:37 +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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d8e1f52ddd 
								
							 
						 
						
							
							
								
								Made new sidebar layout responsive  
							
							 
							
							
							
						 
						
							2017-08-27 15:16:51 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								baea92b206 
								
							 
						 
						
							
							
								
								Migrated entity selector out of angular  
							
							 
							
							
							
						 
						
							2017-08-27 14:31:34 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								cfc05c1b22 
								
							 
						 
						
							
							
								
								Improved primary color control in settings  
							
							 
							
							
							
						 
						
							2017-08-27 12:59:56 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								ebf78d49a8 
								
							 
						 
						
							
							
								
								Merge pull request  #480  from BookStackApp/design_update_2017  
							
							 
							
							... 
							
							
							
							Design update 2017 
							
						 
						
							2017-08-26 17:22:30 +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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b60d2190ac 
								
							 
						 
						
							
							
								
								Updated error views for redesign  
							
							 
							
							
							
						 
						
							2017-08-26 14:53:23 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								2f8b8c580d 
								
							 
						 
						
							
							
								
								Resolved current failing tests  
							
							 
							
							
							
						 
						
							2017-08-26 14:41:46 +01:00