]> _ Git - fluidbook-html5.git/log
fluidbook-html5.git
7 years agowip #2512 @3
Vincent Vanwaelscappel [Thu, 17 Jan 2019 18:21:45 +0000 (19:21 +0100)]
wip #2512 @3

7 years agowip #2512 @1.5
Vincent Vanwaelscappel [Tue, 15 Jan 2019 18:11:42 +0000 (19:11 +0100)]
wip #2512 @1.5

7 years agodone #2513 @1
Vincent Vanwaelscappel [Tue, 15 Jan 2019 15:52:15 +0000 (16:52 +0100)]
done #2513 @1

7 years agowip #2321 @0.5
Vincent Vanwaelscappel [Fri, 11 Jan 2019 17:07:48 +0000 (18:07 +0100)]
wip #2321 @0.5

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Fri, 11 Jan 2019 17:00:12 +0000 (18:00 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

7 years agowait #2497 @0.5
Vincent Vanwaelscappel [Fri, 11 Jan 2019 16:02:57 +0000 (17:02 +0100)]
wait #2497 @0.5

7 years agofix #2504
Vincent Vanwaelscappel [Fri, 11 Jan 2019 15:30:54 +0000 (16:30 +0100)]
fix #2504

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Fri, 11 Jan 2019 11:13:52 +0000 (12:13 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# js/libs/fluidbook/fluidbook.js
# js/libs/fluidbook/fluidbook.support.js

7 years agofix #2505 @0.5
Vincent Vanwaelscappel [Thu, 10 Jan 2019 18:02:27 +0000 (19:02 +0100)]
fix #2505 @0.5

7 years agotry #2502 @1.5
Vincent Vanwaelscappel [Thu, 10 Jan 2019 17:24:38 +0000 (18:24 +0100)]
try #2502 @1.5

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 10 Jan 2019 16:25:34 +0000 (17:25 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

7 years ago#2502
Vincent Vanwaelscappel [Thu, 10 Jan 2019 16:24:57 +0000 (17:24 +0100)]
#2502

7 years agowip #2502 @2
Vincent Vanwaelscappel [Thu, 10 Jan 2019 16:02:53 +0000 (17:02 +0100)]
wip #2502 @2

7 years agofix #2503 @2
Vincent Vanwaelscappel [Thu, 10 Jan 2019 15:09:10 +0000 (16:09 +0100)]
fix #2503 @2

7 years ago#2502
Vincent Vanwaelscappel [Thu, 10 Jan 2019 15:06:19 +0000 (16:06 +0100)]
#2502

7 years agowip #2500 @1
Vincent Vanwaelscappel [Thu, 10 Jan 2019 13:27:01 +0000 (14:27 +0100)]
wip #2500 @1

7 years agowip #2476 @0:05
Vincent Vanwaelscappel [Tue, 8 Jan 2019 11:08:01 +0000 (12:08 +0100)]
wip #2476 @0:05

7 years agowip #2476 @0:05
Vincent Vanwaelscappel [Tue, 8 Jan 2019 11:03:40 +0000 (12:03 +0100)]
wip #2476 @0:05

7 years agowip #2332 @4
Vincent Vanwaelscappel [Mon, 7 Jan 2019 18:43:30 +0000 (19:43 +0100)]
wip #2332 @4

7 years agowip #2441
Vincent Vanwaelscappel [Fri, 4 Jan 2019 18:02:13 +0000 (19:02 +0100)]
wip #2441

7 years agowip #2441 @2
Vincent Vanwaelscappel [Fri, 4 Jan 2019 17:48:47 +0000 (18:48 +0100)]
wip #2441 @2

7 years agowip #2441 @2
Vincent Vanwaelscappel [Fri, 4 Jan 2019 14:53:09 +0000 (15:53 +0100)]
wip #2441 @2

7 years agowip #2332
Vincent Vanwaelscappel [Wed, 2 Jan 2019 19:09:49 +0000 (20:09 +0100)]
wip #2332

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Wed, 2 Jan 2019 18:05:01 +0000 (19:05 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

7 years agowip #2438 @3
Vincent Vanwaelscappel [Fri, 21 Dec 2018 17:14:31 +0000 (18:14 +0100)]
wip #2438 @3

7 years agowip #2303 @3
Vincent Vanwaelscappel [Thu, 20 Dec 2018 19:25:34 +0000 (20:25 +0100)]
wip #2303 @3

7 years ago#2249
Vincent Vanwaelscappel [Wed, 19 Dec 2018 17:53:32 +0000 (18:53 +0100)]
#2249

7 years agoMerge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Wed, 19 Dec 2018 15:49:31 +0000 (16:49 +0100)]
Merge remote-tracking branch 'origin/master'

7 years agowip #2449 @0.5
Vincent Vanwaelscappel [Wed, 19 Dec 2018 15:49:14 +0000 (16:49 +0100)]
wip #2449 @0.5

7 years agoSuppress bookmarks option in print/download modal when bookmarks are disabled. WIP...
Stephen Cameron [Wed, 19 Dec 2018 09:59:19 +0000 (10:59 +0100)]
Suppress bookmarks option in print/download modal when bookmarks are disabled. WIP #1806 @0.25

7 years agowait #2244 @1.5
Vincent Vanwaelscappel [Mon, 17 Dec 2018 18:13:21 +0000 (19:13 +0100)]
wait #2244 @1.5

7 years agofix #2243 @0:20
Vincent Vanwaelscappel [Mon, 17 Dec 2018 15:54:31 +0000 (16:54 +0100)]
fix #2243 @0:20

7 years agofix #2437 @2
Vincent Vanwaelscappel [Mon, 17 Dec 2018 15:38:18 +0000 (16:38 +0100)]
fix #2437 @2

7 years ago#2428
Vincent Vanwaelscappel [Fri, 14 Dec 2018 17:58:04 +0000 (18:58 +0100)]
#2428

7 years ago#2440
Vincent Vanwaelscappel [Fri, 14 Dec 2018 17:57:27 +0000 (18:57 +0100)]
#2440

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Fri, 14 Dec 2018 17:56:01 +0000 (18:56 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# js/libs/fluidbook/fluidbook.nav.js

7 years agofix #2440 @2
Vincent Vanwaelscappel [Fri, 14 Dec 2018 17:50:37 +0000 (18:50 +0100)]
fix #2440 @2

7 years agotry #2436 @0.5
Vincent Vanwaelscappel [Thu, 13 Dec 2018 17:29:59 +0000 (18:29 +0100)]
try #2436 @0.5

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 13 Dec 2018 15:11:36 +0000 (16:11 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

7 years ago#2432
Vincent Vanwaelscappel [Thu, 13 Dec 2018 14:41:49 +0000 (15:41 +0100)]
#2432

7 years ago#2430
Vincent Vanwaelscappel [Thu, 13 Dec 2018 14:40:28 +0000 (15:40 +0100)]
#2430

7 years agofix #2433 @0.5
Vincent Vanwaelscappel [Thu, 13 Dec 2018 14:38:17 +0000 (15:38 +0100)]
fix #2433 @0.5

7 years agofix #2432 @0.5
Vincent Vanwaelscappel [Thu, 13 Dec 2018 14:11:45 +0000 (15:11 +0100)]
fix #2432 @0.5

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 13 Dec 2018 13:30:35 +0000 (14:30 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

7 years agowait #2429 @0.25
Vincent Vanwaelscappel [Thu, 13 Dec 2018 12:09:24 +0000 (13:09 +0100)]
wait #2429 @0.25

7 years agowip #2428 @4
Vincent Vanwaelscappel [Wed, 12 Dec 2018 17:47:16 +0000 (18:47 +0100)]
wip #2428 @4

7 years ago#2309
Vincent Vanwaelscappel [Tue, 11 Dec 2018 13:55:25 +0000 (14:55 +0100)]
#2309

7 years agofix #2309 @0.5
Vincent Vanwaelscappel [Tue, 11 Dec 2018 15:20:02 +0000 (16:20 +0100)]
fix #2309 @0.5

7 years agofix #2309 @0.5
Vincent Vanwaelscappel [Tue, 11 Dec 2018 15:09:19 +0000 (16:09 +0100)]
fix #2309 @0.5

7 years agofix #2309 @1.5
Vincent Vanwaelscappel [Tue, 11 Dec 2018 14:35:21 +0000 (15:35 +0100)]
fix #2309 @1.5

7 years agowip #2309 @4
Vincent Vanwaelscappel [Tue, 11 Dec 2018 13:55:25 +0000 (14:55 +0100)]
wip #2309 @4

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Tue, 11 Dec 2018 13:00:59 +0000 (14:00 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# js/libs/fluidbook/fluidbook.pagetransitions.js

7 years agotry #2423 @1
Vincent Vanwaelscappel [Tue, 11 Dec 2018 11:02:08 +0000 (12:02 +0100)]
try #2423 @1

7 years agofix #2419 @1
Vincent Vanwaelscappel [Mon, 10 Dec 2018 15:21:34 +0000 (16:21 +0100)]
fix #2419 @1

7 years agofix #2415 @1.5
Vincent Vanwaelscappel [Mon, 10 Dec 2018 11:26:34 +0000 (12:26 +0100)]
fix #2415 @1.5

7 years agowip #2410 @4
Vincent Vanwaelscappel [Fri, 7 Dec 2018 13:20:13 +0000 (14:20 +0100)]
wip #2410 @4

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Fri, 7 Dec 2018 13:19:25 +0000 (14:19 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

7 years agofix #2411 @0.5
Vincent Vanwaelscappel [Fri, 7 Dec 2018 12:56:36 +0000 (13:56 +0100)]
fix #2411 @0.5

7 years agofix #2412 @0:15
Vincent Vanwaelscappel [Fri, 7 Dec 2018 11:49:54 +0000 (12:49 +0100)]
fix #2412 @0:15

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Fri, 7 Dec 2018 11:49:01 +0000 (12:49 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
# js/libs/fluidbook/fluidbook.pagetransitions.js

7 years agoMerge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Fri, 7 Dec 2018 11:41:49 +0000 (12:41 +0100)]
Merge remote-tracking branch 'origin/master'

7 years agowip #2412 @0.5
Vincent Vanwaelscappel [Fri, 7 Dec 2018 11:39:39 +0000 (12:39 +0100)]
wip #2412 @0.5

7 years agowip #2410 @4
Vincent Vanwaelscappel [Thu, 6 Dec 2018 16:19:05 +0000 (17:19 +0100)]
wip #2410 @4

7 years agoMerge remote-tracking branch 'origin/master'
Stephen Cameron [Thu, 6 Dec 2018 11:13:23 +0000 (12:13 +0100)]
Merge remote-tracking branch 'origin/master'

7 years agoFix #2407 @0.75
Stephen Cameron [Thu, 6 Dec 2018 11:12:44 +0000 (12:12 +0100)]
Fix #2407 @0.75

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 6 Dec 2018 10:53:02 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

7 years agoMerge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Thu, 6 Dec 2018 10:42:15 +0000 (11:42 +0100)]
Merge remote-tracking branch 'origin/master'

7 years agofix #2408 @0.25
Vincent Vanwaelscappel [Thu, 6 Dec 2018 10:41:53 +0000 (11:41 +0100)]
fix #2408 @0.25

7 years agoMerge remote-tracking branch 'origin/master' into 3dflip
Vincent Vanwaelscappel [Thu, 6 Dec 2018 09:48:31 +0000 (10:48 +0100)]
Merge remote-tracking branch 'origin/master' into 3dflip

7 years agoFix blank page height problem. Done #817 @0.25
Stephen Cameron [Wed, 5 Dec 2018 16:52:07 +0000 (17:52 +0100)]
Fix blank page height problem. Done #817 @0.25

7 years agowip #2406 @1
Vincent Vanwaelscappel [Wed, 5 Dec 2018 16:35:15 +0000 (17:35 +0100)]
wip #2406 @1

7 years agoMerge remote-tracking branch 'origin/master' into printing
Stephen Cameron [Wed, 5 Dec 2018 16:00:37 +0000 (17:00 +0100)]
Merge remote-tracking branch 'origin/master' into printing

7 years ago#2404
Vincent Vanwaelscappel [Wed, 5 Dec 2018 15:19:06 +0000 (16:19 +0100)]
#2404

7 years agofix #2404 @0.5
Vincent Vanwaelscappel [Wed, 5 Dec 2018 15:09:49 +0000 (16:09 +0100)]
fix #2404 @0.5

7 years agofix #2399 @.5
Vincent Vanwaelscappel [Wed, 5 Dec 2018 13:52:12 +0000 (14:52 +0100)]
fix #2399 @.5

7 years ago#809 @0.5
Vincent Vanwaelscappel [Wed, 5 Dec 2018 13:22:15 +0000 (14:22 +0100)]
#809 @0.5

7 years agoMerge remote-tracking branch 'origin/printing' into printing
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

7 years agoPre-merge clean up. WIP #817 @0:05
Stephen Cameron [Wed, 5 Dec 2018 12:42:33 +0000 (13:42 +0100)]
Pre-merge clean up. WIP #817 @0:05

7 years agofix #2372 @1
Vincent Vanwaelscappel [Wed, 5 Dec 2018 11:21:14 +0000 (12:21 +0100)]
fix #2372 @1

7 years agofix #2336 @0.5
Vincent Vanwaelscappel [Tue, 4 Dec 2018 18:04:51 +0000 (19:04 +0100)]
fix #2336 @0.5

7 years agowip #2389 @1
Vincent Vanwaelscappel [Mon, 3 Dec 2018 17:23:11 +0000 (18:23 +0100)]
wip #2389 @1

7 years ago#2385
Vincent Vanwaelscappel [Fri, 30 Nov 2018 13:14:43 +0000 (14:14 +0100)]
#2385

7 years agoAdjustments to ghost pages and radio button colours. WIP #817 @0.75
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

7 years agowip #2303 @1.5
Vincent Vanwaelscappel [Thu, 29 Nov 2018 13:39:33 +0000 (14:39 +0100)]
wip #2303 @1.5

7 years agowip #2303 @0.25
Vincent Vanwaelscappel [Thu, 29 Nov 2018 11:11:22 +0000 (12:11 +0100)]
wip #2303 @0.25

7 years agofix #2383 @0.15
Vincent Vanwaelscappel [Thu, 29 Nov 2018 10:25:54 +0000 (11:25 +0100)]
fix #2383 @0.15

7 years agoWIP #817 @2
Stephen Cameron [Thu, 29 Nov 2018 10:13:27 +0000 (11:13 +0100)]
WIP #817 @2

7 years agoWIP #817 @3.5
Stephen Cameron [Wed, 28 Nov 2018 16:54:27 +0000 (17:54 +0100)]
WIP #817 @3.5

7 years agofix #2379 @0:15
Vincent Vanwaelscappel [Tue, 27 Nov 2018 15:52:07 +0000 (16:52 +0100)]
fix #2379 @0:15

7 years agofix #2375 @1
Vincent Vanwaelscappel [Mon, 26 Nov 2018 16:35:31 +0000 (17:35 +0100)]
fix #2375 @1

7 years agowip #2365 @1
Vincent Vanwaelscappel [Mon, 26 Nov 2018 12:46:45 +0000 (13:46 +0100)]
wip #2365 @1

7 years agotry #2371 @0.5
Vincent Vanwaelscappel [Fri, 23 Nov 2018 18:13:22 +0000 (19:13 +0100)]
try #2371 @0.5

7 years ago#2370
Vincent Vanwaelscappel [Fri, 23 Nov 2018 17:35:15 +0000 (18:35 +0100)]
#2370

7 years agofix #2369 @0:20
Vincent Vanwaelscappel [Fri, 23 Nov 2018 17:28:26 +0000 (18:28 +0100)]
fix #2369 @0:20

7 years agofix #2370 @0:20
Vincent Vanwaelscappel [Fri, 23 Nov 2018 17:28:11 +0000 (18:28 +0100)]
fix #2370 @0:20

7 years agowip #2365 @0:01
Vincent Vanwaelscappel [Fri, 23 Nov 2018 16:24:22 +0000 (17:24 +0100)]
wip #2365 @0:01

7 years agowip #2365 @0:01
Vincent Vanwaelscappel [Fri, 23 Nov 2018 16:22:41 +0000 (17:22 +0100)]
wip #2365 @0:01

7 years agowip #2368 @0:01
Vincent Vanwaelscappel [Fri, 23 Nov 2018 16:20:28 +0000 (17:20 +0100)]
wip #2368 @0:01

7 years agowip #2368 @0:05
Vincent Vanwaelscappel [Fri, 23 Nov 2018 16:19:25 +0000 (17:19 +0100)]
wip #2368 @0:05

7 years agofix #2366 @0:10
Vincent Vanwaelscappel [Fri, 23 Nov 2018 15:54:17 +0000 (16:54 +0100)]
fix #2366 @0:10