Commit Graph

43 Commits

Author SHA1 Message Date
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 7668a999a2
Fixed heavy init breakages made in last commit 2017-11-19 18:31:24 +00:00
Dan Brown ed88c623d6
Made some further laravel 5.5 cleanup
Removed old bootstrap files that are not needed and
amended composer to laravel upgrade guide
2017-11-19 17:59:12 +00:00
Dan Brown 09936566dd
Upgrade tinymce version 2017-09-20 20:26:34 +01:00
Bharadwaja G c1a1bc0135 Books grid view 2017-09-04 20:27:52 +05:30
Bharadwaja G 7f902e41c7 Resolved conflicts 2017-08-24 12:21:43 +05:30
Dan Brown 28a9bd514f
Updated header design 2017-08-19 15:33:22 +01:00
Dan Brown 666c86b108
Removed included fonts, Set to use system fonts.
All font definitions moved into _text.scss.
Needs override documentation to complete.
Relates to #423.
2017-08-19 14:33:55 +01:00
Nilesh Deepak ab6ff5fda2 3. New default.png 2017-07-13 12:26:01 +05:30
Nilesh Deepak 7a724f9134 Updated modifications. 2017-07-12 13:44:37 +05:30
Nilesh Deepak 144a6e469d Updated cover image upload and delete function. 2017-07-07 16:29:38 +05:30
Dan Brown e5fc6bf5fa
Moved from highlight.js to codemirror 2017-05-28 13:16:21 +01:00
Dan Brown 8990a9817f
Updated tinymce to latest version 2017-05-28 11:57:58 +01:00
Dan Brown 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
Dan Brown ab468bac3c
Updated build and versioning system
Added versioning file instead of using git tags
(Step towards removing git as a dependancy in the future)

Updated gulpfile to fit with verisioning system and cleaned
up node dependancies.

Fixes #108
2016-10-30 17:44:00 +00:00
Dan Brown f06770d91d
Updated TinyMCE version from 4.3.7 to 4.4.3 2016-09-06 19:29:09 +01:00
Dan Brown 78564ec61d Cleaned up tag edit interface 2016-05-14 20:02:00 +01:00
Dan Brown 8b36ca95a3 Improved font quality and cyrillic support
Fixes dodgy font rendering on windows
2016-04-20 19:11:33 +01:00
Dan Brown 26965fa08f Added a markdown editor 2016-03-25 14:41:15 +00:00
Dan Brown a06321675a Forced browser scrollbar, Added custom theme compatible logo
Also removed link to search all pages if no pages mached search on global search page.
Closes #74.
2016-03-13 14:00:24 +00:00
Dan Brown ced8c8e497 Merged branch autosaving_drafts into master 2016-03-12 16:31:37 +00:00
Dan Brown bf7852ce85 Organised test files & added page update draft tests
Also cleaned styling for new autosave ui parts.
Closes #36.
2016-03-12 16:31:02 +00:00
Dan Brown 9f11e045a5 Updated tinyMCE library from 4.3.2 to 4.3.7 2016-03-09 23:20:47 +00:00
Dan Brown e744d4c82c Changed color picker library and moved color logic to front end
Since the old library was GPLv3 i changed the color picker to tiny-color-picker which is MIT.
Also extracted the styles to a shared view and move color calculation logic to javascript side.
2016-03-06 10:52:10 +00:00
Nick Walke e3bdc391cd Closes #55. Allows you to set the primary color.
This certainly should not be seen as the final implementation of this.
I imagine that requests like this will happen for many other colors in
the system, it might be good at some point to allow them to upload their
own stylesheet to be used.
2016-03-03 12:01:14 -06:00
Dan Brown 105500e506 Tweaked page form header and added public uploads folder into repo 2016-02-07 10:21:09 +00:00
Dan Brown 9a470b07fd Added public build folder and support for a demo mode 2015-12-31 17:57:34 +00:00
Dan Brown 3300edc51a Changed google cdn libs/fonts to local content. No external access is now required 2015-12-30 21:15:41 +00:00
Dan Brown 6e75bcdc37 Updated tinymce 2015-12-28 16:16:27 +00:00
Dan Brown 8f7c642f32 Added custom user avatars 2015-12-09 22:30:55 +00:00
Dan Brown 3d9084816e Added libs into project and fixed ol lists 2015-11-30 21:44:23 +00:00
Dan Brown 7039695b65 Added chrome paste-image-upload. Closes #20. 2015-10-14 21:46:18 +01:00
Dan Brown 5af6656fae Extracted page form js and added better page content linking 2015-10-10 18:57:52 +01:00
Dan Brown 3aaab238d0 Added a logo and fixed old revision layout. Fixes #16. 2015-10-01 21:08:36 +01:00
Dan Brown 598fd7811b Rolled out redesign across application 2015-08-31 11:43:28 +01:00
Dan Brown 83c653fc32 Got react image manager working 2015-08-12 23:42:42 +01:00
Dan Brown 9f95cbcbfb Improved image serving and uploading. Fixes #7 and #8. 2015-08-09 14:53:44 +01:00
Dan Brown 71e2e057cb Added auth login control 2015-08-05 20:59:39 +01:00
Dan Brown 52cf7e4483 Added logo and favicon 2015-07-16 21:24:26 +01:00
Dan Brown c4d0f38a67 Integrated tinymce 2015-07-14 22:34:55 +01:00
Dan Brown 5d2243e2cc Remove old css files 2015-07-12 21:32:39 +01:00
Dan Brown 3c7bd297ea Added page editing 2015-07-12 21:31:15 +01:00
Dan Brown eaa1765c7a Initial commit 2015-07-12 20:01:42 +01:00