]> _ Git - fluidbook-html5.git/log
fluidbook-html5.git
7 years agowip #2208 @1
Vincent Vanwaelscappel [Fri, 28 Sep 2018 12:54:34 +0000 (14:54 +0200)]
wip #2208 @1

7 years agowip #2208 @1
Vincent Vanwaelscappel [Fri, 28 Sep 2018 12:02:19 +0000 (14:02 +0200)]
wip #2208 @1

7 years agowip #2208 @5
Vincent Vanwaelscappel [Thu, 27 Sep 2018 16:26:57 +0000 (18:26 +0200)]
wip #2208 @5

7 years agowip #2208 @5
Vincent Vanwaelscappel [Wed, 26 Sep 2018 15:53:51 +0000 (17:53 +0200)]
wip #2208 @5

7 years agoMerge remote-tracking branch 'origin/master' into averyform
Vincent Vanwaelscappel [Wed, 26 Sep 2018 12:22:35 +0000 (14:22 +0200)]
Merge remote-tracking branch 'origin/master' into averyform

7 years agotry #2270 @0.5
Vincent Vanwaelscappel [Tue, 25 Sep 2018 17:17:29 +0000 (19:17 +0200)]
try #2270 @0.5

7 years agoMerge remote-tracking branch 'origin/master' into averyform
Vincent Vanwaelscappel [Tue, 25 Sep 2018 16:48:58 +0000 (18:48 +0200)]
Merge remote-tracking branch 'origin/master' into averyform

7 years agotry #2270 @1
Vincent Vanwaelscappel [Tue, 25 Sep 2018 16:19:56 +0000 (18:19 +0200)]
try #2270 @1

7 years agodone #2264 @0.25
Vincent Vanwaelscappel [Fri, 21 Sep 2018 15:04:04 +0000 (17:04 +0200)]
done #2264 @0.25

7 years agowip #2217 @3
Vincent Vanwaelscappel [Fri, 21 Sep 2018 13:04:55 +0000 (15:04 +0200)]
wip #2217 @3

7 years agowip #2217 @2
Vincent Vanwaelscappel [Thu, 20 Sep 2018 19:09:39 +0000 (21:09 +0200)]
wip #2217 @2

7 years agowip #2217 @0.5
Vincent Vanwaelscappel [Thu, 20 Sep 2018 17:07:53 +0000 (19:07 +0200)]
wip #2217 @0.5

7 years agowip #2217 @0.5
Vincent Vanwaelscappel [Thu, 20 Sep 2018 16:55:12 +0000 (18:55 +0200)]
wip #2217 @0.5

7 years agowip #2229 @0.5
Vincent Vanwaelscappel [Thu, 20 Sep 2018 15:22:36 +0000 (17:22 +0200)]
wip #2229 @0.5

7 years agowip #2263 @2
Vincent Vanwaelscappel [Thu, 20 Sep 2018 14:22:59 +0000 (16:22 +0200)]
wip #2263 @2

7 years agodone #2257 @1.5
Vincent Vanwaelscappel [Thu, 20 Sep 2018 09:38:14 +0000 (11:38 +0200)]
done #2257 @1.5

7 years agowip #2258 @0.5
Vincent Vanwaelscappel [Wed, 19 Sep 2018 14:14:56 +0000 (16:14 +0200)]
wip #2258 @0.5

7 years agowip #2208 @0.5
Vincent Vanwaelscappel [Mon, 17 Sep 2018 17:03:40 +0000 (19:03 +0200)]
wip #2208 @0.5

7 years agodone #2244 @1.5
Vincent Vanwaelscappel [Fri, 14 Sep 2018 17:44:41 +0000 (19:44 +0200)]
done #2244 @1.5

7 years agodone #2206 @1.25
Vincent Vanwaelscappel [Fri, 14 Sep 2018 14:08:07 +0000 (16:08 +0200)]
done #2206 @1.25

7 years ago#2215
Vincent Vanwaelscappel [Wed, 5 Sep 2018 15:26:54 +0000 (17:26 +0200)]
#2215

7 years ago#2210
Vincent Vanwaelscappel [Tue, 4 Sep 2018 16:27:16 +0000 (18:27 +0200)]
#2210

7 years agotry #2210 @0.5
Vincent Vanwaelscappel [Tue, 4 Sep 2018 16:23:08 +0000 (18:23 +0200)]
try #2210 @0.5

7 years agowip #2207 @2
Vincent Vanwaelscappel [Tue, 4 Sep 2018 14:34:54 +0000 (16:34 +0200)]
wip #2207 @2

7 years agowip #2207 @4
Vincent Vanwaelscappel [Tue, 4 Sep 2018 13:26:59 +0000 (15:26 +0200)]
wip #2207 @4

