]>
_ Git - fluidbook-html5.git/log
Vincent Vanwaelscappel [Thu, 6 Dec 2018 10:53:02 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 6 Dec 2018 10:42:15 +0000 (11:42 +0100)]
Merge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Thu, 6 Dec 2018 10:41:53 +0000 (11:41 +0100)]
fix #2408 @0.25
Vincent Vanwaelscappel [Thu, 6 Dec 2018 09:48:31 +0000 (10:48 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip
Stephen Cameron [Wed, 5 Dec 2018 16:52:07 +0000 (17:52 +0100)]
Fix blank page height problem. Done #817 @0.25
Vincent Vanwaelscappel [Wed, 5 Dec 2018 16:35:15 +0000 (17:35 +0100)]
wip #2406 @1
Stephen Cameron [Wed, 5 Dec 2018 16:00:37 +0000 (17:00 +0100)]
Merge remote-tracking branch 'origin/master' into printing
Vincent Vanwaelscappel [Wed, 5 Dec 2018 15:19:06 +0000 (16:19 +0100)]
#2404
Vincent Vanwaelscappel [Wed, 5 Dec 2018 15:09:49 +0000 (16:09 +0100)]
fix #2404 @0.5
Vincent Vanwaelscappel [Wed, 5 Dec 2018 13:52:12 +0000 (14:52 +0100)]
fix #2399 @.5
Vincent Vanwaelscappel [Wed, 5 Dec 2018 13:22:15 +0000 (14:22 +0100)]
#809 @0.5
Stephen Cameron [Wed, 5 Dec 2018 12:45:54 +0000 (13:45 +0100)]
Merge remote-tracking branch 'origin/printing' into printing
# Conflicts:
# style/print.less
Stephen Cameron [Wed, 5 Dec 2018 12:42:33 +0000 (13:42 +0100)]
Pre-merge clean up. WIP #817 @0:05
Vincent Vanwaelscappel [Wed, 5 Dec 2018 11:21:14 +0000 (12:21 +0100)]
fix #2372 @1
Vincent Vanwaelscappel [Tue, 4 Dec 2018 18:04:51 +0000 (19:04 +0100)]
fix #2336 @0.5
Vincent Vanwaelscappel [Mon, 3 Dec 2018 17:23:11 +0000 (18:23 +0100)]
wip #2389 @1
Vincent Vanwaelscappel [Fri, 30 Nov 2018 13:14:43 +0000 (14:14 +0100)]
#2385
Stephen Cameron [Thu, 29 Nov 2018 15:46:19 +0000 (16:46 +0100)]
Adjustments to ghost pages and radio button colours. WIP #817 @0.75
Vincent Vanwaelscappel [Thu, 29 Nov 2018 13:39:33 +0000 (14:39 +0100)]
wip #2303 @1.5
Vincent Vanwaelscappel [Thu, 29 Nov 2018 11:11:22 +0000 (12:11 +0100)]
wip #2303 @0.25
Vincent Vanwaelscappel [Thu, 29 Nov 2018 10:25:54 +0000 (11:25 +0100)]
fix #2383 @0.15
Stephen Cameron [Thu, 29 Nov 2018 10:13:27 +0000 (11:13 +0100)]
WIP #817 @2
Stephen Cameron [Wed, 28 Nov 2018 16:54:27 +0000 (17:54 +0100)]
WIP #817 @3.5
Vincent Vanwaelscappel [Tue, 27 Nov 2018 15:52:07 +0000 (16:52 +0100)]
fix #2379 @0:15
Vincent Vanwaelscappel [Mon, 26 Nov 2018 16:35:31 +0000 (17:35 +0100)]
fix #2375 @1
Vincent Vanwaelscappel [Mon, 26 Nov 2018 12:46:45 +0000 (13:46 +0100)]
wip #2365 @1
Vincent Vanwaelscappel [Fri, 23 Nov 2018 18:13:22 +0000 (19:13 +0100)]
try #2371 @0.5
Vincent Vanwaelscappel [Fri, 23 Nov 2018 17:35:15 +0000 (18:35 +0100)]
#2370
Vincent Vanwaelscappel [Fri, 23 Nov 2018 17:28:26 +0000 (18:28 +0100)]
fix #2369 @0:20
Vincent Vanwaelscappel [Fri, 23 Nov 2018 17:28:11 +0000 (18:28 +0100)]
fix #2370 @0:20
Vincent Vanwaelscappel [Fri, 23 Nov 2018 16:24:22 +0000 (17:24 +0100)]
wip #2365 @0:01
Vincent Vanwaelscappel [Fri, 23 Nov 2018 16:22:41 +0000 (17:22 +0100)]
wip #2365 @0:01
Vincent Vanwaelscappel [Fri, 23 Nov 2018 16:20:28 +0000 (17:20 +0100)]
wip #2368 @0:01
Vincent Vanwaelscappel [Fri, 23 Nov 2018 16:19:25 +0000 (17:19 +0100)]
wip #2368 @0:05
Vincent Vanwaelscappel [Fri, 23 Nov 2018 15:54:17 +0000 (16:54 +0100)]
fix #2366 @0:10
Vincent Vanwaelscappel [Fri, 23 Nov 2018 15:46:34 +0000 (16:46 +0100)]
fix #2366 @0:10
Vincent Vanwaelscappel [Fri, 23 Nov 2018 15:27:29 +0000 (16:27 +0100)]
wait #2365 @0.5
Vincent Vanwaelscappel [Fri, 23 Nov 2018 15:08:27 +0000 (16:08 +0100)]
wip #2365 @0.5
Vincent Vanwaelscappel [Fri, 23 Nov 2018 13:08:58 +0000 (14:08 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Wed, 21 Nov 2018 15:43:44 +0000 (16:43 +0100)]
wait #2354 @1
Vincent Vanwaelscappel [Tue, 20 Nov 2018 19:04:31 +0000 (20:04 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip
# Conflicts:
# js/libs/fluidbook/fluidbook.js
Vincent Vanwaelscappel [Tue, 20 Nov 2018 19:02:02 +0000 (20:02 +0100)]
wip #2358 @2
Vincent Vanwaelscappel [Tue, 20 Nov 2018 18:39:14 +0000 (19:39 +0100)]
.
Vincent Vanwaelscappel [Thu, 15 Nov 2018 14:11:36 +0000 (15:11 +0100)]
fix #2352 @3
Stephen Cameron [Thu, 15 Nov 2018 09:14:58 +0000 (10:14 +0100)]
Add download options and take into account pdfComplex setting. WIP #1806 @1.75
Vincent Vanwaelscappel [Wed, 14 Nov 2018 19:03:59 +0000 (20:03 +0100)]
wip #2342 @5
Stephen Cameron [Wed, 14 Nov 2018 16:00:52 +0000 (17:00 +0100)]
WIP #1806 @7.5
Vincent Vanwaelscappel [Wed, 14 Nov 2018 11:04:29 +0000 (12:04 +0100)]
wip #2342 @1
Stephen Cameron [Tue, 13 Nov 2018 16:54:11 +0000 (17:54 +0100)]
WIP #1806 @7.5
Vincent Vanwaelscappel [Tue, 13 Nov 2018 16:28:13 +0000 (17:28 +0100)]
wip #2342 @6
Stephen Cameron [Mon, 12 Nov 2018 18:01:59 +0000 (19:01 +0100)]
WIP #1806 @7
Vincent Vanwaelscappel [Wed, 7 Nov 2018 11:01:08 +0000 (12:01 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Wed, 7 Nov 2018 10:59:12 +0000 (11:59 +0100)]
fix #2334 @2
Vincent Vanwaelscappel [Tue, 6 Nov 2018 17:37:39 +0000 (18:37 +0100)]
fix #2335 @0:10
Vincent Vanwaelscappel [Tue, 6 Nov 2018 16:43:32 +0000 (17:43 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip
# Conflicts:
# js/libs/fluidbook/fluidbook.js
Vincent Vanwaelscappel [Mon, 5 Nov 2018 16:19:17 +0000 (17:19 +0100)]
try #2329 @0.5
Vincent Vanwaelscappel [Mon, 5 Nov 2018 15:35:25 +0000 (16:35 +0100)]
wip #2327 @0:10
Vincent Vanwaelscappel [Mon, 5 Nov 2018 15:02:18 +0000 (16:02 +0100)]
wait #2227 @1.5
Vincent Vanwaelscappel [Mon, 5 Nov 2018 13:49:26 +0000 (14:49 +0100)]
wait #2227 @0:20
Vincent Vanwaelscappel [Mon, 5 Nov 2018 12:56:38 +0000 (13:56 +0100)]
wip #2321 @0.5
Vincent Vanwaelscappel [Mon, 5 Nov 2018 09:46:29 +0000 (10:46 +0100)]
wait #2227 @0:20
Vincent Vanwaelscappel [Mon, 5 Nov 2018 09:30:56 +0000 (10:30 +0100)]
wip #2227 @0:10
Vincent Vanwaelscappel [Tue, 30 Oct 2018 11:11:55 +0000 (12:11 +0100)]
wip #2321 @1:15
Vincent Vanwaelscappel [Mon, 29 Oct 2018 16:52:48 +0000 (17:52 +0100)]
wip #809 @0:20
Vincent Vanwaelscappel [Mon, 29 Oct 2018 16:32:11 +0000 (17:32 +0100)]
wip #809 @0:45
Vincent Vanwaelscappel [Mon, 29 Oct 2018 15:46:12 +0000 (16:46 +0100)]
wip #809 @1
Vincent Vanwaelscappel [Mon, 29 Oct 2018 14:53:10 +0000 (15:53 +0100)]
wip #809 @1:10
Vincent Vanwaelscappel [Mon, 29 Oct 2018 13:39:55 +0000 (14:39 +0100)]
wip #2320 @1
Vincent Vanwaelscappel [Mon, 29 Oct 2018 11:23:41 +0000 (12:23 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip
# Conflicts:
# js/libs/fluidbook/fluidbook.resize.js
Vincent Vanwaelscappel [Mon, 29 Oct 2018 11:22:32 +0000 (12:22 +0100)]
fix #2319 @0:20
Vincent Vanwaelscappel [Mon, 29 Oct 2018 10:54:44 +0000 (11:54 +0100)]
wip #2309 @1
Vincent Vanwaelscappel [Fri, 26 Oct 2018 16:27:22 +0000 (18:27 +0200)]
wip #2315 @2
Vincent Vanwaelscappel [Fri, 26 Oct 2018 13:06:15 +0000 (15:06 +0200)]
fix #2312 @2
Vincent Vanwaelscappel [Fri, 26 Oct 2018 13:01:48 +0000 (15:01 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Fri, 26 Oct 2018 09:26:52 +0000 (11:26 +0200)]
wait #2277 @0.5
Vincent Vanwaelscappel [Thu, 25 Oct 2018 17:08:21 +0000 (19:08 +0200)]
wip #2312 @1
Vincent Vanwaelscappel [Thu, 25 Oct 2018 16:50:06 +0000 (18:50 +0200)]
wip #2313 @0.25
Vincent Vanwaelscappel [Thu, 25 Oct 2018 16:20:26 +0000 (18:20 +0200)]
fix #2311 @1.5
Vincent Vanwaelscappel [Thu, 25 Oct 2018 14:13:30 +0000 (16:13 +0200)]
fix #2310 @4
Vincent Vanwaelscappel [Wed, 24 Oct 2018 14:10:49 +0000 (16:10 +0200)]
wip #809 @1
Vincent Vanwaelscappel [Wed, 24 Oct 2018 13:53:09 +0000 (15:53 +0200)]
Merge remote-tracking branch 'origin/master' into 3dflip
# Conflicts:
# js/libs/fluidbook/fluidbook.js
# js/libs/fluidbook/fluidbook.links.js
# js/libs/fluidbook/fluidbook.loader.js
# js/libs/fluidbook/fluidbook.resize.js
# js/libs/fluidbook/fluidbook.zoom.js
# js/main.js
Vincent Vanwaelscappel [Wed, 24 Oct 2018 12:42:12 +0000 (14:42 +0200)]
fix #2020 @0:05
Vincent Vanwaelscappel [Wed, 24 Oct 2018 12:36:43 +0000 (14:36 +0200)]
fix #1730 @1
Vincent Vanwaelscappel [Wed, 24 Oct 2018 08:46:19 +0000 (10:46 +0200)]
done #2299 @0.5
Vincent Vanwaelscappel [Wed, 24 Oct 2018 08:23:51 +0000 (10:23 +0200)]
Merge remote-tracking branch 'origin/onepage'
# Conflicts:
# js/libs/fluidbook/menu/fluidbook.index.js
Vincent Vanwaelscappel [Tue, 23 Oct 2018 17:17:20 +0000 (19:17 +0200)]
wait #2299 @0:20
Vincent Vanwaelscappel [Tue, 23 Oct 2018 17:05:20 +0000 (19:05 +0200)]
wip #2299 @0:10
Vincent Vanwaelscappel [Tue, 23 Oct 2018 16:59:19 +0000 (18:59 +0200)]
wip #2299 @1
Vincent Vanwaelscappel [Tue, 23 Oct 2018 16:07:26 +0000 (18:07 +0200)]
wip #2277 @4
Vincent Vanwaelscappel [Mon, 22 Oct 2018 09:58:39 +0000 (11:58 +0200)]
Merge remote-tracking branch 'origin/master' into zoomhd
Vincent Vanwaelscappel [Fri, 19 Oct 2018 09:33:26 +0000 (11:33 +0200)]
wip #2303 @1
Vincent Vanwaelscappel [Thu, 18 Oct 2018 08:48:17 +0000 (10:48 +0200)]
#2263 @0.5
Vincent Vanwaelscappel [Tue, 16 Oct 2018 13:15:50 +0000 (15:15 +0200)]
wip #2286 @0:20
Vincent Vanwaelscappel [Tue, 16 Oct 2018 12:56:30 +0000 (14:56 +0200)]
Merge remote-tracking branch 'origin/master' into zoomhd
Vincent Vanwaelscappel [Tue, 16 Oct 2018 12:55:47 +0000 (14:55 +0200)]
wip #2286 @1
Vincent Vanwaelscappel [Tue, 16 Oct 2018 12:15:00 +0000 (14:15 +0200)]
wipe #2298 @2.5
Vincent Vanwaelscappel [Mon, 15 Oct 2018 17:05:32 +0000 (19:05 +0200)]
wipe #2298 @4
Vincent Vanwaelscappel [Mon, 15 Oct 2018 10:36:12 +0000 (12:36 +0200)]
wip #2286 @4
Vincent Vanwaelscappel [Thu, 11 Oct 2018 15:07:50 +0000 (17:07 +0200)]
wip #2286 @3
Vincent Vanwaelscappel [Wed, 10 Oct 2018 18:02:01 +0000 (20:02 +0200)]
wip #2286 @1.5
projects / fluidbook-html5.git / log