]>
_ Git - fluidbook-html5.git/log
Vincent Vanwaelscappel [Wed, 7 Jun 2017 11:01:14 +0000 (13:01 +0200)]
fix #1456 @0:20
Stephen Cameron [Tue, 6 Jun 2017 08:45:45 +0000 (10:45 +0200)]
Merge branch 'html5video'
Stephen Cameron [Tue, 6 Jun 2017 08:41:10 +0000 (10:41 +0200)]
Fix JS error when no videos present #897 @0:20
Vincent Vanwaelscappel [Fri, 2 Jun 2017 17:32:39 +0000 (19:32 +0200)]
fix bookmarks not working on pages
Vincent Vanwaelscappel [Fri, 2 Jun 2017 17:09:17 +0000 (19:09 +0200)]
wip #1388
Stephen Cameron [Fri, 2 Jun 2017 16:42:17 +0000 (18:42 +0200)]
Merge remote-tracking branch 'origin/html5video' into html5video
Stephen Cameron [Fri, 2 Jun 2017 16:39:21 +0000 (18:39 +0200)]
Remove debug messages and re-instate some code that went missing during earlier merging. WIP #897 @1
Vincent Vanwaelscappel [Fri, 2 Jun 2017 16:27:03 +0000 (18:27 +0200)]
wip #1388
Stephen Cameron [Fri, 2 Jun 2017 15:54:11 +0000 (17:54 +0200)]
WIP #897 @0.5
Stephen Cameron [Fri, 2 Jun 2017 12:45:17 +0000 (14:45 +0200)]
Fix fluidbook.js errors after merging with menus branch. WIP #897 @0.5
Stephen Cameron [Fri, 2 Jun 2017 11:00:06 +0000 (13:00 +0200)]
Add missing menu reference
Stephen Cameron [Fri, 2 Jun 2017 10:59:09 +0000 (12:59 +0200)]
Merge branch 'menus' into html5video
Stephen Cameron [Fri, 2 Jun 2017 10:04:12 +0000 (12:04 +0200)]
Commit remaining files before merging
Stephen Cameron [Fri, 2 Jun 2017 09:55:08 +0000 (11:55 +0200)]
Commit files in preparation for merge with menus branch. WIP.
Vincent Vanwaelscappel [Fri, 2 Jun 2017 09:50:33 +0000 (11:50 +0200)]
wip #1388 @1
Stephen Cameron [Thu, 1 Jun 2017 16:44:52 +0000 (18:44 +0200)]
Update video.js to version 6.2.0. WIP 897 @0:15
Vincent Vanwaelscappel [Thu, 1 Jun 2017 15:30:54 +0000 (17:30 +0200)]
wip #1388 @1.5
Vincent Vanwaelscappel [Thu, 1 Jun 2017 14:42:37 +0000 (16:42 +0200)]
fix #1441 @0.75
Vincent Vanwaelscappel [Thu, 1 Jun 2017 14:05:11 +0000 (16:05 +0200)]
wip #1388 @4
Vincent Vanwaelscappel [Wed, 31 May 2017 17:09:52 +0000 (19:09 +0200)]
wip #1388 @7
Stephen Cameron [Wed, 31 May 2017 09:10:28 +0000 (11:10 +0200)]
Merge branch 'master' into html5video
Vincent Vanwaelscappel [Tue, 30 May 2017 17:12:52 +0000 (19:12 +0200)]
wip #1388 @10
Stephen Cameron [Tue, 30 May 2017 16:52:13 +0000 (18:52 +0200)]
WIP #897 @7
Stephen Cameron [Wed, 24 May 2017 13:31:35 +0000 (15:31 +0200)]
Increase max-width of tooltips to 340px. WIP #1392 @0:05
Vincent Vanwaelscappel [Thu, 11 May 2017 15:23:58 +0000 (17:23 +0200)]
reduce image resolution for old iphones #1404
Vincent Vanwaelscappel [Thu, 11 May 2017 09:14:21 +0000 (11:14 +0200)]
#1399
Vincent Vanwaelscappel [Fri, 5 May 2017 16:44:04 +0000 (18:44 +0200)]
wip #1388 @3
Vincent Vanwaelscappel [Fri, 5 May 2017 16:08:52 +0000 (18:08 +0200)]
#1397
Vincent Vanwaelscappel [Fri, 5 May 2017 13:32:34 +0000 (15:32 +0200)]
fix #1396 @0:10
Vincent Vanwaelscappel [Fri, 5 May 2017 13:18:17 +0000 (15:18 +0200)]
#1395
Vincent Vanwaelscappel [Fri, 5 May 2017 10:53:04 +0000 (12:53 +0200)]
#1387
Vincent Vanwaelscappel [Fri, 5 May 2017 10:41:55 +0000 (12:41 +0200)]
done #1387 @0.5
Vincent Vanwaelscappel [Fri, 5 May 2017 10:11:25 +0000 (12:11 +0200)]
.
Vincent Vanwaelscappel [Thu, 4 May 2017 16:54:42 +0000 (18:54 +0200)]
fix #1384 @1.5
Vincent Vanwaelscappel [Thu, 4 May 2017 16:34:36 +0000 (18:34 +0200)]
fix #1391 @1
Vincent Vanwaelscappel [Thu, 4 May 2017 14:00:00 +0000 (16:00 +0200)]
fix #1389 @0.5
Vincent Vanwaelscappel [Thu, 4 May 2017 10:19:17 +0000 (12:19 +0200)]
#1377
Vincent Vanwaelscappel [Thu, 4 May 2017 10:17:28 +0000 (12:17 +0200)]
#1377
Vincent Vanwaelscappel [Wed, 3 May 2017 18:01:40 +0000 (20:01 +0200)]
fix #1374 @0.5
Vincent Vanwaelscappel [Tue, 2 May 2017 16:10:14 +0000 (18:10 +0200)]
wip #1377 @1.5
Vincent Vanwaelscappel [Tue, 2 May 2017 13:38:33 +0000 (15:38 +0200)]
merge mobilezoom -> master
Vincent Vanwaelscappel [Tue, 2 May 2017 13:37:37 +0000 (15:37 +0200)]
Merge branch 'mobilezoom'
Vincent Vanwaelscappel [Tue, 2 May 2017 13:28:10 +0000 (15:28 +0200)]
Merge remote-tracking branch 'origin/mobilezoom'
Vincent Vanwaelscappel [Tue, 2 May 2017 13:27:31 +0000 (15:27 +0200)]
Merge branch 'mobilezoom'
Vincent Vanwaelscappel [Tue, 2 May 2017 12:05:53 +0000 (14:05 +0200)]
Merge remote-tracking branch 'origin/mobilezoom' into mobilezoom
Vincent Vanwaelscappel [Tue, 2 May 2017 12:05:11 +0000 (14:05 +0200)]
fix #1374 @1.5
Stephen Cameron [Thu, 27 Apr 2017 17:49:43 +0000 (19:49 +0200)]
Close button adjustments. WIP #815
Vincent Vanwaelscappel [Wed, 26 Apr 2017 17:13:37 +0000 (19:13 +0200)]
done #1371 @0:15
Vincent Vanwaelscappel [Wed, 26 Apr 2017 17:08:50 +0000 (19:08 +0200)]
done #1371 @0.5
Vincent Vanwaelscappel [Wed, 26 Apr 2017 16:21:45 +0000 (18:21 +0200)]
done #1362 @0.5
Vincent Vanwaelscappel [Wed, 26 Apr 2017 16:20:25 +0000 (18:20 +0200)]
done #1372 @1
Vincent Vanwaelscappel [Wed, 26 Apr 2017 15:05:39 +0000 (17:05 +0200)]
wip #1371 @0:20
Vincent Vanwaelscappel [Wed, 26 Apr 2017 14:31:11 +0000 (16:31 +0200)]
wip #1371 @0:20
Vincent Vanwaelscappel [Wed, 26 Apr 2017 14:21:47 +0000 (16:21 +0200)]
wip #815 @1.5
Vincent Vanwaelscappel [Wed, 26 Apr 2017 10:57:09 +0000 (12:57 +0200)]
wip #815 @0.5
Vincent Vanwaelscappel [Tue, 25 Apr 2017 16:57:50 +0000 (18:57 +0200)]
wip #815
Stephen Cameron [Tue, 25 Apr 2017 13:19:18 +0000 (15:19 +0200)]
WIP #815
Vincent Vanwaelscappel [Fri, 21 Apr 2017 17:46:53 +0000 (19:46 +0200)]
done #1366 @1
Vincent Vanwaelscappel [Fri, 21 Apr 2017 14:04:43 +0000 (16:04 +0200)]
fix #1362 @1
Vincent Vanwaelscappel [Fri, 21 Apr 2017 13:51:32 +0000 (15:51 +0200)]
#1344
Vincent Vanwaelscappel [Fri, 21 Apr 2017 12:30:31 +0000 (14:30 +0200)]
wip #1344 @1
Vincent Vanwaelscappel [Fri, 21 Apr 2017 11:39:48 +0000 (13:39 +0200)]
wip #1344 @5
Vincent Vanwaelscappel [Thu, 13 Apr 2017 17:13:08 +0000 (19:13 +0200)]
#1346
Vincent Vanwaelscappel [Thu, 13 Apr 2017 17:12:34 +0000 (19:12 +0200)]
done #1346 @2
Vincent Vanwaelscappel [Thu, 13 Apr 2017 11:37:17 +0000 (13:37 +0200)]
#1344
Vincent Vanwaelscappel [Wed, 12 Apr 2017 17:09:18 +0000 (19:09 +0200)]
#1344
Vincent Vanwaelscappel [Wed, 12 Apr 2017 17:08:13 +0000 (19:08 +0200)]
#1344
Vincent Vanwaelscappel [Wed, 12 Apr 2017 17:05:02 +0000 (19:05 +0200)]
#1344
Vincent Vanwaelscappel [Wed, 12 Apr 2017 13:44:59 +0000 (15:44 +0200)]
#
Vincent Vanwaelscappel [Tue, 11 Apr 2017 15:44:13 +0000 (17:44 +0200)]
#1135
Vincent Vanwaelscappel [Fri, 7 Apr 2017 18:10:07 +0000 (20:10 +0200)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Fri, 7 Apr 2017 18:09:50 +0000 (20:09 +0200)]
#1328
Stephen Cameron [Fri, 7 Apr 2017 09:09:01 +0000 (11:09 +0200)]
Merge remote-tracking branch 'origin/master'
Stephen Cameron [Fri, 7 Apr 2017 09:08:24 +0000 (11:08 +0200)]
Done #1324 @0:05
Vincent Vanwaelscappel [Thu, 6 Apr 2017 09:35:40 +0000 (11:35 +0200)]
done #1321 @1
Stephen Cameron [Tue, 28 Mar 2017 08:07:36 +0000 (10:07 +0200)]
Fix auto-hide on mobile/touch devices. #1180 @0:10
Stephen Cameron [Mon, 27 Mar 2017 15:58:19 +0000 (17:58 +0200)]
Fix #1180 @1.75
Vincent Vanwaelscappel [Wed, 22 Mar 2017 17:55:03 +0000 (18:55 +0100)]
wip #1254 @1.5
Vincent Vanwaelscappel [Wed, 22 Mar 2017 17:52:28 +0000 (18:52 +0100)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Wed, 22 Mar 2017 16:46:08 +0000 (17:46 +0100)]
wip #1254 @1.5
Stephen Cameron [Tue, 21 Mar 2017 17:08:28 +0000 (18:08 +0100)]
Merge remote-tracking branch 'origin/master'
Stephen Cameron [Tue, 21 Mar 2017 17:06:04 +0000 (18:06 +0100)]
Atlantic popups. WIP #1112
Vincent Vanwaelscappel [Fri, 3 Mar 2017 17:02:40 +0000 (18:02 +0100)]
#1185
Vincent Vanwaelscappel [Fri, 3 Mar 2017 14:45:05 +0000 (15:45 +0100)]
done #1185 @1
Vincent Vanwaelscappel [Wed, 1 Mar 2017 15:12:10 +0000 (16:12 +0100)]
fix #1182 @0.5
Vincent Vanwaelscappel [Tue, 28 Feb 2017 16:30:42 +0000 (17:30 +0100)]
fix #1177 @5
Vincent Vanwaelscappel [Fri, 17 Feb 2017 18:44:30 +0000 (19:44 +0100)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Fri, 17 Feb 2017 18:44:04 +0000 (19:44 +0100)]
wip #1112 @0:45
Stephen Cameron [Fri, 17 Feb 2017 16:13:18 +0000 (17:13 +0100)]
Added .gitignore file to ignore PHPStorm / JetBrains .idea settings folder.
Stephen Cameron [Fri, 17 Feb 2017 12:05:12 +0000 (13:05 +0100)]
Removed test file.
Stephen Cameron [Fri, 17 Feb 2017 11:53:18 +0000 (12:53 +0100)]
Testing Git setup
Vincent Vanwaelscappel [Wed, 15 Feb 2017 16:52:46 +0000 (17:52 +0100)]
wip #1111 @1.5
Vincent Vanwaelscappel [Mon, 13 Feb 2017 17:41:48 +0000 (18:41 +0100)]
fix #1138 @1.5
Vincent Vanwaelscappel [Fri, 3 Feb 2017 18:17:58 +0000 (19:17 +0100)]
wip #1023 @6
Vincent Vanwaelscappel [Thu, 2 Feb 2017 18:03:00 +0000 (19:03 +0100)]
wip #1023 @2
Vincent Vanwaelscappel [Thu, 2 Feb 2017 15:28:22 +0000 (16:28 +0100)]
wip #1023 @2
Vincent Vanwaelscappel [Thu, 2 Feb 2017 13:17:21 +0000 (14:17 +0100)]
wip #1023 @3
Vincent Vanwaelscappel [Wed, 25 Jan 2017 17:25:07 +0000 (18:25 +0100)]
wip #1079 @7
Vincent Vanwaelscappel [Thu, 12 Jan 2017 13:11:50 +0000 (14:11 +0100)]
wip #1070 @0.5
Vincent Vanwaelscappel [Wed, 11 Jan 2017 15:42:55 +0000 (16:42 +0100)]
wip #1089 @1
projects / fluidbook-html5.git / log