7 years agowip #2207 @6
Vincent Vanwaelscappel [Mon, 3 Sep 2018 15:47:44 +0000 (17:47 +0200)]
wip #2207 @6

7 years agofix #2199 @1.5
Vincent Vanwaelscappel [Mon, 27 Aug 2018 13:37:36 +0000 (15:37 +0200)]
fix #2199 @1.5

7 years agofix #2197 @0.5
Vincent Vanwaelscappel [Mon, 27 Aug 2018 10:27:40 +0000 (12:27 +0200)]
fix #2197 @0.5

7 years agodone #2194 @0.75
Vincent Vanwaelscappel [Fri, 24 Aug 2018 13:25:08 +0000 (15:25 +0200)]
done #2194 @0.75

7 years agowip #2190 @0.5
Vincent Vanwaelscappel [Wed, 22 Aug 2018 13:57:10 +0000 (15:57 +0200)]
wip #2190 @0.5

7 years ago#2183
Vincent Vanwaelscappel [Wed, 22 Aug 2018 09:44:40 +0000 (11:44 +0200)]
#2183

7 years ago#2183 @1.5
Vincent Vanwaelscappel [Tue, 21 Aug 2018 13:56:34 +0000 (15:56 +0200)]
#2183 @1.5

7 years ago#2183
Vincent Vanwaelscappel [Fri, 17 Aug 2018 10:20:17 +0000 (12:20 +0200)]
#2183

7 years agowip #2183 @1
Vincent Vanwaelscappel [Fri, 17 Aug 2018 10:18:05 +0000 (12:18 +0200)]
wip #2183 @1

7 years agowip #2183 @1.5
Vincent Vanwaelscappel [Thu, 16 Aug 2018 17:41:10 +0000 (19:41 +0200)]
wip #2183 @1.5

7 years ago#2170
Vincent Vanwaelscappel [Tue, 14 Aug 2018 09:25:29 +0000 (11:25 +0200)]
#2170

7 years agofix #2170 @2
Vincent Vanwaelscappel [Mon, 13 Aug 2018 16:34:07 +0000 (18:34 +0200)]
fix #2170 @2

7 years agofix #2176 @1.5
Vincent Vanwaelscappel [Mon, 13 Aug 2018 14:29:06 +0000 (16:29 +0200)]
fix #2176 @1.5

7 years agofix #2178 @0.5
Vincent Vanwaelscappel [Mon, 13 Aug 2018 13:41:51 +0000 (15:41 +0200)]
fix #2178 @0.5

7 years agoAllow SVGs to be used as normal images in menu and fix bug that stopped normal URLs...
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

7 years agoDone #2174 @2
Stephen Cameron [Thu, 2 Aug 2018 13:36:28 +0000 (15:36 +0200)]
Done #2174 @2

7 years agoWIP #2170 @2
Stephen Cameron [Wed, 1 Aug 2018 12:24:49 +0000 (14:24 +0200)]
WIP #2170 @2

7 years agofix #2167 @0:10
Vincent Vanwaelscappel [Fri, 27 Jul 2018 13:05:14 +0000 (15:05 +0200)]
fix #2167 @0:10

7 years ago.
Vincent Vanwaelscappel [Thu, 26 Jul 2018 14:36:16 +0000 (16:36 +0200)]
.

7 years agofix #2163 @2
Vincent Vanwaelscappel [Thu, 26 Jul 2018 13:10:36 +0000 (15:10 +0200)]
fix #2163 @2

7 years agofix #2159 @0.5
Vincent Vanwaelscappel [Wed, 25 Jul 2018 10:30:57 +0000 (12:30 +0200)]
fix #2159 @0.5

7 years agofix #2091 @0.5
Vincent Vanwaelscappel [Tue, 24 Jul 2018 16:04:45 +0000 (18:04 +0200)]
fix #2091 @0.5

7 years agofix #1948 @0.25
Vincent Vanwaelscappel [Tue, 24 Jul 2018 15:36:11 +0000 (17:36 +0200)]
fix #1948 @0.25

7 years agofix #2158 @0.5
Vincent Vanwaelscappel [Tue, 24 Jul 2018 15:00:59 +0000 (17:00 +0200)]
fix #2158 @0.5

7 years agofix #2152 @6
Vincent Vanwaelscappel [Tue, 24 Jul 2018 13:55:59 +0000 (15:55 +0200)]
fix #2152 @6

7 years ago#2154
Vincent Vanwaelscappel [Tue, 24 Jul 2018 10:07:26 +0000 (12:07 +0200)]
#2154

7 years agoMerge remote-tracking branch 'origin/master' into dynamicpagesnumber
Vincent Vanwaelscappel [Fri, 20 Jul 2018 13:10:03 +0000 (15:10 +0200)]
Merge remote-tracking branch 'origin/master' into dynamicpagesnumber

