]>
_ Git - fluidbook-html5.git/log
Vincent Vanwaelscappel [Thu, 23 Aug 2018 16:50:13 +0000 (18:50 +0200)]
wip #809 @3
Vincent Vanwaelscappel [Thu, 23 Aug 2018 16:49:05 +0000 (18:49 +0200)]
done #2192 @2
Vincent Vanwaelscappel [Wed, 22 Aug 2018 18:46:10 +0000 (20:46 +0200)]
wip #809 @4
Vincent Vanwaelscappel [Wed, 22 Aug 2018 14:59:21 +0000 (16:59 +0200)]
wip #809 @2
Vincent Vanwaelscappel [Wed, 22 Aug 2018 14:59:08 +0000 (16:59 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Wed, 22 Aug 2018 09:44:40 +0000 (11:44 +0200)]
#2183
Vincent Vanwaelscappel [Tue, 21 Aug 2018 13:56:34 +0000 (15:56 +0200)]
#2183 @1.5
Vincent Vanwaelscappel [Mon, 20 Aug 2018 16:16:13 +0000 (18:16 +0200)]
wip #809 @3
Vincent Vanwaelscappel [Mon, 20 Aug 2018 12:52:32 +0000 (14:52 +0200)]
wip #809 @2
Vincent Vanwaelscappel [Fri, 17 Aug 2018 18:03:05 +0000 (20:03 +0200)]
wip #809 @0:40
Vincent Vanwaelscappel [Fri, 17 Aug 2018 17:18:32 +0000 (19:18 +0200)]
wip #809 @4
Vincent Vanwaelscappel [Fri, 17 Aug 2018 13:19:06 +0000 (15:19 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Fri, 17 Aug 2018 10:20:17 +0000 (12:20 +0200)]
#2183
Vincent Vanwaelscappel [Fri, 17 Aug 2018 10:18:05 +0000 (12:18 +0200)]
wip #2183 @1
Vincent Vanwaelscappel [Thu, 16 Aug 2018 17:41:10 +0000 (19:41 +0200)]
wip #2183 @1.5
Vincent Vanwaelscappel [Tue, 14 Aug 2018 16:24:53 +0000 (18:24 +0200)]
wip #809 @1
Vincent Vanwaelscappel [Tue, 14 Aug 2018 09:43:07 +0000 (11:43 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Tue, 14 Aug 2018 09:25:29 +0000 (11:25 +0200)]
#2170
Vincent Vanwaelscappel [Mon, 13 Aug 2018 16:34:07 +0000 (18:34 +0200)]
fix #2170 @2
Vincent Vanwaelscappel [Mon, 13 Aug 2018 14:29:06 +0000 (16:29 +0200)]
fix #2176 @1.5
Vincent Vanwaelscappel [Mon, 13 Aug 2018 13:41:51 +0000 (15:41 +0200)]
fix #2178 @0.5
Stephen Cameron [Thu, 2 Aug 2018 15:49:29 +0000 (17:49 +0200)]
Allow SVGs to be used as normal images in menu and fix bug that stopped normal URLs being used for extra icons. Done #1762 @1.75
Stephen Cameron [Thu, 2 Aug 2018 13:36:28 +0000 (15:36 +0200)]
Done #2174 @2
Stephen Cameron [Wed, 1 Aug 2018 12:24:49 +0000 (14:24 +0200)]
WIP #2170 @2
Vincent Vanwaelscappel [Fri, 27 Jul 2018 15:44:29 +0000 (17:44 +0200)]
wip #809 @6
Vincent Vanwaelscappel [Fri, 27 Jul 2018 13:05:14 +0000 (15:05 +0200)]
fix #2167 @0:10
Vincent Vanwaelscappel [Thu, 26 Jul 2018 15:26:16 +0000 (17:26 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 26 Jul 2018 14:36:16 +0000 (16:36 +0200)]
.
Vincent Vanwaelscappel [Thu, 26 Jul 2018 13:10:36 +0000 (15:10 +0200)]
fix #2163 @2
Vincent Vanwaelscappel [Wed, 25 Jul 2018 17:30:11 +0000 (19:30 +0200)]
wip #809 @6
Vincent Vanwaelscappel [Wed, 25 Jul 2018 12:23:46 +0000 (14:23 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Wed, 25 Jul 2018 10:30:57 +0000 (12:30 +0200)]
fix #2159 @0.5
Vincent Vanwaelscappel [Tue, 24 Jul 2018 17:50:48 +0000 (19:50 +0200)]
wip #809 @1
Vincent Vanwaelscappel [Tue, 24 Jul 2018 16:44:11 +0000 (18:44 +0200)]
wip #809 @0.5
Vincent Vanwaelscappel [Tue, 24 Jul 2018 16:34:45 +0000 (18:34 +0200)]
wip #809 @2
Vincent Vanwaelscappel [Tue, 24 Jul 2018 16:24:37 +0000 (18:24 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Tue, 24 Jul 2018 16:04:45 +0000 (18:04 +0200)]
fix #2091 @0.5
Vincent Vanwaelscappel [Tue, 24 Jul 2018 15:36:11 +0000 (17:36 +0200)]
fix #1948 @0.25
Vincent Vanwaelscappel [Tue, 24 Jul 2018 15:00:59 +0000 (17:00 +0200)]
fix #2158 @0.5
Vincent Vanwaelscappel [Tue, 24 Jul 2018 13:55:59 +0000 (15:55 +0200)]
fix #2152 @6
Vincent Vanwaelscappel [Tue, 24 Jul 2018 10:07:26 +0000 (12:07 +0200)]
#2154
Vincent Vanwaelscappel [Fri, 20 Jul 2018 13:23:31 +0000 (15:23 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
# Conflicts:
# _index.html
# js/libs/fluidbook/fluidbook.js
# js/libs/fluidbook/fluidbook.loader.js
Vincent Vanwaelscappel [Fri, 20 Jul 2018 13:10:03 +0000 (15:10 +0200)]
Merge remote-tracking branch 'origin/master' into dynamicpagesnumber
Vincent Vanwaelscappel [Fri, 20 Jul 2018 13:06:23 +0000 (15:06 +0200)]
Merge remote-tracking branch 'origin/master' into advancedseo
Vincent Vanwaelscappel [Fri, 20 Jul 2018 12:35:16 +0000 (14:35 +0200)]
Merge remote-tracking branch 'origin/master' into ecommerceremarkable
Vincent Vanwaelscappel [Fri, 20 Jul 2018 10:03:37 +0000 (12:03 +0200)]
fix #2112 @0.25
Vincent Vanwaelscappel [Thu, 19 Jul 2018 15:53:35 +0000 (17:53 +0200)]
wip #2150 @0.5
Vincent Vanwaelscappel [Thu, 19 Jul 2018 15:38:52 +0000 (17:38 +0200)]
wip #2150 @4
Vincent Vanwaelscappel [Thu, 19 Jul 2018 10:41:18 +0000 (12:41 +0200)]
wip #2150 @1
Vincent Vanwaelscappel [Thu, 19 Jul 2018 10:14:12 +0000 (12:14 +0200)]
Merge remote-tracking branch 'origin/master' into ecommerceremarkable
Vincent Vanwaelscappel [Wed, 18 Jul 2018 16:46:51 +0000 (18:46 +0200)]
wip #1911 @1.5
Vincent Vanwaelscappel [Wed, 18 Jul 2018 15:37:37 +0000 (17:37 +0200)]
fix #2106 @1.5
Vincent Vanwaelscappel [Tue, 17 Jul 2018 13:45:41 +0000 (15:45 +0200)]
wip #2112 @1.5
Vincent Vanwaelscappel [Fri, 13 Jul 2018 16:20:09 +0000 (18:20 +0200)]
wip #2150 @2
Vincent Vanwaelscappel [Wed, 11 Jul 2018 17:27:14 +0000 (19:27 +0200)]
wip #2132 @1
Vincent Vanwaelscappel [Wed, 11 Jul 2018 15:46:13 +0000 (17:46 +0200)]
wip #2132 @6
Vincent Vanwaelscappel [Tue, 10 Jul 2018 17:41:02 +0000 (19:41 +0200)]
wip #2132 @1
Vincent Vanwaelscappel [Tue, 10 Jul 2018 16:51:19 +0000 (18:51 +0200)]
wip #2048 @3
Vincent Vanwaelscappel [Mon, 9 Jul 2018 12:55:41 +0000 (14:55 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 5 Jul 2018 16:30:27 +0000 (18:30 +0200)]
wip #2116
Vincent Vanwaelscappel [Thu, 5 Jul 2018 12:52:11 +0000 (14:52 +0200)]
fix #2126 @1
Vincent Vanwaelscappel [Thu, 5 Jul 2018 11:44:44 +0000 (13:44 +0200)]
fix #2126 @1.5
Vincent Vanwaelscappel [Tue, 3 Jul 2018 18:51:35 +0000 (20:51 +0200)]
wip #2116
Vincent Vanwaelscappel [Thu, 28 Jun 2018 17:18:48 +0000 (19:18 +0200)]
wip #2116
Vincent Vanwaelscappel [Thu, 28 Jun 2018 13:52:13 +0000 (15:52 +0200)]
Merge remote-tracking branch 'origin/master' into bourbon
Vincent Vanwaelscappel [Thu, 28 Jun 2018 13:44:47 +0000 (15:44 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
# Conflicts:
# js/libs/fluidbook/fluidbook.js
Vincent Vanwaelscappel [Wed, 27 Jun 2018 15:29:22 +0000 (17:29 +0200)]
wip #2119 @2
Vincent Vanwaelscappel [Wed, 27 Jun 2018 13:27:43 +0000 (15:27 +0200)]
Merge remote-tracking branch 'origin/master' into diaporama
Vincent Vanwaelscappel [Wed, 27 Jun 2018 13:18:13 +0000 (15:18 +0200)]
fix #2121 @0.5
Vincent Vanwaelscappel [Wed, 27 Jun 2018 12:44:28 +0000 (14:44 +0200)]
Merge remote-tracking branch 'origin/master' into diaporama
# Conflicts:
# js/libs/fluidbook/fluidbook.js
# js/libs/fluidbook/fluidbook.menu.js
Vincent Vanwaelscappel [Tue, 26 Jun 2018 17:18:47 +0000 (19:18 +0200)]
wip #809 @6
Vincent Vanwaelscappel [Tue, 26 Jun 2018 16:12:58 +0000 (18:12 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Tue, 26 Jun 2018 13:18:39 +0000 (15:18 +0200)]
wip #2117 @0:10
Vincent Vanwaelscappel [Tue, 26 Jun 2018 10:39:12 +0000 (12:39 +0200)]
.
Vincent Vanwaelscappel [Mon, 25 Jun 2018 17:49:47 +0000 (19:49 +0200)]
wip #809 @6
Vincent Vanwaelscappel [Mon, 25 Jun 2018 17:47:49 +0000 (19:47 +0200)]
wip #2113 @2
Vincent Vanwaelscappel [Fri, 22 Jun 2018 18:30:28 +0000 (20:30 +0200)]
wip #809 @6
Vincent Vanwaelscappel [Thu, 21 Jun 2018 20:56:50 +0000 (22:56 +0200)]
wip #809 @8
Vincent Vanwaelscappel [Thu, 21 Jun 2018 10:34:12 +0000 (12:34 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 21 Jun 2018 10:16:28 +0000 (12:16 +0200)]
fix #2111 @0.75
Vincent Vanwaelscappel [Wed, 20 Jun 2018 09:43:28 +0000 (11:43 +0200)]
try #2106 @0.25
Vincent Vanwaelscappel [Tue, 19 Jun 2018 17:29:02 +0000 (19:29 +0200)]
wip #809 @3
Vincent Vanwaelscappel [Tue, 19 Jun 2018 13:43:47 +0000 (15:43 +0200)]
wip #809 @7
Vincent Vanwaelscappel [Fri, 15 Jun 2018 14:14:42 +0000 (16:14 +0200)]
fix #2099 @0:01
Vincent Vanwaelscappel [Thu, 14 Jun 2018 09:17:57 +0000 (11:17 +0200)]
fix #2099 @0:05
Vincent Vanwaelscappel [Mon, 11 Jun 2018 13:39:19 +0000 (15:39 +0200)]
Merge remote-tracking branch 'origin/master' into bourbon
Vincent Vanwaelscappel [Mon, 11 Jun 2018 13:37:07 +0000 (15:37 +0200)]
try #2094 @0.75
Vincent Vanwaelscappel [Wed, 6 Jun 2018 15:44:50 +0000 (17:44 +0200)]
.
Vincent Vanwaelscappel [Wed, 6 Jun 2018 12:52:13 +0000 (14:52 +0200)]
wip #2048 @1
Vincent Vanwaelscappel [Wed, 6 Jun 2018 11:23:51 +0000 (13:23 +0200)]
wip #2048 @1
Vincent Vanwaelscappel [Wed, 6 Jun 2018 10:51:19 +0000 (12:51 +0200)]
wip #1998 @4
Vincent Vanwaelscappel [Thu, 31 May 2018 14:42:14 +0000 (16:42 +0200)]
Merge remote-tracking branch 'origin/master' into bourbon
Vincent Vanwaelscappel [Thu, 31 May 2018 13:48:58 +0000 (15:48 +0200)]
fix #2076 @0:10
Vincent Vanwaelscappel [Thu, 31 May 2018 13:33:34 +0000 (15:33 +0200)]
Merge remote-tracking branch 'origin/master' into bourbon
Vincent Vanwaelscappel [Thu, 31 May 2018 13:31:25 +0000 (15:31 +0200)]
Merge remote-tracking branch 'origin/master' into ecommerceremarkable
Vincent Vanwaelscappel [Thu, 31 May 2018 13:28:46 +0000 (15:28 +0200)]
wip #1998 @1
Vincent Vanwaelscappel [Fri, 25 May 2018 15:26:32 +0000 (17:26 +0200)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Fri, 25 May 2018 15:22:46 +0000 (17:22 +0200)]
Merge branch 'master' into scorm2004
# Conflicts:
# js/libs/scorm/scorm.js
Vincent Vanwaelscappel [Wed, 23 May 2018 19:13:57 +0000 (21:13 +0200)]
wip #2048 @7
Vincent Vanwaelscappel [Tue, 22 May 2018 10:20:33 +0000 (12:20 +0200)]
fix #2059 @0.25