c5b58d8fd2 
								
							 
						 
						
							
							
								
								Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation  
							
							
							
						 
						
							2017-07-02 16:09:12 +01:00  
				
					
						
							
							
								 
						
							
								4db2c274e2 
								
							 
						 
						
							
							
								
								Prevent empty-state actions visible without permission.  
							
							... 
							
							
							
							Fixes  #411  
						
							2017-07-02 15:59:40 +01:00  
				
					
						
							
							
								 
						
							
								d5d83da766 
								
							 
						 
						
							
							
								
								Added diff and sh code types  
							
							... 
							
							
							
							Verified changes to ensure fixes  #296 . 
							
						 
						
							2017-07-01 16:10:52 +01:00  
				
					
						
							
							
								 
						
							
								de6d8a811c 
								
							 
						 
						
							
							
								
								Added quick lang-selection options to code editor  
							
							
							
						 
						
							2017-07-01 15:50:28 +01:00  
				
					
						
							
							
								 
						
							
								a94844b6b7 
								
							 
						 
						
							
							
								
								Fixed code block selection and drag/drop issues  
							
							
							
						 
						
							2017-07-01 15:38:11 +01:00  
				
					
						
							
							
								 
						
							
								968e7b8b72 
								
							 
						 
						
							
							
								
								Finished off main functionality of custom tinymce code editor  
							
							
							
						 
						
							2017-07-01 13:23:46 +01:00  
				
					
						
							
							
								 
						
							
								b2b8706d05 
								
							 
						 
						
							
							
								
								Translate errors.php  
							
							
							
						 
						
							2017-07-01 16:38:43 +09:00  
				
					
						
							
							
								 
						
							
								2d345fe454 
								
							 
						 
						
							
							
								
								Translate entities.php  
							
							
							
						 
						
							2017-07-01 16:38:20 +09:00  
				
					
						
							
							
								 
						
							
								7bec70d429 
								
							 
						 
						
							
							
								
								Translate common.php  
							
							
							
						 
						
							2017-07-01 16:37:07 +09:00  
				
					
						
							
							
								 
						
							
								60710e7fb4 
								
							 
						 
						
							
							
								
								Translate auth.php  
							
							
							
						 
						
							2017-07-01 16:33:54 +09:00  
				
					
						
							
							
								 
						
							
								f10d3a8564 
								
							 
						 
						
							
							
								
								Translate validation.php  
							
							
							
						 
						
							2017-07-01 16:32:36 +09:00  
				
					
						
							
							
								 
						
							
								b020520366 
								
							 
						 
						
							
							
								
								Translate passwords.php  
							
							
							
						 
						
							2017-07-01 16:32:02 +09:00  
				
					
						
							
							
								 
						
							
								52010e5820 
								
							 
						 
						
							
							
								
								Translate pagination.php  
							
							
							
						 
						
							2017-07-01 16:31:32 +09:00  
				
					
						
							
							
								 
						
							
								75eca03b05 
								
							 
						 
						
							
							
								
								Translate settings.php  
							
							
							
						 
						
							2017-06-24 20:49:24 +09:00  
				
					
						
							
							
								 
						
							
								b8ebefd803 
								
							 
						 
						
							
							
								
								Translate components.php  
							
							
							
						 
						
							2017-06-24 20:48:34 +09:00  
				
					
						
							
							
								 
						
							
								168c66815e 
								
							 
						 
						
							
							
								
								add `ja` to settings  
							
							
							
						 
						
							2017-06-24 20:46:38 +09:00  
				
					
						
							
							
								 
						
							
								26e703a1cd 
								
							 
						 
						
							
							
								
								translate activities.php  
							
							
							
						 
						
							2017-06-19 00:02:09 +09:00  
				
					
						
							
							
								 
						
							
								c8be214ee0 
								
							 
						 
						
							
							
								
								Started tinymce code editor components  
							
							
							
						 
						
							2017-06-17 15:07:55 +01:00  
				
					
						
							
							
								 
						
							
								2060cdb931 
								
							 
						 
						
							
							
								
								Added code highlighting syntax modes  
							
							
							
						 
						
							2017-06-17 12:41:18 +01:00  
				
					
						
							
							
								 
						
							
								fd50efb503 
								
							 
						 
						
							
							
								
								#47  - Putting the comments right under the page.  
							
							
							
						 
						
							2017-06-11 11:41:33 +05:30  
				
					
						
							
							
								 
						
							
								8dab31b87a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							
							
						 
						
							2017-06-10 22:56:07 +05:30  
				
					
						
							
							
								 
						
							
								e155c52256 
								
							 
						 
						
							
							
								
								#47  - Fixes a few issues with the code.  
							
							
							
						 
						
							2017-06-10 22:55:36 +05:30  
				
					
						
							
							
								 
						
							
								c76e7c706c 
								
							 
						 
						
							
							
								
								adding a comment on top.  
							
							
							
						 
						
							2017-06-10 19:47:45 +05:30  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								e647ec22b1 
								
							 
						 
						
							
							
								
								#47  - Adds direct linking to comments.  
							
							
							
						 
						
							2017-06-08 01:14:53 +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  
				
					
						
							
							
								 
						
							
								9558f84b97 
								
							 
						 
						
							
							
								
								#47  - Adds functionality to delete a comment. Also reduces the number of watchers.  
							
							
							
						 
						
							2017-06-04 18:52:44 +05:30  
				
					
						
							
							
								 
						
							
								2fd421b115 
								
							 
						 
						
							
							
								
								#47  - Adds comment level permissions to the front-end.  
							
							
							
						 
						
							2017-06-04 11:17:14 +05:30  
				
					
						
							
							
								 
						
							
								0bda5554dd 
								
							 
						 
						
							
							
								
								Getting the latest changes  
							
							
							
						 
						
							2017-06-04 10:20:01 +05:30  
				
					
						
							
							
								 
						
							
								860d4d4be5 
								
							 
						 
						
							
							
								
								#47  - Changes the way we are handling fetching of data for the comment section.  
							
							
							
						 
						
							2017-05-30 09:02:47 +05:30  
				
					
						
							
							
								 
						
							
								88f93f76dd 
								
							 
						 
						
							
							
								
								Updated the markdown editor to use codemirror as editor  
							
							... 
							
							
							
							Improved scroll sync system to be smarter 
							
						 
						
							2017-05-28 16:02:46 +01:00  
				
					
						
							
							
								 
						
							
								e5fc6bf5fa 
								
							 
						 
						
							
							
								
								Moved from highlight.js to codemirror  
							
							
							
						 
						
							2017-05-28 13:16:21 +01:00  
				
					
						
							
							
								 
						
							
								9a97995f18 
								
							 
						 
						
							
							
								
								#47  Displays the time for comments and border bottom for sub comments.  
							
							
							
						 
						
							2017-05-25 08:04:19 +05:30  
				
					
						
							
							
								 
						
							
								0ff5aad9c0 
								
							 
						 
						
							
							
								
								#47  Hides the reply button based if comments are 2 levels deep.  
							
							
							
						 
						
							2017-05-24 07:02:11 +05:30  
				
					
						
							
							
								 
						
							
								03e5d61798 
								
							 
						 
						
							
							
								
								#47  Implements the reply and edit functionality for comments.  
							
							
							
						 
						
							2017-05-16 00:40:14 +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  
				
					
						
							
							
								 
						
							
								ad4642c2c4 
								
							 
						 
						
							
							
								
								Enabled translation when not logged in  
							
							... 
							
							
							
							Reads from the Accept-Language HTTP header.
