]>
_ Git - fluidbook-html5.git/log
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: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 [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 [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 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:47:49 +0000 (19:47 +0200)]
wip #2113 @2
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 [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
Vincent Vanwaelscappel [Thu, 17 May 2018 16:55:28 +0000 (18:55 +0200)]
wip #2055 @1
Vincent Vanwaelscappel [Thu, 17 May 2018 13:47:15 +0000 (15:47 +0200)]
fix #2049 @1
Vincent Vanwaelscappel [Wed, 25 Apr 2018 10:37:50 +0000 (12:37 +0200)]
wip #1927 @0:40
Vincent Vanwaelscappel [Tue, 24 Apr 2018 13:18:04 +0000 (15:18 +0200)]
wip #1927 @1
Vincent Vanwaelscappel [Tue, 24 Apr 2018 13:04:11 +0000 (15:04 +0200)]
Merge remote-tracking branch 'origin/master' into ecommerceremarkable
# Conflicts:
# js/libs/fluidbook/fluidbook.links.js
Vincent Vanwaelscappel [Mon, 23 Apr 2018 14:36:23 +0000 (16:36 +0200)]
wip #2027 @0:50
Vincent Vanwaelscappel [Mon, 23 Apr 2018 12:35:30 +0000 (14:35 +0200)]
#1927
Vincent Vanwaelscappel [Mon, 23 Apr 2018 10:17:16 +0000 (12:17 +0200)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Mon, 23 Apr 2018 10:16:55 +0000 (12:16 +0200)]
fix #2037 @0.5
Vincent Vanwaelscappel [Tue, 17 Apr 2018 17:06:54 +0000 (19:06 +0200)]
wip #1927 @0.5
Vincent Vanwaelscappel [Tue, 17 Apr 2018 14:03:33 +0000 (16:03 +0200)]
wip #1927 @0.5
Vincent Vanwaelscappel [Tue, 17 Apr 2018 12:29:08 +0000 (14:29 +0200)]
wip #1927 @0.5
Vincent Vanwaelscappel [Tue, 17 Apr 2018 11:59:54 +0000 (13:59 +0200)]
wip #1927 @1.5
Vincent Vanwaelscappel [Mon, 16 Apr 2018 15:49:07 +0000 (17:49 +0200)]
wip #1927 @3
Vincent Vanwaelscappel [Fri, 13 Apr 2018 14:55:47 +0000 (16:55 +0200)]
wip #1927 @2.5
Vincent Vanwaelscappel [Thu, 12 Apr 2018 17:25:47 +0000 (19:25 +0200)]
wip #1927 @3
Vincent Vanwaelscappel [Wed, 11 Apr 2018 18:10:12 +0000 (20:10 +0200)]
wip #1927 @1
Vincent Vanwaelscappel [Wed, 11 Apr 2018 17:17:13 +0000 (19:17 +0200)]
wip #1926 @6
Vincent Vanwaelscappel [Thu, 5 Apr 2018 14:37:54 +0000 (16:37 +0200)]
Merge branch 'helpbookmarks'
Vincent Vanwaelscappel [Thu, 5 Apr 2018 14:37:20 +0000 (16:37 +0200)]
done #2021 @1
Vincent Vanwaelscappel [Thu, 5 Apr 2018 13:58:39 +0000 (15:58 +0200)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Thu, 5 Apr 2018 13:49:17 +0000 (15:49 +0200)]
wip #2021 @0.75
Stephen Cameron [Tue, 3 Apr 2018 16:11:25 +0000 (18:11 +0200)]
WIP #1945 @3
Stephen Cameron [Fri, 30 Mar 2018 18:54:45 +0000 (20:54 +0200)]
WIP #1945 @4
Vincent Vanwaelscappel [Fri, 30 Mar 2018 13:40:27 +0000 (15:40 +0200)]
wip #2015 @0.25
Vincent Vanwaelscappel [Thu, 29 Mar 2018 15:54:47 +0000 (17:54 +0200)]
wip #2013 @1.5
Vincent Vanwaelscappel [Mon, 26 Mar 2018 10:28:22 +0000 (12:28 +0200)]
done #2002 @1.5
Vincent Vanwaelscappel [Fri, 23 Mar 2018 16:37:05 +0000 (17:37 +0100)]
wip #2002 @0:10
Vincent Vanwaelscappel [Fri, 23 Mar 2018 16:31:12 +0000 (17:31 +0100)]
wip #2002 @0:10
Stephen Cameron [Fri, 16 Mar 2018 15:18:37 +0000 (16:18 +0100)]
Merge remote-tracking branch 'origin/master'
Stephen Cameron [Fri, 16 Mar 2018 15:18:16 +0000 (16:18 +0100)]
Done #1994 @0.25
Vincent Vanwaelscappel [Fri, 16 Mar 2018 13:35:46 +0000 (14:35 +0100)]
#
Vincent Vanwaelscappel [Fri, 16 Mar 2018 12:42:30 +0000 (13:42 +0100)]
fix #1993 @1
Vincent Vanwaelscappel [Tue, 13 Mar 2018 11:49:49 +0000 (12:49 +0100)]
done #1979 @0.5
Vincent Vanwaelscappel [Tue, 13 Mar 2018 11:22:32 +0000 (12:22 +0100)]
#1977 @1978
Vincent Vanwaelscappel [Mon, 12 Mar 2018 16:25:08 +0000 (17:25 +0100)]
#1966
Vincent Vanwaelscappel [Mon, 12 Mar 2018 16:21:56 +0000 (17:21 +0100)]
done #1966 @2.5
Vincent Vanwaelscappel [Thu, 8 Mar 2018 10:43:28 +0000 (11:43 +0100)]
#1966
Vincent Vanwaelscappel [Thu, 8 Mar 2018 10:42:40 +0000 (11:42 +0100)]
#819
Vincent Vanwaelscappel [Thu, 1 Mar 2018 15:41:27 +0000 (16:41 +0100)]
wait #1966 @3
Vincent Vanwaelscappel [Tue, 27 Feb 2018 15:27:57 +0000 (16:27 +0100)]
fix #1964 @0.5
Vincent Vanwaelscappel [Thu, 22 Feb 2018 10:39:36 +0000 (11:39 +0100)]
wip #1958 @0:05
Vincent Vanwaelscappel [Fri, 16 Feb 2018 10:30:40 +0000 (11:30 +0100)]
wip #1942 @1
Vincent Vanwaelscappel [Fri, 9 Feb 2018 17:37:34 +0000 (18:37 +0100)]
wip #1938 @0:05
Vincent Vanwaelscappel [Fri, 9 Feb 2018 17:34:59 +0000 (18:34 +0100)]
wip #1938 @0.5
Vincent Vanwaelscappel [Wed, 7 Feb 2018 14:55:18 +0000 (15:55 +0100)]
fix #1936 @0:20
Vincent Vanwaelscappel [Wed, 7 Feb 2018 14:30:05 +0000 (15:30 +0100)]
done #1934 @6
Vincent Vanwaelscappel [Tue, 6 Feb 2018 18:47:41 +0000 (19:47 +0100)]
Merge remote-tracking branch 'origin/master'