a5e49f642b 
								
							 
						 
						
							
							
								
								Merge branch 'disable-comments' of git://github.com/Abijeet/BookStack into Abijeet-disable-comments  
							
							
							
						 
						
							2017-12-07 19:15:26 +00:00  
				
					
						
							
							
								 
						
							
								6ee35f55cc 
								
							 
						 
						
							
							
								
								Refactored image picker to js component  
							
							... 
							
							
							
							Also adjusted default cover image size 
							
						 
						
							2017-12-06 17:32:29 +00:00  
				
					
						
							
							
								 
						
							
								bc1302a8d8 
								
							 
						 
						
							
							
								
								Merge branch 'BookStackApp-master' of git://github.com/OsmosysSoftware/BookStack into OsmosysSoftware-BookStackApp-master  
							
							
							
						 
						
							2017-12-06 15:52:54 +00:00  
				
					
						
							
							
								 
						
							
								7a5bd23909 
								
							 
						 
						
							
							
								
								Added language translation for the new settings icons.  
							
							
							
						 
						
							2017-11-16 00:22:22 +05:30  
				
					
						
							
							
								 
						
							
								db51cee2d8 
								
							 
						 
						
							
							
								
								Prevented custom homepage being deleted  
							
							... 
							
							
							
							Fixes  #546  
						
							2017-10-15 19:14:46 +01:00  
				
					
						
							
							
								 
						
							
								8e652f5d8f 
								
							 
						 
						
							
							
								
								Added 'Spanish Argentina' translation.  
							
							
							
						 
						
							2017-09-19 13:43:17 -03:00  
				
					
						
							
							
								 
						
							
								ab7f5def04 
								
							 
						 
						
							
							
								
								Russian lang added  
							
							
							
						 
						
							2017-09-12 16:42:04 +03:00  
				
					
						
							
							
								 
						
							
								d1a4ff9308 
								
							 
						 
						
							
							
								
								Merge pull request  #501  from cipi1965/master  
							
							... 
							
							
							
							Added Italian language 
							
						 
						
							2017-09-10 16:29:44 +01:00  
				
					
						
							
							
								 
						
							
								f8315fb9c4 
								
							 
						 
						
							
							
								
								Added Italian language  
							
							
							
						 
						
							2017-09-10 16:55:23 +02:00  
				
					
						
							
							
								 
						
							
								874386ceab 
								
							 
						 
						
							
							
								
								Used trans_choice on profile view  
							
							... 
							
							
							
							Closes  #417  
						
							2017-09-10 13:43:08 +01:00  
				
					
						
							
							
								 
						
							
								621142a46e 
								
							 
						 
						
							
							
								
								Removed outdated translations and updated tests  
							
							
							
						 
						
							2017-09-09 18:41:59 +01:00  
				
					
						
							
							
								 
						
							
								0275d2ad58 
								
							 
						 
						
							
							
								
								Added loading icons, Added comment activity  
							
							
							
						 
						
							2017-09-09 17:06:30 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e02fcbe983 
								
							 
						 
						
							
							
								
								Added Book cover image description in all languages.  
							
							
							
						 
						
							2017-09-05 12:46:31 +05:30  
				
					
						
							
							
								 
						
							
								1c88d21abf 
								
							 
						 
						
							
							
								
								Fixed books cover image ratio.  
							
							
							
						 
						
							2017-09-04 20:50:24 +05:30  
				
					
						
							
							
								 
						
							
								c1a1bc0135 
								
							 
						 
						
							
							
								
								Books grid view  
							
							
							
						 
						
							2017-09-04 20:27:52 +05:30  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								756ee0b172 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master  
							
							
							
						 
						
							2017-09-02 17:36:58 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								36f524a354 
								
							 
						 
						
							
							
								
								Updated page view styles to align with 2017 update  
							
							
							
						 
						
							2017-08-26 15:41:33 +01:00  
				
					
						
							
							
								 
						
							
								5187d3fa78 
								
							 
						 
						
							
							
								
								Updated chapter views with new design  
							
							
							
						 
						
							2017-08-26 14:36:48 +01:00  
				
					
						
							
							
								 
						
							
								8fcbe44d3e 
								
							 
						 
						
							
							
								
								Updated styles for auth and books views.  
							
							... 
							
							
							
							Also added sourcemaps to gulp sass build 
							
						 
						
							2017-08-26 13:24:55 +01:00  
				
					
						
							
							
								 
						
							
								7f902e41c7 
								
							 
						 
						
							
							
								
								Resolved conflicts  
							
							
							
						 
						
							2017-08-24 12:21:43 +05:30  
				
					
						
							
							
								 
						
							
								ac07cb41b6 
								
							 
						 
						
							
							
								
								Fixed formatting and added error messages.  
							
							
							
						 
						
							2017-08-21 02:21:31 +05:30  
				
					
						
							
							
								 
						
							
								3da8c01c1f 
								
							 
						 
						
							
							
								
								Rolled out new design further  
							
							
							
						 
						
							2017-08-20 13:57:25 +01:00  
				
					
						
							
							
								 
						
							
								e9831a7507 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master  
							
							
							
						 
						
							2017-08-01 19:24:33 +01:00  
				
					
						
							
							
								 
						
							
								9e0c931573 
								
							 
						 
						
							
							
								
								Polish translation  
							
							
							
						 
						
							2017-07-13 16:00:42 +02:00  
				
					
						
							
							
								 
						
							
								f37509062e 
								
							 
						 
						
							
							
								
								Merge pull request  #8  from OsmosysSoftware/feature-181  
							
							... 
							
							
							
							Issue 181 
							
						 
						
							2017-07-12 18:41:35 +05:30  
				
					
						
							
							
								 
						
							
								7a724f9134 
								
							 
						 
						
							
							
								
								Updated modifications.  
							
							
							
						 
						
							2017-07-12 13:44:37 +05:30  
				
					
						
							
							
								 
						
							
								844976c85b 
								
							 
						 
						
							
							
								
								Revert "Revert "Bookstack grid view.""  
							
							
							
						 
						
							2017-07-12 11:40:50 +05:30  
				
					
						
							
							
								 
						
							
								cc553cc93d 
								
							 
						 
						
							
							
								
								Added labels for 'Thumbnail toggle' and 'Cover image' in different languages.  
							
							
							
						 
						
							2017-07-05 16:11:15 +05:30  
				
					
						
							
							
								 
						
							
								c5b58d8fd2 
								
							 
						 
						
							
							
								
								Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation  
							
							
							
						 
						
							2017-07-02 16:09:12 +01:00  
				
					
						
							
							
								 
						
							
								968e7b8b72 
								
							 
						 
						
							
							
								
								Finished off main functionality of custom tinymce code editor  
							
							
							
						 
						
							2017-07-01 13:23:46 +01:00  
				
					
						
							
							
								 
						
							
								af72f0d490 
								
							 
						 
						
							
							
								
								Bookstack grid view.  
							
							
							
						 
						
							2017-06-29 18:54:04 +05:30  
				
					
						
							
							
								 
						
							
								168c66815e 
								
							 
						 
						
							
							
								
								add `ja` to settings  
							
							
							
						 
						
							2017-06-24 20:46:38 +09:00  
				
					
						
							
							
								 
						
							
								4efe3b41da 
								
							 
						 
						
							
							
								
								#47  - Added translations for other language files using Google translate.  
							
							
							
						 
						
							2017-06-10 15:21:28 +05:30  
				
					
						
							
							
								 
						
							
								218376a41c 
								
							 
						 
						
							
							
								
								#47  - Fetching values from language files.  
							
							
							
						 
						
							2017-06-08 01:30:43 +05:30  
				
					
						
							
							
								 
						
							
								38fe756725 
								
							 
						 
						
							
							
								
								#47  - Fixes a couple of issues found during testing - delete not updating the UI, delete none not working properly.  
							
							
							
						 
						
							2017-06-07 23:45:29 +05:30  
				
					
						
							
							
								 
						
							
								652a67ad65 
								
							 
						 
						
							
							
								
								Removes some unncessary code.  
							
							
							
						 
						
							2017-06-06 23:20:40 +05:30  
				
					
						
							
							
								 
						
							
								5bd9da6054 
								
							 
						 
						
							
							
								
								#47  - Adds various translations in English, and a few code improvements.  
							
							
							
						 
						
							2017-06-06 01:46:59 +05:30  
				
					
						
							
							
								 
						
							
								7c6fe8c4e2 
								
							 
						 
						
							
							
								
								#47  - Changes the location of the reply and edit comment box.  
							
							
							
						 
						
							2017-06-05 00:20:37 +05:30  
				
					
						
							
							
								 
						
							
								689d1eb082 
								
							 
						 
						
							
							
								
								#47  - Adds a cancel button for edit and reply button.  
							
							
							
						 
						
							2017-06-04 20:43:56 +05:30  
				
					
						
							
							
								 
						
							
								06d75e1804 
								
							 
						 
						
							
							
								
								#47  - Updates the total comments when a comment is added.  
							
							
							
						 
						
							2017-06-04 20:12:01 +05:30  
				
					
						
							
							
								 
						
							
								8b82753218 
								
							 
						 
						
							
							
								
								#47  - Gets rid of simplemde  
							
							
							
						 
						
							2017-05-03 02:42:04 +05:30  
				
					
						
							
							
								 
						
							
								3368fe42d8 
								
							 
						 
						
							
							
								
								Merge pull request  #10  from BookStackApp/master  
							
							... 
							
							
							
							Latest changes 
							
						 
						
							2017-05-03 01:41:08 +05:30  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								46c01ecba2 
								
							 
						 
						
							
							
								
								Merge pull request  #358  from jendrol/master  
							
							... 
							
							
							
							Add Slovak translation 
							
						 
						
							2017-04-16 15:06:32 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								0e0945ef84 
								
							 
						 
						
							
							
								
								Finished off UI for search system  
							
							
							
						 
						
							2017-04-15 15:04:30 +01:00  
				
					
						
							
							
								 
						
							
								9b639f715f 
								
							 
						 
						
							
							
								
								Add Slovak translation  
							
							
							
						 
						
							2017-04-11 23:20:52 +02:00  
				
					
						
							
							
								 
						
							
								d4e790d3cf 
								
							 
						 
						
							
							
								
								Added lang tests and update export text keys  
							
							
							
						 
						
							2017-03-05 15:10:06 +00:00  
				
					
						
							
							
								 
						
							
								9b35aa42a2 
								
							 
						 
						
							
							
								
								Fixed spanish encoding, Added new lang to settings  
							
							
							
						 
						
							2017-03-05 14:43:43 +00:00  
				
					
						
							
							
								 
						
							
								86625a7642 
								
							 
						 
						
							
							
								
								Neatened up social login/register buttons  
							
							
							
						 
						
							2017-02-05 15:28:53 +00:00  
				
					
						
							
							
								 
						
							
								148350009c 
								
							 
						 
						
							
							
								
								#47  Adds comment permission to each role.  
							
							
							
						 
						
							2017-01-29 14:25:20 +05:30  
				
					
						
							
							
								 
						
							
								26da81a3b0 
								
							 
						 
						
							
							
								
								Added pt_BR to language dropdown and renamed folder  
							
							
							
						 
						
							2017-01-18 20:04:29 +00:00  
				
					
						
							
							
								 
						
							
								d3dc73ca06 
								
							 
						 
						
							
							
								
								remove trailing spaces  
							
							
							
						 
						
							2017-01-16 15:34:34 +01:00  
				
					
						
							
							
								 
						
							
								d5ea15e6dd 
								
							 
						 
						
							
							
								
								fix typo  
							
							
							
						 
						
							2017-01-16 14:51:45 +01:00  
				
					
						
							
							
								 
						
							
								dabf149411 
								
							 
						 
						
							
							
								
								Added user setting system and added user-lang option  
							
							... 
							
							
							
							Supports #115  
							
						 
						
							2017-01-15 16:27:24 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								0775cd09a1 
								
							 
						 
						
							
							
								
								Extracted text for remaining views  
							
							
							
						 
						
							2016-12-04 14:08:04 +00:00  
				
					
						
							
							
								 
						
							
								96075dee7b 
								
							 
						 
						
							
							
								
								Extracted text from page views & standardised breadcrumbs  
							
							
							
						 
						
							2016-12-03 18:35:40 +00:00  
				
					
						
							
							
								 
						
							
								066adf3cea 
								
							 
						 
						
							
							
								
								Moved text for errors and form views.  
							
							... 
							
							
							
							Updated 404 page with additional links 
							
						 
						
							2016-12-03 13:31:54 +00:00  
				
					
						
							
							
								 
						
							
								57dc53ceff 
								
							 
						 
						
							
							
								
								Extracted text from book & chapter views  
							
							
							
						 
						
							2016-11-17 13:33:07 +00:00  
				
					
						
							
							
								 
						
							
								694a9459c1 
								
							 
						 
						
							
							
								
								Moved text from auth views into lang files  
							
							
							
						 
						
							2016-11-13 16:34:28 +00:00  
				
					
						
							
							
								 
						
							
								da10c50945 
								
							 
						 
						
							
							
								
								Added app name header display setting + extracted setting text  
							
							... 
							
							
							
							Closes  #194  
						
							2016-09-22 18:53:22 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								9dc9724e15 
								
							 
						 
						
							
							
								
								Laravel 5.3 upgrade ( #189 )  
							
							... 
							
							
							
							* Started move to laravel 5.3
* Started updating login & registration flows for laravel 5.3 update
* Updated app emails to notification system
* Fixed registations bugs and removed email confirmation model
* Fixed large portion of laravel post-upgrade issues
* Fixed and tested LDAP process 
							
						 
						
							2016-09-17 18:22:04 +01:00  
				
					
						
							
							
								 
						
							
								9baa96d41c 
								
							 
						 
						
							
							
								
								Added chapter move actions.  Closes   #86  
							
							
							
						 
						
							2016-06-25 15:31:38 +01:00  
				
					
						
							
							
								 
						
							
								7f99903fdb 
								
							 
						 
						
							
							
								
								Finished off page move functionality  
							
							
							
						 
						
							2016-06-12 12:14:14 +01:00  
				
					
						
							
							
								 
						
							
								a14b5c33fd 
								
							 
						 
						
							
							
								
								Added missing permission checkboxes and improved image AJAX permission responses  
							
							
							
						 
						
							2016-02-27 20:52:46 +00:00  
				
					
						
							
							
								 
						
							
								d6c00a85ad 
								
							 
						 
						
							
							
								
								Fixed incorrect notification when deleting a page  
							
							
							
						 
						
							2016-02-10 12:48:29 +00:00  
				
					
						
							
							
								 
						
							
								8af012bc2a 
								
							 
						 
						
							
							
								
								Added filtering to activity lists.  Fixes   #14 .  
							
							
							
						 
						
							2015-08-30 11:47:58 +01:00  
				
					
						
							
							
								 
						
							
								f37a886205 
								
							 
						 
						
							
							
								
								Updated views for permissions and added notifications.  Fixes   #2  and  #7  
							
							
							
						 
						
							2015-08-29 16:00:19 +01:00  
				
					
						
							
							
								 
						
							
								ae95d0a239 
								
							 
						 
						
							
							
								
								Added permission system  
							
							
							
						 
						
							2015-08-29 15:03:42 +01:00  
				
					
						
							
							
								 
						
							
								732f3a9986 
								
							 
						 
						
							
							
								
								Fixed some bugs and added a proper home page  
							
							
							
						 
						
							2015-08-16 20:11:21 +01:00  
				
					
						
							
							
								 
						
							
								5d9d096028 
								
							 
						 
						
							
							
								
								Added activity history to to all entities.  Fixes   #12  
							
							
							
						 
						
							2015-08-16 18:59:23 +01:00  
				
					
						
							
							
								 
						
							
								eaa1765c7a 
								
							 
						 
						
							
							
								
								Initial commit  
							
							
							
						 
						
							2015-07-12 20:01:42 +01:00