Also fixed some encoding for ES translations.
Fixes  #375  
							
						 
						
							2017-04-29 16:47:41 +01:00  
				
					
						
							
							
								 
						
							
								92108d710d 
								
							 
						 
						
							
							
								
								Re-enabled html in markdown editor  
							
							... 
							
							
							
							Fixes  #378  
						
							2017-04-29 16:10:38 +01:00  
				
					
						
							
							
								 
						
							
								c3ea0d333e 
								
							 
						 
						
							
							
								
								#47  - Adds functionality to display child comments. Also has some code towards the reply functionality.  
							
							
							
						 
						
							2017-04-27 02:35:29 +05:30  
				
					
						
							
							
								 
						
							
								82e2c523e6 
								
							 
						 
						
							
							
								
								Fixed chapter breadcrumbs and testing issues  
							
							
							
						 
						
							2017-04-22 14:08:12 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								87e18b8068 
								
							 
						 
						
							
							
								
								Merge pull request  #357  from diegoseso/master  
							
							... 
							
							
							
							Spanish translation completed 
							
						 
						
							2017-04-19 06:40:00 +01:00  
				
					
						
							
							
								 
						
							
								607a2c91fc 
								
							 
						 
						
							
							
								
								Fixing encoding of files affecting accents.  
							
							
							
						 
						
							2017-04-18 23:41:19 +02: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  
				
					
						
							
							
								 
						
							
								fde970ba59 
								
							 
						 
						
							
							
								
								Switched out markdown render  
							
							... 
							
							
							
							Fixes  #304 .
