233 Commits

Author	SHA1	Message	Date
Dan Brown	421dd93ffd	Merge branch 'v0.26'	2019-08-06 21:50:56 +01:00
Dan Brown	ac0f47a4b2	Merge branch 'v0.26' into release	2019-08-06 21:41:06 +01:00
Dan Brown	4de719b325	Prevented potential apache image dir listing ... Closes #1545	2019-08-06 20:35:27 +01:00
Dan Brown	4b0c4e621a	Replaced use of custom 'baseUrl' helper with 'url' ... Also changed up how base URL setting was being done by manipulating incoming request URLs instead of altering then on generation.	2019-08-04 14:26:39 +01:00
Dan Brown	9e397a57a9	Removed tiny color picker library	2019-06-06 14:05:06 +01:00
Dan Brown	d87eb277dd	Replaced jquery sortable with sortablejs	2019-06-06 13:09:58 +01:00
Dan Brown	7502ba1bc8	Updated version and assets for release v0.26.2	2019-05-27 13:48:20 +01:00
Dan Brown	b70a5c0cdb	Updated version and assets for release v0.26.1	2019-05-07 23:05:47 +01:00
Dan Brown	220c2a4102	Updated version and assets for release v0.26.0	2019-05-06 18:58:56 +01:00
Dan Brown	e9914eb301	Merge branch 'master' into release	2019-05-06 18:57:58 +01:00
Dan Brown	884e20cc5e	Updated TinyMCE to version 4.9.4	2019-04-21 13:49:46 +01:00
Dan Brown	7906602291	Updated version and assets for release v0.25.2	2019-03-10 13:45:21 +00:00
Dan Brown	25bc28a1be	Updated version and assets for release v0.25.1	2019-01-20 15:42:32 +00:00
Dan Brown	95b3e78573	Updated version and assets for release v0.25.0	2019-01-12 22:48:53 +00:00
Dan Brown	63a345bc93	Merge branch 'master' into release	2019-01-12 22:47:07 +00:00
Dan Brown	a3ccde8698	Updated TinyMCE and fixed TinyMCE/Codemirror cursor jumping ... For #1162	2019-01-12 19:23:18 +00:00
Dan Brown	e093a172cb	Updated assets and version for release v0.24.3	2018-11-27 21:52:20 +00:00
Dan Brown	bc116b45b5	Re-updated assets for release v0.24.2	2018-11-10 16:10:22 +00:00
Dan Brown	7770966fed	Updated assets for release v0.24.2	2018-11-10 16:01:55 +00:00
Dan Brown	bf74f53ca7	Updated assets for release and incremented version	2018-09-24 12:18:27 +01:00
Dan Brown	9d67efb4a4	Merge branch 'master' into release	2018-09-24 12:08:21 +01:00
Dan Brown	6543020fd2	Updated tinymce to v4.8.3	2018-09-22 22:58:06 +01:00
Dan Brown	4bdec0d214	Updated version and assets for release v0.23	2018-07-29 20:28:49 +01:00
Dan Brown	30d4674657	Updated assets for release v0.22	2018-05-28 14:19:14 +01:00
Dan Brown	bab99a26ec	Updated assets and version for v0.21 release	2018-04-22 20:21:22 +01:00
Dan Brown	9a7fecd269	Merge branch 'master' into release	2018-04-22 20:19:02 +01:00
Abijeet	93f92e9e16	Updated the TinyMCE to version 4.7.9. ... Added some code to remove the box-shadow around the TinyMCE toolbar. Signed-off-by: Abijeet <abijeetpatro@gmail.com>	2018-04-14 18:30:34 +05:30
Dan Brown	1a72208d27	Added configurable robots.txt file. ... Deleted old static file. Default output depends on app-public setting. Otherwise can be overidden in `.env` file via `ALLOW_ROBOTS` Otherwise view file can be customized. Fixes #779	2018-03-31 12:41:40 +01:00
Dan Brown	6102f66daa	Updated assets for release v0.20.1	2018-03-25 16:58:14 +01:00
Dan Brown	c6134d162d	Merge branch 'master' into release	2018-03-25 16:54:48 +01:00
Dan Brown	0a1546daea	Moved jQuery to use NPM and fixed some asset refs	2018-03-17 15:20:15 +00:00
Dan Brown	81fa021083	Finished migrated from icon-font to SVG	2018-02-17 19:49:00 +00:00
Dan Brown	2046f9b9de	Updated assets for release v0.20.0	2018-02-11 18:20:17 +00:00
Dan Brown	ac3ba594a4	Merge branch 'master' into release and updated version	2018-02-11 18:19:38 +00:00
Dan Brown	56264551e7	Added drawing icon and made drawio disablable	2018-01-20 15:00:54 +00:00
Dan Brown	22df25a480	Updated assets and version for v0.19.0	2017-12-10 18:21:07 +00:00
Dan Brown	8b30c7f02e	Merge branch 'master' into release	2017-12-10 18:19:20 +00:00
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	757cdddc7c	Updated version and JS for release v0.18.5	2017-11-11 18:33:04 +00:00
Dan Brown	df95e99680	Updated assets and version for release v0.18.4	2017-10-15 19:28:29 +01:00
Dan Brown	e90da18ada	Updated assets and version for v0.18.2 release	2017-10-01 18:12:59 +01:00
Dan Brown	6258175922	Updated assets and version for v0.18.1 release	2017-09-20 21:36:17 +01:00
Dan Brown	15736777a0	Merge branch 'master' into release	2017-09-20 21:35:33 +01:00
Dan Brown	09936566dd	Upgrade tinymce version	2017-09-20 20:26:34 +01:00
Dan Brown	75915e8a94	Updated assets for release v0.18	2017-09-10 17:07:57 +01:00
Dan Brown	9bde0ae4ea	Merge branch 'master' into release	2017-09-10 17:05:05 +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
Dan Brown	0c802d1f86	Updated assets and version for release v0.17.4	2017-07-28 13:04:21 +01:00
Dan Brown	26e93dc8c1	Updated assets and version for release v0.17.2	2017-07-22 16:49:07 +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
Dan Brown	70ee636d87	Updated css and version for release	2017-07-10 20:52:32 +01:00
Nilesh Deepak	144a6e469d	Updated cover image upload and delete function.	2017-07-07 16:29:38 +05:30
Dan Brown	67d9e24d8f	Merge branch 'master' into release ... Also updated assets, Version number	2017-07-02 22:52:26 +01:00
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	102e326e6a	Updated JS and version for release v0.16.1	2017-04-30 19:51:23 +01:00
Dan Brown	f93280696d	Updated assets for release v0.16	2017-04-23 20:42:28 +01:00
Dan Brown	15c3e5c96e	Updated assets for release v0.15	2017-02-27 14:58:02 +00:00
Dan Brown	5d3264bc63	Updated assets for release v0.14.2	2017-02-01 22:27:04 +00:00
Dan Brown	cdfda508d8	Updated assets for release v0.14	2017-01-22 12:36:10 +00:00
Dan Brown	da941e584f	Merge branch 'master' into release ready for v0.14	2017-01-22 12:31:27 +00: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	65874d7b96	Updated assets for release v0.13.1	2016-11-27 19:42:33 +00:00
Dan Brown	8d1419a12e	Update assets and version for release v0.13	2016-11-13 12:29:52 +00:00
Dan Brown	04f7a7d301	Merge branch 'master' into release	2016-11-13 12:26:56 +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	c10d2a1493	Updated assets for release v0.12.2	2016-10-30 13:19:19 +00:00
Dan Brown	f7b01ae53d	Updated assets for release v0.12.1	2016-09-06 20:50:15 +01:00
Dan Brown	d704e1dbba	Merge branch 'master' into release	2016-09-06 20:49:15 +01: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	ef2ff5e093	Updated assets for release v0.12	2016-09-05 19:49:42 +01:00
Dan Brown	45641d0754	Updated assets for release v0.11.2	2016-08-21 14:56:29 +01:00
Dan Brown	160fa99ba4	Updated assets for release v0.11.1	2016-08-14 12:40:55 +01:00
Dan Brown	c6404d8917	Updated assets for release v0.11	2016-07-03 10:56:16 +01:00
Dan Brown	be711215e8	Updated assets for release v0.10	2016-05-22 15:12:47 +01:00
Dan Brown	7e3b404240	Merge branch 'master' into release for version v0.10	2016-05-22 15:11:50 +01:00
Dan Brown	78564ec61d	Cleaned up tag edit interface	2016-05-14 20:02:00 +01:00
Dan Brown	e86901ca20	Updated assets for release v0.9.3	2016-05-03 21:13:02 +01:00
Dan Brown	bdfa61c8b2	Merge branch 'v0.9' into release	2016-05-03 21:11:01 +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	2cc36787f5	Updated assets for release 0.9.2	2016-04-15 19:57:02 +01:00
Dan Brown	b1faf65934	Updated assets for release 0.9.0	2016-04-09 15:49:02 +01:00
Dan Brown	09f478bd74	Merge branch 'master' into release	2016-04-09 15:47:14 +01:00
Dan Brown	a0497feddd	Updated assets for release 0.8.2	2016-03-30 21:44:30 +01:00
Dan Brown	26965fa08f	Added a markdown editor	2016-03-25 14:41:15 +00:00
Dan Brown	724b4b5a70	Updated assets for release 0.8.0	2016-03-13 15:15:14 +00:00
Dan Brown	1778a56146	Merge branch 'master' into release	2016-03-13 15:13:23 +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	744865fcb2	Updated assets for release 0.7.6	2016-03-06 13:28:44 +00:00
Dan Brown	7f8c8b448d	Merged branch master into release	2016-03-06 13:26:29 +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	a67c53826d	Updated assets for release 0.7.5	2016-02-25 21:24:09 +00:00
Dan Brown	9b55a52b85	Updated assets for release 0.7.4	2016-02-11 22:35:01 +00:00
Dan Brown	1be576966f	Updated assets for release 0.7.3	2016-02-08 20:47:33 +00:00
Dan Brown	b97e792c5f	Merge branch 'master' into release	2016-02-08 20:45:48 +00: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	148e172fe8	Updated assets for release 0.7	2016-01-31 18:03:55 +00:00
Dan Brown	1d2b6fdfa2	Add updated assets	2016-01-02 14:50:59 +00:00
Dan Brown	4fc75beed4	Merge branch 'master' into release	2016-01-02 14:49:05 +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	3b3bc0c4bf	Updated compiled assets	2015-12-31 17:26:22 +00:00
Dan Brown	910faab88e	Merge branch 'master' into release	2015-12-31 17:22:03 +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	f184d763ad	Added build folder to release	2015-12-16 17:53:53 +00:00
Dan Brown	f517ef3616	Added new asset structure	2015-12-16 17:27:53 +00:00
Dan Brown	e99507ddcf	Merge branch 'master' into release	2015-12-16 17:21:21 +00:00
Dan Brown	8f7c642f32	Added custom user avatars	2015-12-09 22:30:55 +00:00
Dan Brown	d2cacf1945	Release update	2015-12-01 21:30:21 +00:00
Dan Brown	6ad21ce885	Added built assets for release	2015-11-30 21:59:34 +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