Merge branch 'master' into release

Also updated assets, Version number
Incremented version
2026-02-05 08:39:55 +03:00 · 2017-07-02 22:52:26 +01:00 · 2017-06-04 15:38:49 +01:00 · 2017-06-04 15:38:29 +01:00 · 2017-05-07 19:35:51 +01:00 · 2017-05-07 19:35:34 +01:00
6 changed files with 35 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@ Homestead.yaml
 /public/dist
 .idea
 /public/plugins
-/public/css
-/public/js
+/public/css/*.map
+/public/js/*.map
 /public/bower
 /storage/images
 _ide_helper.php
--- a/public/css/export-styles.css
+++ b/public/css/export-styles.css
--- a/public/css/print-styles.css
+++ b/public/css/print-styles.css
@@ -0,0 +1 @@
+header{display:none}body{font-size:12px}.faded-small{display:none}.page-content{margin:0 auto}.print-hidden{display:none}.print-full-width{width:100%;float:none;display:block}h2{font-size:2em;line-height:1;margin-top:.6em;margin-bottom:.3em}
--- a/public/css/styles.css
+++ b/public/css/styles.css
--- a/public/js/common.js
+++ b/public/js/common.js
--- a/2
+++ b/2
@@ -1 +1 @@
-v0.17-dev
+v0.17.0
Author	SHA1	Message	Date
Dan Brown	67d9e24d8f	Merge branch 'master' into release Also updated assets, Version number	2017-07-02 22:52:26 +01:00
Dan Brown	3903fda6ca	Incremented version	2017-06-04 15:38:49 +01:00
Dan Brown	441e46ebaa	Merge branch 'v0.16' into release	2017-06-04 15:38:29 +01:00
Dan Brown	1f4260f359	Updated version for release v0.16.2	2017-05-07 19:35:51 +01:00
Dan Brown	dc0bf8ad4e	Merge branch 'master' into release	2017-05-07 19:35:34 +01:00
Dan Brown	102e326e6a	Updated JS and version for release v0.16.1	2017-04-30 19:51:23 +01:00
Dan Brown	2b25bf6f3b	Merge branch 'master' into release	2017-04-30 19:50:29 +01:00
Dan Brown	f93280696d	Updated assets for release v0.16	2017-04-23 20:42:28 +01:00
Dan Brown	1787391b07	Merge branch 'master' into release	2017-04-23 20:41:45 +01:00
Dan Brown	a74a8ee483	Updated version for v0.15.3	2017-03-23 22:22:16 +00:00
Dan Brown	7fa5405cb7	Merge branch 'master' into release	2017-03-23 22:21:04 +00:00
Dan Brown	6725ddcc41	Updated version for release v0.15.2	2017-03-05 15:50:52 +00:00
Dan Brown	bce941db3f	Merge branch 'master' into release	2017-03-05 15:49:47 +00:00
Dan Brown	6d926048ec	Updated to version v0.15.1	2017-02-27 16:59:10 +00:00
Dan Brown	5335c973b4	Merge branch 'master' into release	2017-02-27 16:58:20 +00:00
Dan Brown	15c3e5c96e	Updated assets for release v0.15	2017-02-27 14:58:02 +00:00
Dan Brown	a5d5904969	Merge branch 'master' into release	2017-02-27 14:57:38 +00:00
Dan Brown	598758b991	Updated version for v0.14.3	2017-02-05 21:23:27 +00:00
Dan Brown	9926e23bc8	Merge branch 'v0.14' into release	2017-02-05 21:21:54 +00:00
Dan Brown	5d3264bc63	Updated assets for release v0.14.2	2017-02-01 22:27:04 +00:00
Dan Brown	d71f819f95	Merge branch 'v0.14' into release	2017-02-01 22:22:38 +00:00
Dan Brown	ee13509760	Updated version number	2017-01-23 22:28:31 +00:00
Dan Brown	82d7bb1f32	Merge branch 'master' into release	2017-01-23 22:28:02 +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	65874d7b96	Updated assets for release v0.13.1	2016-11-27 19:42:33 +00:00
Dan Brown	ac9b8f405c	Merge fixes from master for release v0.13.1	2016-11-27 19:41:12 +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	c10d2a1493	Updated assets for release v0.12.2	2016-10-30 13:19:19 +00:00
Dan Brown	97bbf79ffd	Merge branch 'v0.12' into release	2016-10-30 13:18:23 +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	ef2ff5e093	Updated assets for release v0.12	2016-09-05 19:49:42 +01:00
Dan Brown	7caed3b0db	Merge branch 'master' into release	2016-09-05 19:35:21 +01:00
Dan Brown	45641d0754	Updated assets for release v0.11.2	2016-08-21 14:56:29 +01:00
Dan Brown	4b1d08ba99	Merge branch 'v0.11' into release	2016-08-21 14:55:11 +01:00
Dan Brown	160fa99ba4	Updated assets for release v0.11.1	2016-08-14 12:40:55 +01:00
Dan Brown	d2a5ab49ed	Merge branch 'v0.11' into release	2016-08-14 12:37:48 +01:00
Dan Brown	c6404d8917	Updated assets for release v0.11	2016-07-03 10:56:16 +01:00
Dan Brown	7113807f12	Merge branch 'master' into release	2016-07-03 10:52:04 +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	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	2cc36787f5	Updated assets for release 0.9.2	2016-04-15 19:57:02 +01:00
Dan Brown	448ac61b48	Merge branch 'master' into release	2016-04-15 19:52:59 +01:00
Dan Brown	753f6394f7	Merge branch 'master' into release	2016-04-12 20:09:14 +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	789693bde9	Merge branch 'v0.8' into release	2016-03-30 21:32:46 +01:00
Dan Brown	1fe933e4ea	Merge branch 'master' into release	2016-03-13 15:38:06 +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	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	a67c53826d	Updated assets for release 0.7.5	2016-02-25 21:24:09 +00:00
Dan Brown	14b131e850	Merge branch 'master' into release	2016-02-25 21:23:06 +00:00
Dan Brown	9b55a52b85	Updated assets for release 0.7.4	2016-02-11 22:35:01 +00:00
Dan Brown	db1d10e80f	Merge branch 'master' into release	2016-02-11 22:29:29 +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	8dec674cc3	Merge branch 'master' into release	2016-02-02 07:35:20 +00:00
Dan Brown	f784c03746	Merge branch 'master' into release	2016-02-01 18:31:04 +00:00
Dan Brown	148e172fe8	Updated assets for release 0.7	2016-01-31 18:03:55 +00:00
Dan Brown	56ae86646f	Merge branch 'master' into release	2016-01-31 18:01:25 +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	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	f184d763ad	Added build folder to release	2015-12-16 17:53:53 +00:00
Dan Brown	a91d42634d	Merge branch 'master' into release	2015-12-16 17:29:34 +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	d2cacf1945	Release update	2015-12-01 21:30:21 +00:00
Dan Brown	448ac1405b	Merge branch 'master' into release	2015-12-01 21:15:08 +00:00
Dan Brown	6ad21ce885	Added built assets for release	2015-11-30 21:59:34 +00:00
				`@@ -0,0 +1 @@`
				`header{display:none}body{font-size:12px}.faded-small{display:none}.page-content{margin:0 auto}.print-hidden{display:none}.print-full-width{width:100%;float:none;display:block}h2{font-size:2em;line-height:1;margin-top:.6em;margin-bottom:.3em}`