Fixes  #359 . 
						
							2017-04-17 12:21:10 +01:00  
				
					
						
							
							
								 
						
							
								1a09d88891 
								
							 
						 
						
							
							
								
								Added fade effect to page content highlighting  
							
							... 
							
							
							
							Closes  #314  
						
							2017-04-16 16:46:55 +01:00  
				
					
						
							
							
								 
						
							
								46c01ecba2 
								
							 
						 
						
							
							
								
								Merge pull request  #358  from jendrol/master  
							
							... 
							
							
							
							Add Slovak translation 
							
						 
						
							2017-04-16 15:06:32 +01:00  
				
					
						
							
							
								 
						
							
								544ece03a5 
								
							 
						 
						
							
							
								
								Merge pull request  #360  from Abijeet/spellcheck-fix  
							
							... 
							
							
							
							Fixes  #354 , Adds the spellchecker option 
						
							2017-04-16 15:02:20 +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  
				
					
						
							
							
								 
						
							
								ad125327c0 
								
							 
						 
						
							
							
								
								Migrated to custom gulp setup and conintue search interface  
							
							
							
						 
						
							2017-04-14 18:47:33 +01:00  
				
					
						
							
							
								 
						
							
								29a4110d8f 
								
							 
						 
						
							
							
								
								Fixes   #354 , Adds the spellchecker option  
							
							... 
							
							
							
							Uses the browser_spellchecker option documented here - https://www.tinymce.com/docs/configure/spelling/#browser_spellcheck  
							
						 
						
							2017-04-13 23:57:57 +05:30  
				
					
						
							
							
								 
						
							
								9b639f715f 
								
							 
						 
						
							
							
								
								Add Slovak translation  
							
							
							
						 
						
							2017-04-11 23:20:52 +02:00  
				
					
						
							
							
								 
						
							
								46f3d78c8a 
								
							 
						 
						
							
							
								
								Fixed entity type filter bug in new search system  
							
							
							
						 
						
							2017-04-09 21:12:13 +01:00  
				
					
						
							
							
								 
						
							
								1338ae2fc3 
								
							 
						 
						
							
							
								
								Started search interface, Added in vue and moved fonts  
							
							
							
						 
						
							2017-04-09 20:59:57 +01:00  
				
					
						
							
							
								 
						
							
								b488e969bb 
								
							 
						 
						
							
							
								
								Reaching 100 % Spanish translation  
							
							
							
						 
						
							2017-04-06 23:12:05 +02:00  
				
					
						
							
							
								 
						
							
								1377296ef4 
								
							 
						 
						
							
							
								
								Translating to spanish entities errors and settings  
							
							
							
						 
						
							2017-04-06 09:35:24 +02:00  
				
					
						
							
							
								 
						
							
								01cb22af37 
								
							 
						 
						
							
							
								
								Added tag searches and advanced filters to new search  
							
							
							
						 
						
							2017-03-27 18:05:34 +01:00  
				
					
						
							
							
								 
						
							
								070d4aeb6c 
								
							 
						 
						
							
							
								
								Started implementation of new search system  
							
							
							
						 
						
							2017-03-19 12:48:44 +00:00  
				
					
						
							
							
								 
						
							
								668ce26269 
								
							 
						 
						
							
							
								
								Fixed back button behaviour on books edit  
							
							... 
							
							
							
							As reported in #339  
							
						 
						
							2017-03-19 08:32:04 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								7163997367 
								
							 
						 
						
							
							
								
								Merge pull request  #334  from diegoseso/master  
							
							... 
							
							
							
							First spanish translation effort 
							
						 
						
							2017-03-05 14:18:55 +00:00  
				
					
						
							
							
								 
						
							
								2385a6c29b 
								
							 
						 
						
							
							
								
								Merge pull request  #325  from arietimmerman/dutchbranch  
							
							... 
							
							
							
							Dutch Language Files 
							
						 
						
							2017-03-05 14:15:47 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f7645824d9 
								
							 
						 
						
							
							
								
								First spanish translation effort  
							
							
							
						 
						
							2017-03-03 00:21:33 +01:00  
				
					
						
							
							
								 
						
							
								e3eefba745 
								
							 
						 
						
							
							
								
								Fixed export testing and updated travis settings  
							
							
							
						 
						
							2017-02-26 21:39:15 +00:00  
				
					
						
							
							
								 
						
							
								253132afdf 
								
							 
						 
						
							
							
								
								Added chapter export options  
							
							... 
							
							
							
							Closes  #177  
						
							2017-02-26 14:25:02 +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  
				
					
						
							
							
								 
						
							
								b0e849f413 
								
							 
						 
						
							
							
								
								Added checkbox sytax parsing to markdown lists  
							
							... 
							
							
							
							Closes  #319  
						
							2017-02-25 13:16:26 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								4a2a539c08 
								
							 
						 
						
							
							
								
								Merge pull request  #295  from ReeseSebastian/master  
							
							... 
							
							
							
							Updated and improved german translation 
							
						 
						
							2017-02-23 19:19:21 +00:00  
				
					
						
							
							
								 
						
							
								4214fcd2fa 
								
							 
						 
						
							
							
								
								Updated Dutch language files  
							
							
							
						 
						
							2017-02-11 11:58:45 +01:00  
				
					
						
							
							
								 
						
							
								b2b64fb853 
								
							 
						 
						
							
							
								
								Started with Dutch translation  
							
							
							
						 
						
							2017-02-10 22:10:41 +01:00  
				
					
						
							
							
								 
						
							
								a6128a1df1 
								
							 
						 
						
							
							
								
								Merge bugfixes from  branch 'v0.14'  
							
							
							
						 
						
							2017-02-05 21:24:15 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								86625a7642 
								
							 
						 
						
							
							
								
								Neatened up social login/register buttons  
							
							
							
						 
						
							2017-02-05 15:28:53 +00:00  
				
					
						
							
							
								 
						
							
								ee495450cc 
								
							 
						 
						
							
							
								
								Improved multi-line callout rendering  
							
							... 
							
							
							
							Closes  #300  
						
							2017-02-05 14:47:26 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								410e967eb1 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							
							
						 
						
							2017-02-05 16:46:32 +05:30  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								54d1fcde5b 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/BookStackApp/BookStack  
							
							
							
						 
						
							2017-02-02 00:43:54 +01:00  
				
					
						
							
							
								 
						
							
								1c656d6556 
								
							 
						 
						
							
							
								
								Updated and improved german translation  
							
							
							
						 
						
							2017-02-02 00:43:24 +01:00  
				
					
						
							
							
								 
						
							
								80f844139c 
								
							 
						 
						
							
							
								
								Fixed missing subscript styling  
							
							... 
							
							
							
							Closes  #284  
						
							2017-02-01 22:20:44 +00:00  
				
					
						
							
							
								 
						
							
								148350009c 
								
							 
						 
						
							
							
								
								#47  Adds comment permission to each role.  
							
							
							
						 
						
							2017-01-29 14:25:20 +05:30  
				
					
						
							
							
								 
						
							
								33d4844f17 
								
							 
						 
						
							
							
								
								Fixed role 'manage own permissions' permission  
							
							
							
						 
						
							2017-01-22 12:16:02 +00:00  
				
					
						
							
							
								 
						
							
								5c60f27a7d 
								
							 
						 
						
							
							
								
								Merge branch 'page_transclusion'  
							
							... 
							
							
							
							Closes  #123  
						
							2017-01-21 16:17:33 +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