Commit Graph

293 Commits

Author SHA1 Message Date
756ee0b172 Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master 2017-09-02 17:36:58 +01:00
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
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
d8e1f52ddd Made new sidebar layout responsive 2017-08-27 15:16:51 +01:00
baea92b206 Migrated entity selector out of angular 2017-08-27 14:31:34 +01:00
36f524a354 Updated page view styles to align with 2017 update 2017-08-26 15:41:33 +01:00
7f902e41c7 Resolved conflicts 2017-08-24 12:21:43 +05:30
76ae5c7398 Removes some unused code. 2017-08-23 01:04:36 +05:30
6920d6eef1 Fixes the comment check for linked comment. 2017-08-22 01:39:09 +05:30
b5cd3bff3c Added functionality to highlight a comment. 2017-08-22 01:31:11 +05:30
ac07cb41b6 Fixed formatting and added error messages. 2017-08-21 02:21:31 +05:30
e8fa58f201 Removed code from the directives. 2017-08-21 00:38:59 +05:30
1f6994b62c Added code for permissions, removed unnecessary code. 2017-08-20 21:26:44 +05:30
47d82a1ac2 Merge branch 'master' of https://github.com/BookStackApp/BookStack
Conflicts:
	resources/assets/js/vues/vues.js
2017-08-20 20:35:56 +05:30
703d579561 Refactored Angular code to instead use VueJS, left with permissions, testing and load testing. 2017-08-20 20:21:32 +05:30
ed375bfaf7 Refactored Angular code to instead use VueJS, left with permissions, testing and load testing. 2017-08-20 20:21:27 +05:30
039ee5d06c Aligned entity dash name and fixed chapter toggle on dash 2017-08-19 14:04:38 +01:00
afc66b3c3d Migrated attachment manager to vue 2017-08-19 13:55:56 +01:00
d3e4a1a6f9 Converted tag autosuggestion to vue component 2017-08-13 13:25:30 +01:00
b023699f1b Converted tag manager to be fully vue based 2017-08-13 11:50:40 +01:00
f338dbe3f8 Started vueifying tag system 2017-08-10 20:11:25 +01:00
ab07f7df6c Converted image manager into vue component 2017-08-09 21:33:00 +01:00
a59d73de7b Fixed bug causing image manager popup not to show 2017-08-07 19:32:31 +01:00
1ac7618bb1 Updated clipboard lib reference and version used 2017-08-06 21:21:20 +01:00
2a069880cd Converted jQuery bits into raw JS components 2017-08-06 21:08:03 +01:00
5e5928a8a6 Added vanilla JS component system 2017-08-06 18:01:49 +01:00
e9831a7507 Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master 2017-08-01 19:24:33 +01:00
ac7a8a8e1e Expanded the available editor shortcuts in both editors
Adds formatting on ctrl+nums for everything on formats dropdown.
Closes #85.
2017-07-27 19:07:58 +01:00
164aea3a3a Merge pull request #448 from 10bass/subdir-search-fix
Update search.js
2017-07-27 16:17:57 +01:00
5cd08ab2f5 Fixed custom plugin when developing 2017-07-27 15:43:17 +01:00
b4dcde252b Update search.js
Trying to apply an exact match or tag would previously redirect to /search, regardless of the installation path.
2017-07-24 20:06:15 -04:00
bc067e9ad4 Updated dropdowns to hide after option click
Fixes #429
2017-07-22 14:03:06 +01: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
e88a06291e Updated toggle thumbnails function. 2017-07-05 16:09:20 +05:30
026de8c5ca Thumbnail toggle function. 2017-07-05 12:48:41 +05:30
314d98abc3 Removed logs, Updated version, Fixed inconsistent subheader 2017-07-02 20:33:32 +01:00
69c50b9b48 Migrated markdown editor actions to new cm editor 2017-07-02 19:35:13 +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
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
e155c52256 #47 - Fixes a few issues with the code. 2017-06-10 22:55:36 +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