]>
_ Git - fluidbook-html5.git/log
Vincent Vanwaelscappel [Thu, 6 Jul 2017 12:18:25 +0000 (14:18 +0200)]
done #1545 @0.5
Vincent [Wed, 5 Jul 2017 15:55:02 +0000 (17:55 +0200)]
done #1545 @0.5
Vincent Vanwaelscappel [Thu, 29 Jun 2017 16:16:34 +0000 (18:16 +0200)]
done #1512 @1.5
Vincent Vanwaelscappel [Wed, 28 Jun 2017 17:33:56 +0000 (19:33 +0200)]
#1471
Vincent Vanwaelscappel [Wed, 28 Jun 2017 17:25:21 +0000 (19:25 +0200)]
fix #1468 @0.5
Vincent Vanwaelscappel [Wed, 28 Jun 2017 16:05:12 +0000 (18:05 +0200)]
Merge remote-tracking branch 'origin/master' into slider
# Conflicts:
# style/fluidbook.less
Vincent Vanwaelscappel [Wed, 28 Jun 2017 15:40:40 +0000 (17:40 +0200)]
done #1503 @1
Vincent Vanwaelscappel [Wed, 28 Jun 2017 14:55:08 +0000 (16:55 +0200)]
done #1510 @0.5
Vincent Vanwaelscappel [Wed, 28 Jun 2017 14:23:30 +0000 (16:23 +0200)]
wip #1503 @2
Vincent Vanwaelscappel [Tue, 27 Jun 2017 15:16:52 +0000 (17:16 +0200)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Tue, 27 Jun 2017 15:16:40 +0000 (17:16 +0200)]
fix #1505 @1
Stephen Cameron [Tue, 27 Jun 2017 11:24:30 +0000 (13:24 +0200)]
Update video player play icon.
Vincent Vanwaelscappel [Fri, 23 Jun 2017 13:56:05 +0000 (15:56 +0200)]
fix issue produced by adding diff to array.prototype
Vincent Vanwaelscappel [Fri, 23 Jun 2017 10:19:59 +0000 (12:19 +0200)]
fix #1493 @0:15
Vincent Vanwaelscappel [Thu, 22 Jun 2017 17:07:42 +0000 (19:07 +0200)]
try #1392 @0.25
Vincent Vanwaelscappel [Thu, 22 Jun 2017 16:55:18 +0000 (18:55 +0200)]
Merge remote-tracking branch 'origin/master' into slider
Vincent Vanwaelscappel [Thu, 22 Jun 2017 16:54:09 +0000 (18:54 +0200)]
done #1450 @1
Vincent Vanwaelscappel [Thu, 22 Jun 2017 16:46:33 +0000 (18:46 +0200)]
wip #1490 @1
Vincent Vanwaelscappel [Thu, 22 Jun 2017 16:45:05 +0000 (18:45 +0200)]
wip #1488 @0:30
Vincent Vanwaelscappel [Thu, 22 Jun 2017 13:01:34 +0000 (15:01 +0200)]
wip #1488 @0:05
Vincent Vanwaelscappel [Thu, 22 Jun 2017 12:54:06 +0000 (14:54 +0200)]
wip #1487 @2
Vincent Vanwaelscappel [Wed, 21 Jun 2017 19:36:45 +0000 (21:36 +0200)]
wip #1487 @1
Vincent Vanwaelscappel [Wed, 21 Jun 2017 18:38:08 +0000 (20:38 +0200)]
Merge remote-tracking branch 'origin/master' into slider
Vincent Vanwaelscappel [Wed, 21 Jun 2017 18:37:52 +0000 (20:37 +0200)]
wip #1471 @5
Vincent Vanwaelscappel [Wed, 21 Jun 2017 18:37:17 +0000 (20:37 +0200)]
wip #1392 @2
Vincent Vanwaelscappel [Wed, 21 Jun 2017 16:19:56 +0000 (18:19 +0200)]
#1485
Vincent Vanwaelscappel [Tue, 20 Jun 2017 15:36:33 +0000 (17:36 +0200)]
wip #1392 @4
Vincent Vanwaelscappel [Mon, 19 Jun 2017 15:39:29 +0000 (17:39 +0200)]
wip #1445
Vincent Vanwaelscappel [Mon, 19 Jun 2017 15:28:26 +0000 (17:28 +0200)]
Merge remote-tracking branch 'origin/slider'
Vincent Vanwaelscappel [Mon, 19 Jun 2017 15:27:12 +0000 (17:27 +0200)]
Merge remote-tracking branch 'origin/slider'
Vincent Vanwaelscappel [Mon, 19 Jun 2017 15:25:13 +0000 (17:25 +0200)]
Merge remote-tracking branch 'origin/master' into slider
Vincent Vanwaelscappel [Mon, 19 Jun 2017 15:12:53 +0000 (17:12 +0200)]
wip #1445 @1.5
Vincent Vanwaelscappel [Mon, 19 Jun 2017 13:34:52 +0000 (15:34 +0200)]
wip #1445 @1.5
Vincent Vanwaelscappel [Mon, 19 Jun 2017 11:58:58 +0000 (13:58 +0200)]
wip #1472 @1
Vincent Vanwaelscappel [Thu, 15 Jun 2017 16:42:20 +0000 (18:42 +0200)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Thu, 15 Jun 2017 16:42:05 +0000 (18:42 +0200)]
wip #1480 @0:15
Vincent Vanwaelscappel [Tue, 13 Jun 2017 16:42:56 +0000 (18:42 +0200)]
#1445 @0.5
Vincent Vanwaelscappel [Tue, 13 Jun 2017 16:25:15 +0000 (18:25 +0200)]
#1445
Vincent Vanwaelscappel [Tue, 13 Jun 2017 10:05:42 +0000 (12:05 +0200)]
wip #1445 @0.5
Vincent Vanwaelscappel [Mon, 12 Jun 2017 17:00:13 +0000 (19:00 +0200)]
done #901 @0:10
Vincent Vanwaelscappel [Mon, 12 Jun 2017 16:57:13 +0000 (18:57 +0200)]
wip #1445 @1
Vincent Vanwaelscappel [Mon, 12 Jun 2017 15:21:29 +0000 (17:21 +0200)]
wip #1445 @0.25
Vincent Vanwaelscappel [Mon, 12 Jun 2017 15:16:09 +0000 (17:16 +0200)]
wip #1445 @5
Vincent Vanwaelscappel [Mon, 12 Jun 2017 13:42:08 +0000 (15:42 +0200)]
#901
Vincent Vanwaelscappel [Fri, 9 Jun 2017 17:02:32 +0000 (19:02 +0200)]
wip #1445 @1
Vincent Vanwaelscappel [Fri, 9 Jun 2017 16:08:10 +0000 (18:08 +0200)]
add shade on thumbs | wip #1445 @1:05
Vincent Vanwaelscappel [Fri, 9 Jun 2017 14:37:16 +0000 (16:37 +0200)]
Merge remote-tracking branch 'origin/master' into slider
Vincent Vanwaelscappel [Fri, 9 Jun 2017 14:35:52 +0000 (16:35 +0200)]
wip #1445 @1
Stephen Cameron [Fri, 9 Jun 2017 09:45:03 +0000 (11:45 +0200)]
WIP #1449 @0:05
Vincent Vanwaelscappel [Fri, 9 Jun 2017 09:41:51 +0000 (11:41 +0200)]
wip #1445 @1
Vincent Vanwaelscappel [Thu, 8 Jun 2017 17:10:48 +0000 (19:10 +0200)]
wip #1445 @0.75
Vincent Vanwaelscappel [Thu, 8 Jun 2017 16:35:55 +0000 (18:35 +0200)]
wip #1445 @1
Stephen Cameron [Thu, 8 Jun 2017 15:13:01 +0000 (17:13 +0200)]
Merge branch 'master' into html5video
Stephen Cameron [Thu, 8 Jun 2017 15:11:07 +0000 (17:11 +0200)]
Merge branch 'master' into html5video
Vincent Vanwaelscappel [Thu, 8 Jun 2017 15:10:01 +0000 (17:10 +0200)]
fix #1451 @0.5
Vincent Vanwaelscappel [Thu, 8 Jun 2017 14:40:48 +0000 (16:40 +0200)]
fix #1461 @0.5
Vincent Vanwaelscappel [Thu, 8 Jun 2017 14:09:45 +0000 (16:09 +0200)]
fix #1446 @0.75
Vincent Vanwaelscappel [Thu, 8 Jun 2017 14:08:03 +0000 (16:08 +0200)]
done #1452 @1
Vincent Vanwaelscappel [Thu, 8 Jun 2017 13:29:58 +0000 (15:29 +0200)]
fix #1465 @0:15
Vincent Vanwaelscappel [Thu, 8 Jun 2017 13:11:01 +0000 (15:11 +0200)]
#1457
Vincent Vanwaelscappel [Thu, 8 Jun 2017 12:27:44 +0000 (14:27 +0200)]
Merge remote-tracking branch 'origin/master'
Stephen Cameron [Thu, 8 Jun 2017 12:13:10 +0000 (14:13 +0200)]
Done #1457 @0:15
Vincent Vanwaelscappel [Thu, 8 Jun 2017 11:46:32 +0000 (13:46 +0200)]
#1452
Vincent Vanwaelscappel [Thu, 8 Jun 2017 11:46:09 +0000 (13:46 +0200)]
Add popup overlay for zoom areas | wip #1452 @1
Vincent Vanwaelscappel [Wed, 7 Jun 2017 15:35:42 +0000 (17:35 +0200)]
fix #1454 @2
Vincent Vanwaelscappel [Wed, 7 Jun 2017 15:35:20 +0000 (17:35 +0200)]
done #1459 @1
Vincent Vanwaelscappel [Wed, 7 Jun 2017 14:00:48 +0000 (16:00 +0200)]
try #1454 @3
Vincent Vanwaelscappel [Wed, 7 Jun 2017 11:01:14 +0000 (13:01 +0200)]
fix #1456 @0:20
Stephen Cameron [Tue, 6 Jun 2017 13:07:10 +0000 (15:07 +0200)]
Merge remote-tracking branch 'origin/html5video' into html5video
Stephen Cameron [Tue, 6 Jun 2017 13:04:53 +0000 (15:04 +0200)]
Add Vimeo support for web video popups. WIP #1449 @0:15
Vincent Vanwaelscappel [Tue, 6 Jun 2017 09:54:48 +0000 (11:54 +0200)]
Merge remote-tracking branch 'origin/html5video' into html5video
Vincent Vanwaelscappel [Tue, 6 Jun 2017 09:54:23 +0000 (11:54 +0200)]
fix #1433 @1.5
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
projects / fluidbook-html5.git / log