]>
_ Git - fluidbook-html5.git/log
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
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'
Vincent Vanwaelscappel [Tue, 6 Feb 2018 18:46:54 +0000 (19:46 +0100)]
wip #1904 @0:30
Vincent Vanwaelscappel [Tue, 6 Feb 2018 15:52:31 +0000 (16:52 +0100)]
fix #1933 @1
Vincent Vanwaelscappel [Tue, 6 Feb 2018 14:09:30 +0000 (15:09 +0100)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Fri, 2 Feb 2018 17:43:14 +0000 (18:43 +0100)]
done #1925 @0.5
Vincent Vanwaelscappel [Thu, 1 Feb 2018 17:09:40 +0000 (18:09 +0100)]
wip #903 @1
Vincent Vanwaelscappel [Wed, 31 Jan 2018 13:52:45 +0000 (14:52 +0100)]
wip #1852 @2
Stephen Cameron [Wed, 31 Jan 2018 11:19:59 +0000 (12:19 +0100)]
Allow local/relative URLs for logo link. WIP #1852 @0.5
Stephen Cameron [Wed, 31 Jan 2018 10:39:21 +0000 (11:39 +0100)]
Ensure no iframe border. WIP #1852 @0:05
Stephen Cameron [Tue, 30 Jan 2018 19:10:43 +0000 (20:10 +0100)]
Merge branch 'master' into landing-page
Stephen Cameron [Tue, 30 Jan 2018 19:03:47 +0000 (20:03 +0100)]
Improvements and semi-refactor with Vincent. WIP #1852 @8.5
Vincent Vanwaelscappel [Tue, 30 Jan 2018 16:49:14 +0000 (17:49 +0100)]
fix #1902 @0.5
Vincent Vanwaelscappel [Tue, 30 Jan 2018 16:22:49 +0000 (17:22 +0100)]
fix #1913 @0:20
Vincent Vanwaelscappel [Tue, 30 Jan 2018 15:06:53 +0000 (16:06 +0100)]
wait #1903 @6
Stephen Cameron [Mon, 29 Jan 2018 17:39:38 +0000 (18:39 +0100)]
Landing page functionality. WIP #1852 @6
Vincent Vanwaelscappel [Mon, 29 Jan 2018 14:31:52 +0000 (15:31 +0100)]
fix #1910 @0.5
Vincent Vanwaelscappel [Wed, 24 Jan 2018 16:38:48 +0000 (17:38 +0100)]
done #1899 @1.5
Vincent Vanwaelscappel [Thu, 18 Jan 2018 17:58:54 +0000 (18:58 +0100)]
#1886
Vincent Vanwaelscappel [Wed, 17 Jan 2018 17:24:43 +0000 (18:24 +0100)]
try #1584 @4
Vincent Vanwaelscappel [Tue, 16 Jan 2018 18:20:22 +0000 (19:20 +0100)]
try #1584 @0:10
Vincent Vanwaelscappel [Tue, 16 Jan 2018 18:15:59 +0000 (19:15 +0100)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Tue, 16 Jan 2018 18:15:49 +0000 (19:15 +0100)]
try #1584 @1.5
Vincent Vanwaelscappel [Tue, 16 Jan 2018 16:35:22 +0000 (17:35 +0100)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Tue, 16 Jan 2018 16:35:04 +0000 (17:35 +0100)]
done #1884 @0.5
Vincent Vanwaelscappel [Thu, 11 Jan 2018 15:15:19 +0000 (16:15 +0100)]
fix #1833 @0.5
Vincent Vanwaelscappel [Tue, 9 Jan 2018 14:43:27 +0000 (15:43 +0100)]
#1866
Vincent Vanwaelscappel [Fri, 5 Jan 2018 19:19:09 +0000 (20:19 +0100)]
#1859 @0.5
Vincent Vanwaelscappel [Fri, 5 Jan 2018 17:33:02 +0000 (18:33 +0100)]
#1854
Vincent Vanwaelscappel [Fri, 5 Jan 2018 17:32:04 +0000 (18:32 +0100)]
#1854
Vincent Vanwaelscappel [Fri, 5 Jan 2018 14:17:45 +0000 (15:17 +0100)]
done #1859 @5
Vincent Vanwaelscappel [Thu, 4 Jan 2018 10:33:13 +0000 (11:33 +0100)]
fix #1855 @0:05
Vincent Vanwaelscappel [Tue, 2 Jan 2018 15:07:18 +0000 (16:07 +0100)]
wip #1762 @4
Vincent Vanwaelscappel [Thu, 21 Dec 2017 17:47:53 +0000 (18:47 +0100)]
#1762 @2
Vincent Vanwaelscappel [Thu, 21 Dec 2017 10:50:47 +0000 (11:50 +0100)]
fix #1845 @0:20
Vincent Vanwaelscappel [Wed, 20 Dec 2017 17:36:48 +0000 (18:36 +0100)]
wip #1841 @5
Vincent Vanwaelscappel [Wed, 20 Dec 2017 11:16:36 +0000 (12:16 +0100)]
wip #1832 @0.5
Vincent Vanwaelscappel [Tue, 19 Dec 2017 16:18:41 +0000 (17:18 +0100)]
done #1839 @1.5
Vincent Vanwaelscappel [Tue, 19 Dec 2017 14:52:06 +0000 (15:52 +0100)]
#1838
Vincent Vanwaelscappel [Tue, 19 Dec 2017 13:51:11 +0000 (14:51 +0100)]
done #1837 @1
Vincent Vanwaelscappel [Tue, 19 Dec 2017 12:02:28 +0000 (13:02 +0100)]
done #1838 @1.5
Vincent Vanwaelscappel [Mon, 18 Dec 2017 17:47:58 +0000 (18:47 +0100)]
#1762
Vincent Vanwaelscappel [Mon, 18 Dec 2017 14:16:29 +0000 (15:16 +0100)]
Merge remote-tracking branch 'origin/master' into centerbook
Stephen Cameron [Mon, 18 Dec 2017 10:29:59 +0000 (11:29 +0100)]
Done #1834 @0.25
Vincent [Fri, 15 Dec 2017 14:25:54 +0000 (15:25 +0100)]
wait #1710 @0:10
Vincent Vanwaelscappel [Thu, 14 Dec 2017 18:20:29 +0000 (19:20 +0100)]
wait #1710 @0:10
Vincent Vanwaelscappel [Thu, 14 Dec 2017 18:09:39 +0000 (19:09 +0100)]
fix #1710 @1.5
Vincent Vanwaelscappel [Thu, 14 Dec 2017 16:38:45 +0000 (17:38 +0100)]
fix #1710 @6
Vincent Vanwaelscappel [Wed, 13 Dec 2017 11:16:42 +0000 (12:16 +0100)]
fix #1831 @0:20
projects / fluidbook-html5.git / log