7 years agoMerge remote-tracking branch 'origin/master' into advancedseo
Vincent Vanwaelscappel [Fri, 20 Jul 2018 13:06:23 +0000 (15:06 +0200)]
Merge remote-tracking branch 'origin/master' into advancedseo

7 years agoMerge remote-tracking branch 'origin/master' into ecommerceremarkable
Vincent Vanwaelscappel [Fri, 20 Jul 2018 12:35:16 +0000 (14:35 +0200)]
Merge remote-tracking branch 'origin/master' into ecommerceremarkable

7 years agofix #2112 @0.25
Vincent Vanwaelscappel [Fri, 20 Jul 2018 10:03:37 +0000 (12:03 +0200)]
fix #2112 @0.25

7 years agowip #2150 @0.5
Vincent Vanwaelscappel [Thu, 19 Jul 2018 15:53:35 +0000 (17:53 +0200)]
wip #2150 @0.5

7 years agowip #2150 @4
Vincent Vanwaelscappel [Thu, 19 Jul 2018 15:38:52 +0000 (17:38 +0200)]
wip #2150 @4

7 years agowip #2150 @1
Vincent Vanwaelscappel [Thu, 19 Jul 2018 10:41:18 +0000 (12:41 +0200)]
wip #2150 @1

7 years agoMerge remote-tracking branch 'origin/master' into ecommerceremarkable
Vincent Vanwaelscappel [Thu, 19 Jul 2018 10:14:12 +0000 (12:14 +0200)]
Merge remote-tracking branch 'origin/master' into ecommerceremarkable

7 years agowip #1911 @1.5
Vincent Vanwaelscappel [Wed, 18 Jul 2018 16:46:51 +0000 (18:46 +0200)]
wip #1911 @1.5

7 years agofix #2106 @1.5
Vincent Vanwaelscappel [Wed, 18 Jul 2018 15:37:37 +0000 (17:37 +0200)]
fix #2106 @1.5

7 years agowip #2112 @1.5
Vincent Vanwaelscappel [Tue, 17 Jul 2018 13:45:41 +0000 (15:45 +0200)]
wip #2112 @1.5

7 years agowip #2150 @2
Vincent Vanwaelscappel [Fri, 13 Jul 2018 16:20:09 +0000 (18:20 +0200)]
wip #2150 @2

7 years agowip #2132 @1
Vincent Vanwaelscappel [Wed, 11 Jul 2018 17:27:14 +0000 (19:27 +0200)]
wip #2132 @1

7 years agowip #2132 @6
Vincent Vanwaelscappel [Wed, 11 Jul 2018 15:46:13 +0000 (17:46 +0200)]
wip #2132 @6

7 years agowip #2132 @1
Vincent Vanwaelscappel [Tue, 10 Jul 2018 17:41:02 +0000 (19:41 +0200)]
wip #2132 @1

7 years agowip #2048 @3
Vincent Vanwaelscappel [Tue, 10 Jul 2018 16:51:19 +0000 (18:51 +0200)]
wip #2048 @3

7 years agowip #2116
Vincent Vanwaelscappel [Thu, 5 Jul 2018 16:30:27 +0000 (18:30 +0200)]
wip #2116

7 years agofix #2126 @1
Vincent Vanwaelscappel [Thu, 5 Jul 2018 12:52:11 +0000 (14:52 +0200)]
fix #2126 @1

7 years agofix #2126 @1.5
Vincent Vanwaelscappel [Thu, 5 Jul 2018 11:44:44 +0000 (13:44 +0200)]
fix #2126 @1.5

7 years agowip #2116
Vincent Vanwaelscappel [Tue, 3 Jul 2018 18:51:35 +0000 (20:51 +0200)]
wip #2116

7 years agowip #2116
Vincent Vanwaelscappel [Thu, 28 Jun 2018 17:18:48 +0000 (19:18 +0200)]
wip #2116

7 years agoMerge remote-tracking branch 'origin/master' into bourbon
Vincent Vanwaelscappel [Thu, 28 Jun 2018 13:52:13 +0000 (15:52 +0200)]
Merge remote-tracking branch 'origin/master' into bourbon

7 years agowip #2119 @2
Vincent Vanwaelscappel [Wed, 27 Jun 2018 15:29:22 +0000 (17:29 +0200)]
wip #2119 @2

7 years agoMerge remote-tracking branch 'origin/master' into diaporama
Vincent Vanwaelscappel [Wed, 27 Jun 2018 13:27:43 +0000 (15:27 +0200)]
Merge remote-tracking branch 'origin/master' into diaporama

