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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								b167ae795e 
								
							 
						 
						
							
							
								
								Added script to check translation files  
							
							 
							
							... 
							
							
							
							Closes  #373  
							
						 
						
							2017-12-04 20:25:04 +00:00  
						
					 
				
					
						
							
							
								 
								Guilherme Bernal
							
						 
						
							 
							
							
							
							
								
							
							
								332f678ed0 
								
							 
						 
						
							
							
								
								Update pt_BR translations  
							
							 
							
							
							
						 
						
							2017-10-15 16:15:53 -03:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								db51cee2d8 
								
							 
						 
						
							
							
								
								Prevented custom homepage being deleted  
							
							 
							
							... 
							
							
							
							Fixes  #546  
							
						 
						
							2017-10-15 19:14:46 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								3d375fae55 
								
							 
						 
						
							
							
								
								Merge pull request  #529  from cipi1965/master  
							
							 
							
							... 
							
							
							
							Updated italian translation 
							
						 
						
							2017-10-01 11:44:45 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								c99a50de2c 
								
							 
						 
						
							
							
								
								Merge pull request  #528  from turbotankist/master  
							
							 
							
							... 
							
							
							
							russian lang fixes 
							
						 
						
							2017-10-01 11:43:31 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
							
							
								
							
							
								1a32b25b5e 
								
							 
						 
						
							
							
								
								Merge pull request  #523  from sanderdw/master  
							
							 
							
							... 
							
							
							
							Update dutch translations 
							
						 
						
							2017-10-01 11:33:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matteo Piccina
							
						 
						
							 
							
							
							
							
								
							
							
								fa4bee2d98 
								
							 
						 
						
							
							
								
								Updated italian translation  
							
							 
							
							
							
						 
						
							2017-09-27 10:44:08 +02:00  
						
					 
				
					
						
							
							
								 
								alexey
							
						 
						
							 
							
							
							
							
								
							
							
								ce63260fa6 
								
							 
						 
						
							
							
								
								russian lang fixes  
							
							 
							
							
							
						 
						
							2017-09-27 11:17:56 +03:00  
						
					 
				
					
						
							
							
								 
								sanderdw
							
						 
						
							 
							
							
							
							
								
							
							
								2259263214 
								
							 
						 
						
							
							
								
								Update entities.php  
							
							 
							
							
							
						 
						
							2017-09-23 00:52:08 +02:00  
						
					 
				
					
						
							
							
								 
								sanderdw
							
						 
						
							 
							
							
							
							
								
							
							
								762cf5f183 
								
							 
						 
						
							
							
								
								Update components.php  
							
							 
							
							
							
						 
						
							2017-09-23 00:47:02 +02:00  
						
					 
				
					
						
							
							
								 
								sanderdw
							
						 
						
							 
							
							
							
							
								
							
							
								07175f2b3e 
								
							 
						 
						
							
							
								
								Update dutch translations  
							
							 
							
							
							
						 
						
							2017-09-23 00:28:25 +02: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  
						
					 
				
					
						
							
							
								 
								sanderdw
							
						 
						
							 
							
							
							
							
								
							
							
								244c5a3ebb 
								
							 
						 
						
							
							
								
								Update entities.php  
							
							 
							
							
							
						 
						
							2017-09-14 21:43:47 +02: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
							
						 
						
							 
							
							
							
							
								
							
							
								d1a4ff9308 
								
							 
						 
						
							
							
								
								Merge pull request  #501  from cipi1965/master  
							
							 
							
							... 
							
							
							
							Added Italian language 
							
						 
						
							2017-09-10 16:29:44 +01:00  
						
					 
				
					
						
							
							
								 
								Matteo Piccina
							
						 
						
							 
							
							
							
							
								
							
							
								f8315fb9c4 
								
							 
						 
						
							
							
								
								Added Italian language  
							
							 
							
							
							
						 
						
							2017-09-10 16:55:23 +02: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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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
							
						 
						
							 
							
							
							
							
								
							
							
								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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								756ee0b172 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master  
							
							 
							
							
							
						 
						
							2017-09-02 17:36:58 +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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								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
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								36f524a354 
								
							 
						 
						
							
							
								
								Updated page view styles to align with 2017 update  
							
							 
							
							
							
						 
						
							2017-08-26 15:41:33 +01:00  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								5187d3fa78 
								
							 
						 
						
							
							
								
								Updated chapter views with new design  
							
							 
							
							
							
						 
						
							2017-08-26 14:36:48 +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  
						
					 
				
					
						
							
							
								 
								soseki
							
						 
						
							 
							
							
							
							
								
							
							
								3966fb1df6 
								
							 
						 
						
							
							
								
								update Japanese language for code editor  
							
							 
							
							
							
						 
						
							2017-08-24 15:30:07 +09:00  
						
					 
				
					
						
							
							
								 
								soseki
							
						 
						
							 
							
							
							
							
								
							
							
								830614fb19 
								
							 
						 
						
							
							
								
								add Japanese language for code editor  
							
							 
							
							
							
						 
						
							2017-08-24 15:24:43 +09:00  
						
					 
				
					
						
							
							
								 
								Abijeet
							
						 
						
							 
							
							
							
							
								
							
							
								ac07cb41b6 
								
							 
						 
						
							
							
								
								Fixed formatting and added error messages.  
							
							 
							
							
							
						 
						
							2017-08-21 02:21:31 +05:30  
						
					 
				
					
						
							
							
								 
								Dan Brown
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								3da8c01c1f 
								
							 
						 
						
							
							
								
								Rolled out new design further  
							
							 
							
							
							
						 
						
							2017-08-20 13:57:25 +01:00  
						
					 
				
					
						
							
							
								 
								Timo Schwarzer
							
						 
						
							 
							
							
							
							
								
							
							
								0d6a6b5b63 
								
							 
						 
						
							
							
								
								Update/fix german translation  
							
							 
							
							
							
						 
						
							2017-08-16 22:31:07 +02:00  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								bbaa2f4cda 
								
							 
						 
						
							
							
								
								Merge pull request  #435  from JachuPL/polish-localization  
							
							 
							
							... 
							
							
							
							Polish translation 
							
						 
						
							2017-07-27 16:48:19 +01:00  
						
					 
				
					
						
							
							
								 
								Jérôme Le Gal
							
						 
						
							 
							
							
							
							
								
							
							
								0b2c3c1aa7 
								
							 
						 
						
							
							
								
								settings.php: add missing french translation  
							
							 
							
							
							
						 
						
							2017-07-22 23:45:09 +02:00  
						
					 
				
					
						
							
							
								 
								Jérôme Le Gal
							
						 
						
							 
							
							
							
							
								
							
							
								0dc9d0bed7 
								
							 
						 
						
							
							
								
								errors.php: add missing french translation  
							
							 
							
							
							
						 
						
							2017-07-22 23:45:09 +02:00  
						
					 
				
					
						
							
							
								 
								Jérôme Le Gal
							
						 
						
							 
							
							
							
							
								
							
							
								a2a2e37797 
								
							 
						 
						
							
							
								
								settings.php: fix some spelling issues in french translation  
							
							 
							
							
							
						 
						
							2017-07-22 23:45:09 +02:00  
						
					 
				
					
						
							
							
								 
								Jérôme Le Gal
							
						 
						
							 
							
							
							
							
								
							
							
								3d9819f97c 
								
							 
						 
						
							
							
								
								passwords.php: fix some spelling issues in french translation  
							
							 
							
							
							
						 
						
							2017-07-22 23:45:09 +02:00  
						
					 
				
					
						
							
							
								 
								Jérôme Le Gal
							
						 
						
							 
							
							
							
							
								
							
							
								b2b4a24d7c 
								
							 
						 
						
							
							
								
								errors.php: fix some spelling issues in french translation  
							
							 
							
							
							
						 
						
							2017-07-22 23:45:08 +02:00