]>
_ Git - fluidbook-html5.git/log
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
Vincent Vanwaelscappel [Wed, 10 Oct 2018 16:55:08 +0000 (18:55 +0200)]
wip #2286 @1
Vincent Vanwaelscappel [Tue, 9 Oct 2018 13:55:58 +0000 (15:55 +0200)]
#2226 @0:05
Vincent Vanwaelscappel [Mon, 8 Oct 2018 15:38:11 +0000 (17:38 +0200)]
wait #2292 @0:40
Vincent Vanwaelscappel [Fri, 5 Oct 2018 16:24:14 +0000 (18:24 +0200)]
#2228 @0:10
Vincent Vanwaelscappel [Fri, 5 Oct 2018 15:31:02 +0000 (17:31 +0200)]
fix #2228 @0:20
Vincent Vanwaelscappel [Fri, 5 Oct 2018 15:09:33 +0000 (17:09 +0200)]
fix #2228 @0:05
Vincent Vanwaelscappel [Fri, 5 Oct 2018 15:03:50 +0000 (17:03 +0200)]
fix #2289 @0:50
Vincent Vanwaelscappel [Fri, 5 Oct 2018 15:02:56 +0000 (17:02 +0200)]
wip #2228 @1.5
Vincent Vanwaelscappel [Fri, 5 Oct 2018 09:50:47 +0000 (11:50 +0200)]
#2227
Vincent Vanwaelscappel [Fri, 5 Oct 2018 09:50:28 +0000 (11:50 +0200)]
#2227
Vincent Vanwaelscappel [Fri, 5 Oct 2018 09:39:00 +0000 (11:39 +0200)]
#2288
Vincent Vanwaelscappel [Thu, 4 Oct 2018 16:37:35 +0000 (18:37 +0200)]
done #2288 @1.5
Vincent Vanwaelscappel [Thu, 4 Oct 2018 15:05:34 +0000 (17:05 +0200)]
Merge remote-tracking branch 'origin/master' into searchreference
Vincent Vanwaelscappel [Thu, 4 Oct 2018 15:03:03 +0000 (17:03 +0200)]
Merge remote-tracking branch 'origin/averyform'
Vincent Vanwaelscappel [Thu, 4 Oct 2018 15:02:35 +0000 (17:02 +0200)]
Merge remote-tracking branch 'origin/master' into averyform
Vincent Vanwaelscappel [Thu, 4 Oct 2018 15:02:17 +0000 (17:02 +0200)]
Merge remote-tracking branch 'origin/averyform' into searchreference
Vincent Vanwaelscappel [Thu, 4 Oct 2018 15:01:30 +0000 (17:01 +0200)]
Merge remote-tracking branch 'origin/averyform'
Vincent Vanwaelscappel [Thu, 4 Oct 2018 15:00:37 +0000 (17:00 +0200)]
Merge remote-tracking branch 'origin/master' into searchreference
Vincent Vanwaelscappel [Thu, 4 Oct 2018 12:47:30 +0000 (14:47 +0200)]
wip #2227 @3
Vincent Vanwaelscappel [Wed, 3 Oct 2018 09:30:41 +0000 (11:30 +0200)]
#2231
Vincent Vanwaelscappel [Wed, 3 Oct 2018 09:28:56 +0000 (11:28 +0200)]
wait #2231 @0.5
Vincent Vanwaelscappel [Tue, 2 Oct 2018 12:15:13 +0000 (14:15 +0200)]
wip #2251 @1
Vincent Vanwaelscappel [Tue, 2 Oct 2018 10:18:09 +0000 (12:18 +0200)]
wip #2208 @0:05
Vincent Vanwaelscappel [Tue, 2 Oct 2018 10:10:40 +0000 (12:10 +0200)]
Merge remote-tracking branch 'origin/master' into averyform
Vincent Vanwaelscappel [Tue, 2 Oct 2018 10:10:02 +0000 (12:10 +0200)]
wip #2251 @0:10
Vincent Vanwaelscappel [Tue, 2 Oct 2018 09:54:10 +0000 (11:54 +0200)]
wip #2251 @1
Vincent Vanwaelscappel [Tue, 2 Oct 2018 08:44:27 +0000 (10:44 +0200)]
wip #2251 @1
Vincent Vanwaelscappel [Mon, 1 Oct 2018 16:57:04 +0000 (18:57 +0200)]
wip #2251 @1
Vincent Vanwaelscappel [Mon, 1 Oct 2018 15:37:10 +0000 (17:37 +0200)]
wip #2251 @3
Vincent Vanwaelscappel [Mon, 1 Oct 2018 15:05:56 +0000 (17:05 +0200)]
Merge remote-tracking branch 'origin/master' into searchreference
Vincent Vanwaelscappel [Mon, 1 Oct 2018 14:55:08 +0000 (16:55 +0200)]
wip #22841 @0:05
Vincent Vanwaelscappel [Mon, 1 Oct 2018 13:48:44 +0000 (15:48 +0200)]
Merge remote-tracking branch 'origin/master' into searchreference
Stephen Cameron [Mon, 1 Oct 2018 12:44:29 +0000 (14:44 +0200)]
Merge branch 'master' into zoom-groups
Vincent Vanwaelscappel [Fri, 28 Sep 2018 16:45:11 +0000 (18:45 +0200)]
wip #2251 @1
Vincent Vanwaelscappel [Fri, 28 Sep 2018 15:55:36 +0000 (17:55 +0200)]
Merge remote-tracking branch 'origin/master' into averyform
Vincent Vanwaelscappel [Fri, 28 Sep 2018 14:58:11 +0000 (16:58 +0200)]
wip #2278 @0:10
Vincent Vanwaelscappel [Fri, 28 Sep 2018 13:23:09 +0000 (15:23 +0200)]
wip #2208 @0.5
Vincent Vanwaelscappel [Fri, 28 Sep 2018 13:13:32 +0000 (15:13 +0200)]
wip #2208 @0.5
Vincent Vanwaelscappel [Fri, 28 Sep 2018 12:54:34 +0000 (14:54 +0200)]
wip #2208 @1
Vincent Vanwaelscappel [Fri, 28 Sep 2018 12:02:19 +0000 (14:02 +0200)]
wip #2208 @1
Vincent Vanwaelscappel [Thu, 27 Sep 2018 16:26:57 +0000 (18:26 +0200)]
wip #2208 @5
Vincent Vanwaelscappel [Wed, 26 Sep 2018 15:53:51 +0000 (17:53 +0200)]
wip #2208 @5
Vincent Vanwaelscappel [Wed, 26 Sep 2018 12:22:35 +0000 (14:22 +0200)]
Merge remote-tracking branch 'origin/master' into averyform
Vincent Vanwaelscappel [Tue, 25 Sep 2018 17:17:29 +0000 (19:17 +0200)]
try #2270 @0.5
Vincent Vanwaelscappel [Tue, 25 Sep 2018 16:48:58 +0000 (18:48 +0200)]
Merge remote-tracking branch 'origin/master' into averyform
Vincent Vanwaelscappel [Tue, 25 Sep 2018 16:19:56 +0000 (18:19 +0200)]
try #2270 @1
Stephen Cameron [Mon, 24 Sep 2018 15:12:23 +0000 (17:12 +0200)]
Disable click/hover on legend zoom zones. Dynamically position a single close button based on the layout of the zoom zones. WIP #2087 @2
Vincent Vanwaelscappel [Fri, 21 Sep 2018 15:04:04 +0000 (17:04 +0200)]
done #2264 @0.25
Vincent Vanwaelscappel [Fri, 21 Sep 2018 13:04:55 +0000 (15:04 +0200)]
wip #2217 @3
Vincent Vanwaelscappel [Thu, 20 Sep 2018 19:09:39 +0000 (21:09 +0200)]
wip #2217 @2
Vincent Vanwaelscappel [Thu, 20 Sep 2018 17:07:53 +0000 (19:07 +0200)]
wip #2217 @0.5
projects / fluidbook-html5.git / log