7 years agofix #2121 @0.5
Vincent Vanwaelscappel [Wed, 27 Jun 2018 13:18:13 +0000 (15:18 +0200)]
fix #2121 @0.5

7 years agoMerge remote-tracking branch 'origin/master' into diaporama
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

7 years agowip #2117 @0:10
Vincent Vanwaelscappel [Tue, 26 Jun 2018 13:18:39 +0000 (15:18 +0200)]
wip #2117 @0:10

7 years ago.
Vincent Vanwaelscappel [Tue, 26 Jun 2018 10:39:12 +0000 (12:39 +0200)]
.

7 years agowip #2113 @2
Vincent Vanwaelscappel [Mon, 25 Jun 2018 17:47:49 +0000 (19:47 +0200)]
wip #2113 @2

7 years agofix #2111 @0.75
Vincent Vanwaelscappel [Thu, 21 Jun 2018 10:16:28 +0000 (12:16 +0200)]
fix #2111 @0.75

7 years agotry #2106 @0.25
Vincent Vanwaelscappel [Wed, 20 Jun 2018 09:43:28 +0000 (11:43 +0200)]
try #2106 @0.25

7 years agofix #2099 @0:01
Vincent Vanwaelscappel [Fri, 15 Jun 2018 14:14:42 +0000 (16:14 +0200)]
fix #2099 @0:01

7 years agofix #2099 @0:05
Vincent Vanwaelscappel [Thu, 14 Jun 2018 09:17:57 +0000 (11:17 +0200)]
fix #2099 @0:05

7 years agoMerge remote-tracking branch 'origin/master' into bourbon
Vincent Vanwaelscappel [Mon, 11 Jun 2018 13:39:19 +0000 (15:39 +0200)]
Merge remote-tracking branch 'origin/master' into bourbon

7 years agotry #2094 @0.75
Vincent Vanwaelscappel [Mon, 11 Jun 2018 13:37:07 +0000 (15:37 +0200)]
try #2094 @0.75

7 years ago.
Vincent Vanwaelscappel [Wed, 6 Jun 2018 15:44:50 +0000 (17:44 +0200)]
.

7 years agowip #2048 @1
Vincent Vanwaelscappel [Wed, 6 Jun 2018 12:52:13 +0000 (14:52 +0200)]
wip #2048 @1

7 years agowip #2048 @1
Vincent Vanwaelscappel [Wed, 6 Jun 2018 11:23:51 +0000 (13:23 +0200)]
wip #2048 @1

7 years agowip #1998 @4
Vincent Vanwaelscappel [Wed, 6 Jun 2018 10:51:19 +0000 (12:51 +0200)]
wip #1998 @4

7 years agoMerge remote-tracking branch 'origin/master' into bourbon
Vincent Vanwaelscappel [Thu, 31 May 2018 14:42:14 +0000 (16:42 +0200)]
Merge remote-tracking branch 'origin/master' into bourbon

7 years agofix #2076 @0:10
Vincent Vanwaelscappel [Thu, 31 May 2018 13:48:58 +0000 (15:48 +0200)]
fix #2076 @0:10

7 years agoMerge remote-tracking branch 'origin/master' into bourbon
Vincent Vanwaelscappel [Thu, 31 May 2018 13:33:34 +0000 (15:33 +0200)]
Merge remote-tracking branch 'origin/master' into bourbon

7 years agoMerge remote-tracking branch 'origin/master' into ecommerceremarkable
Vincent Vanwaelscappel [Thu, 31 May 2018 13:31:25 +0000 (15:31 +0200)]
Merge remote-tracking branch 'origin/master' into ecommerceremarkable

7 years agowip #1998 @1
Vincent Vanwaelscappel [Thu, 31 May 2018 13:28:46 +0000 (15:28 +0200)]
wip #1998 @1

7 years agoMerge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Fri, 25 May 2018 15:26:32 +0000 (17:26 +0200)]
Merge remote-tracking branch 'origin/master'

7 years agoMerge branch 'master' into scorm2004
Vincent Vanwaelscappel [Fri, 25 May 2018 15:22:46 +0000 (17:22 +0200)]
Merge branch 'master' into scorm2004

# Conflicts:
# js/libs/scorm/scorm.js

7 years agowip #2048 @7
Vincent Vanwaelscappel [Wed, 23 May 2018 19:13:57 +0000 (21:13 +0200)]
wip #2048 @7

7 years agofix #2059 @0.25
Vincent Vanwaelscappel [Tue, 22 May 2018 10:20:33 +0000 (12:20 +0200)]
fix #2059 @0.25

7 years agowip #2055 @1
Vincent Vanwaelscappel [Thu, 17 May 2018 16:55:28 +0000 (18:55 +0200)]
wip #2055 @1