]> _ Git - fluidbook-html5.git/log
fluidbook-html5.git
8 years ago#1763
Vincent Vanwaelscappel [Tue, 24 Oct 2017 10:03:59 +0000 (12:03 +0200)]
#1763

8 years agowip #1710 @4
Vincent Vanwaelscappel [Mon, 23 Oct 2017 17:15:06 +0000 (19:15 +0200)]
wip #1710 @4

8 years agowip #1710 @0:15
Vincent Vanwaelscappel [Mon, 23 Oct 2017 14:43:34 +0000 (16:43 +0200)]
wip #1710 @0:15

8 years agoMerge remote-tracking branch 'origin/centerbook'
Vincent Vanwaelscappel [Mon, 23 Oct 2017 14:02:40 +0000 (16:02 +0200)]
Merge remote-tracking branch 'origin/centerbook'

8 years agodone #1763 @0.5
Vincent Vanwaelscappel [Mon, 23 Oct 2017 13:59:46 +0000 (15:59 +0200)]
done #1763 @0.5

8 years agowip #1739 @1.5
Vincent Vanwaelscappel [Mon, 23 Oct 2017 11:50:46 +0000 (13:50 +0200)]
wip #1739 @1.5

8 years agoMerge remote-tracking branch 'origin/master'
Stephen Cameron [Fri, 20 Oct 2017 14:57:03 +0000 (16:57 +0200)]
Merge remote-tracking branch 'origin/master'

8 years agoOpen "extra" link in new tab. Fix spacing bug in burger menu. WIP #1762 @0.25
Stephen Cameron [Fri, 20 Oct 2017 14:56:27 +0000 (16:56 +0200)]
Open "extra" link in new tab. Fix spacing bug in burger menu. WIP #1762 @0.25

8 years agowip #1739 @1.5
Vincent Vanwaelscappel [Thu, 19 Oct 2017 17:08:08 +0000 (19:08 +0200)]
wip #1739 @1.5

8 years agowait #813 @5
Vincent Vanwaelscappel [Thu, 19 Oct 2017 15:42:56 +0000 (17:42 +0200)]
wait #813 @5

8 years ago#1759
Vincent Vanwaelscappel [Wed, 18 Oct 2017 15:46:28 +0000 (17:46 +0200)]
#1759

8 years agowip #1748 @6
Vincent Vanwaelscappel [Tue, 17 Oct 2017 16:41:12 +0000 (18:41 +0200)]
wip #1748 @6

8 years agoMerge remote-tracking branch 'origin/master'
Vincent Vanwaelscappel [Tue, 17 Oct 2017 14:27:03 +0000 (16:27 +0200)]
Merge remote-tracking branch 'origin/master'

8 years agofix #1758 @0.25
Vincent Vanwaelscappel [Tue, 17 Oct 2017 14:26:46 +0000 (16:26 +0200)]
fix #1758 @0.25

8 years agoFix #1757 @0.25
Stephen Cameron [Tue, 17 Oct 2017 09:43:21 +0000 (11:43 +0200)]
Fix #1757 @0.25

8 years agowip #1748 @2
Vincent Vanwaelscappel [Mon, 16 Oct 2017 16:42:39 +0000 (18:42 +0200)]
wip #1748 @2

8 years agofix #1755 @0.5
Vincent Vanwaelscappel [Mon, 16 Oct 2017 14:02:29 +0000 (16:02 +0200)]
fix #1755 @0.5

8 years agofix #1738 @0.75
Vincent Vanwaelscappel [Fri, 13 Oct 2017 15:54:21 +0000 (17:54 +0200)]
fix #1738 @0.75

8 years agofix #1749 @2
Vincent Vanwaelscappel [Fri, 13 Oct 2017 14:58:49 +0000 (16:58 +0200)]
fix #1749 @2

8 years agofix #1641 @3
Vincent Vanwaelscappel [Wed, 11 Oct 2017 17:20:51 +0000 (19:20 +0200)]
fix #1641 @3

8 years agofix #1747 @0.25
Vincent Vanwaelscappel [Wed, 11 Oct 2017 16:53:20 +0000 (18:53 +0200)]
fix #1747 @0.25

8 years agofix #1746 @0:10
Vincent Vanwaelscappel [Wed, 11 Oct 2017 13:55:27 +0000 (15:55 +0200)]
fix #1746 @0:10

8 years agofix #1745 @0:10
Vincent Vanwaelscappel [Wed, 11 Oct 2017 13:46:21 +0000 (15:46 +0200)]
fix #1745 @0:10

8 years agowip #1744 @0:05
Vincent Vanwaelscappel [Wed, 11 Oct 2017 13:21:14 +0000 (15:21 +0200)]
wip #1744 @0:05

8 years agowip #1743 @0:10
Vincent Vanwaelscappel [Wed, 11 Oct 2017 13:10:58 +0000 (15:10 +0200)]
wip #1743 @0:10

8 years ago#807
Vincent Vanwaelscappel [Wed, 11 Oct 2017 12:30:48 +0000 (14:30 +0200)]
#807

8 years agoFix #1732 @0:20
Stephen Cameron [Tue, 10 Oct 2017 16:33:06 +0000 (18:33 +0200)]
Fix #1732 @0:20

8 years agoRefactor helpView, add proper support for interface scaling and fix numerous display...
Stephen Cameron [Tue, 10 Oct 2017 16:07:29 +0000 (18:07 +0200)]
Refactor helpView, add proper support for interface scaling and fix numerous display bugs. Done #1736 @6.25

8 years agowip #1740 @0.5
Vincent Vanwaelscappel [Tue, 10 Oct 2017 11:44:06 +0000 (13:44 +0200)]
wip #1740 @0.5

8 years agoFix #1733 @0.25
Stephen Cameron [Tue, 10 Oct 2017 09:37:24 +0000 (11:37 +0200)]
Fix #1733 @0.25

8 years agoWIP #1736 @4
Stephen Cameron [Fri, 6 Oct 2017 17:22:51 +0000 (19:22 +0200)]
WIP #1736 @4

8 years ago#1659
Vincent Vanwaelscappel [Fri, 6 Oct 2017 15:59:03 +0000 (17:59 +0200)]
#1659

8 years ago#1659
Vincent Vanwaelscappel [Fri, 6 Oct 2017 15:38:16 +0000 (17:38 +0200)]
#1659

8 years ago#812
Vincent Vanwaelscappel [Fri, 6 Oct 2017 15:30:36 +0000 (17:30 +0200)]
#812

8 years ago#812
Vincent Vanwaelscappel [Fri, 6 Oct 2017 15:28:34 +0000 (17:28 +0200)]
#812

8 years agoMerge remote-tracking branch 'origin/burgermenu' into burgermenu
Vincent Vanwaelscappel [Fri, 6 Oct 2017 14:00:53 +0000 (16:00 +0200)]
Merge remote-tracking branch 'origin/burgermenu' into burgermenu

8 years agofix #1442 @2
Vincent Vanwaelscappel [Fri, 6 Oct 2017 14:00:43 +0000 (16:00 +0200)]
fix #1442 @2

8 years agoMerge remote-tracking branch 'origin/burgermenu' into burgermenu
Stephen Cameron [Fri, 6 Oct 2017 10:34:08 +0000 (12:34 +0200)]
Merge remote-tracking branch 'origin/burgermenu' into burgermenu

8 years agoDone #1564 @0.25
Stephen Cameron [Fri, 6 Oct 2017 10:33:31 +0000 (12:33 +0200)]
Done #1564 @0.25

8 years agowip #1442 @0:05
Vincent Vanwaelscappel [Fri, 6 Oct 2017 10:09:52 +0000 (12:09 +0200)]
wip #1442 @0:05

8 years agofix #1731 @0:15
Vincent Vanwaelscappel [Fri, 6 Oct 2017 10:04:35 +0000 (12:04 +0200)]
fix #1731 @0:15

8 years agoMerge remote-tracking branch 'origin/burgermenu' into burgermenu
Vincent Vanwaelscappel [Fri, 6 Oct 2017 09:53:07 +0000 (11:53 +0200)]
Merge remote-tracking branch 'origin/burgermenu' into burgermenu

8 years agodone #1649 @0.5
Vincent Vanwaelscappel [Fri, 6 Oct 2017 09:52:56 +0000 (11:52 +0200)]
done #1649 @0.5

8 years agoMerge remote-tracking branch 'origin/burgermenu' into burgermenu
Stephen Cameron [Fri, 6 Oct 2017 09:41:38 +0000 (11:41 +0200)]
Merge remote-tracking branch 'origin/burgermenu' into burgermenu

8 years agoDone #1715 @0.5
Stephen Cameron [Fri, 6 Oct 2017 09:40:52 +0000 (11:40 +0200)]
Done #1715 @0.5

8 years ago#1649
Vincent Vanwaelscappel [Fri, 6 Oct 2017 09:33:54 +0000 (11:33 +0200)]
#1649

8 years agodone #1730 @0.25
Vincent Vanwaelscappel [Thu, 5 Oct 2017 17:03:41 +0000 (19:03 +0200)]
done #1730 @0.25

8 years agodone #1711 @0.5
Vincent Vanwaelscappel [Thu, 5 Oct 2017 15:57:49 +0000 (17:57 +0200)]
done #1711 @0.5

8 years agofix #1705 @0.5
Vincent Vanwaelscappel [Thu, 5 Oct 2017 15:29:24 +0000 (17:29 +0200)]
fix #1705 @0.5

8 years ago#1719
Vincent Vanwaelscappel [Wed, 4 Oct 2017 19:17:14 +0000 (21:17 +0200)]
#1719

8 years ago#1719
Vincent Vanwaelscappel [Wed, 4 Oct 2017 17:57:21 +0000 (19:57 +0200)]
#1719

8 years agodone #1717 @0:05
Vincent Vanwaelscappel [Wed, 4 Oct 2017 14:12:00 +0000 (16:12 +0200)]
done #1717 @0:05

8 years agoRename icon in sprite | wip #1719 @1.5
Vincent Vanwaelscappel [Wed, 4 Oct 2017 14:11:24 +0000 (16:11 +0200)]
Rename icon in sprite | wip #1719 @1.5

8 years agoUpdate contents icon. WIP #807 @0.25
Stephen Cameron [Wed, 4 Oct 2017 08:42:35 +0000 (10:42 +0200)]
Update contents icon. WIP #807 @0.25

8 years agoForce locales icon to end of list. WIP #807 @0:05
Stephen Cameron [Tue, 3 Oct 2017 16:33:45 +0000 (18:33 +0200)]
Force locales icon to end of list. WIP #807 @0:05

8 years agoMerge remote-tracking branch 'origin/burgermenu' into bookedges
Vincent Vanwaelscappel [Tue, 3 Oct 2017 15:23:26 +0000 (17:23 +0200)]
Merge remote-tracking branch 'origin/burgermenu' into bookedges

8 years agoMerge branch 'master' into burgermenu
Stephen Cameron [Tue, 3 Oct 2017 13:57:47 +0000 (15:57 +0200)]
Merge branch 'master' into burgermenu

8 years agoFix #1712 @0.5
Stephen Cameron [Tue, 3 Oct 2017 13:53:49 +0000 (15:53 +0200)]
Fix #1712 @0.5

8 years ago#1684
Vincent Vanwaelscappel [Tue, 3 Oct 2017 09:29:32 +0000 (11:29 +0200)]
#1684

8 years agoMerge branch 'master' into burgermenu
Stephen Cameron [Tue, 3 Oct 2017 09:23:07 +0000 (11:23 +0200)]
Merge branch 'master' into burgermenu

8 years agofix #1692 @0.25
Vincent Vanwaelscappel [Mon, 2 Oct 2017 15:47:17 +0000 (17:47 +0200)]
fix #1692 @0.25

8 years agoDone #1707 @3
Stephen Cameron [Mon, 2 Oct 2017 15:22:54 +0000 (17:22 +0200)]
Done #1707 @3

8 years agoDone #1679 @6.5
Stephen Cameron [Fri, 29 Sep 2017 17:10:04 +0000 (19:10 +0200)]
Done #1679 @6.5

8 years agoHelp overlay for bookmarks with handling for LTR, RTL and inverted layout versions...
Stephen Cameron [Thu, 28 Sep 2017 16:28:27 +0000 (18:28 +0200)]
Help overlay for bookmarks with handling for LTR, RTL and inverted layout versions. Done #1691 @6.5

8 years ago#1689
Vincent Vanwaelscappel [Thu, 28 Sep 2017 10:32:51 +0000 (12:32 +0200)]
#1689

8 years agoHandle RTL and inverted menu layouts in help view. Address bugs with resizing. WIP...
Stephen Cameron [Wed, 27 Sep 2017 15:38:49 +0000 (17:38 +0200)]
Handle RTL and inverted menu layouts in help view. Address bugs with resizing. WIP #1699 @4

8 years agowip #1689
Vincent Vanwaelscappel [Wed, 27 Sep 2017 14:29:00 +0000 (16:29 +0200)]
wip #1689

8 years agowip #1689
Vincent Vanwaelscappel [Wed, 27 Sep 2017 12:23:29 +0000 (14:23 +0200)]
wip #1689

8 years agowip #1689
Vincent Vanwaelscappel [Wed, 27 Sep 2017 12:10:23 +0000 (14:10 +0200)]
wip #1689

8 years agowip #1689
Vincent Vanwaelscappel [Wed, 27 Sep 2017 10:44:48 +0000 (12:44 +0200)]
wip #1689

8 years agoWIP #1699 @1.5
Stephen Cameron [Wed, 27 Sep 2017 10:23:16 +0000 (12:23 +0200)]
WIP #1699 @1.5

8 years agoWIP #1699 @5.5
Stephen Cameron [Tue, 26 Sep 2017 17:44:41 +0000 (19:44 +0200)]
WIP #1699 @5.5

8 years agoFix #1690 @0.75
Stephen Cameron [Tue, 26 Sep 2017 17:37:34 +0000 (19:37 +0200)]
Fix #1690 @0.75

8 years agofix #1696 @1.5
Vincent Vanwaelscappel [Tue, 26 Sep 2017 13:58:37 +0000 (15:58 +0200)]
fix #1696 @1.5

8 years ago#1698
Vincent Vanwaelscappel [Tue, 26 Sep 2017 13:24:51 +0000 (15:24 +0200)]
#1698

8 years agowip #1698 @0.5
Vincent Vanwaelscappel [Tue, 26 Sep 2017 13:20:01 +0000 (15:20 +0200)]
wip #1698 @0.5

8 years agowip #1698 @0.5
Vincent Vanwaelscappel [Tue, 26 Sep 2017 13:08:29 +0000 (15:08 +0200)]
wip #1698 @0.5

8 years agoMerge remote-tracking branch 'origin/bookedges'
Vincent Vanwaelscappel [Mon, 25 Sep 2017 13:54:26 +0000 (15:54 +0200)]
Merge remote-tracking branch 'origin/bookedges'

8 years agoMerge remote-tracking branch 'origin/master' into bookedges
Vincent Vanwaelscappel [Mon, 25 Sep 2017 13:53:30 +0000 (15:53 +0200)]
Merge remote-tracking branch 'origin/master' into bookedges

8 years agoMerge branch 'searchengine' into burgermenu
Stephen Cameron [Thu, 21 Sep 2017 15:54:00 +0000 (17:54 +0200)]
Merge branch 'searchengine' into burgermenu

8 years agoRefactoring sharing functionality and fix bug with sharing icon. WIP #807 @1.5
Stephen Cameron [Thu, 21 Sep 2017 15:41:05 +0000 (17:41 +0200)]
Refactoring sharing functionality and fix bug with sharing icon. WIP #807 @1.5

8 years agoDone #1676 @1.5
Stephen Cameron [Thu, 21 Sep 2017 14:44:37 +0000 (16:44 +0200)]
Done #1676 @1.5

8 years agoDon't show icon help labels when horizontal menu is hidden. #1678 @0:05
Stephen Cameron [Thu, 21 Sep 2017 10:28:00 +0000 (12:28 +0200)]
Don't show icon help labels when horizontal menu is hidden. #1678 @0:05

8 years agoDone #1678 @0.5
Stephen Cameron [Thu, 21 Sep 2017 10:23:30 +0000 (12:23 +0200)]
Done #1678 @0.5

8 years ago#1666 @1 | merge burgermenu in searchengine
Vincent Vanwaelscappel [Wed, 20 Sep 2017 17:00:32 +0000 (19:00 +0200)]
#1666 @1 | merge burgermenu in searchengine

8 years agoMerge remote-tracking branch 'origin/burgermenu' into searchengine
Vincent Vanwaelscappel [Wed, 20 Sep 2017 16:18:54 +0000 (18:18 +0200)]
Merge remote-tracking branch 'origin/burgermenu' into searchengine

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

8 years agowait #1466 @0.15
Vincent Vanwaelscappel [Wed, 20 Sep 2017 15:58:34 +0000 (17:58 +0200)]
wait #1466 @0.15

8 years agodone #1634 @2
Vincent Vanwaelscappel [Wed, 20 Sep 2017 15:54:11 +0000 (17:54 +0200)]
done #1634 @2

8 years agofix #1683 @0.5
Vincent Vanwaelscappel [Wed, 20 Sep 2017 15:26:32 +0000 (17:26 +0200)]
fix #1683 @0.5

8 years ago#1675
Vincent Vanwaelscappel [Wed, 20 Sep 2017 14:38:37 +0000 (16:38 +0200)]
#1675

8 years agowip #1673 @2
Vincent Vanwaelscappel [Wed, 20 Sep 2017 14:35:10 +0000 (16:35 +0200)]
wip #1673 @2

8 years agoSolve problem with burgermenu search results after merging changes from master branch...
Stephen Cameron [Tue, 19 Sep 2017 14:49:35 +0000 (16:49 +0200)]
Solve problem with burgermenu search results after merging changes from master branch. WIP #807 @0.5

8 years agoMerge branch 'master' into burgermenu
Stephen Cameron [Tue, 19 Sep 2017 13:54:27 +0000 (15:54 +0200)]
Merge branch 'master' into burgermenu

8 years agoManual merge adjustments between master and burgermenu branches.
Stephen Cameron [Tue, 19 Sep 2017 13:48:32 +0000 (15:48 +0200)]
Manual merge adjustments between master and burgermenu branches.

8 years agodone #1672 @0.5
Vincent Vanwaelscappel [Tue, 19 Sep 2017 13:28:24 +0000 (15:28 +0200)]
done #1672 @0.5

8 years agodone #1668 @1
Vincent Vanwaelscappel [Tue, 19 Sep 2017 13:04:33 +0000 (15:04 +0200)]
done #1668 @1

8 years agoMerge branch 'master' into burgermenu
Stephen Cameron [Tue, 19 Sep 2017 12:54:32 +0000 (14:54 +0200)]
Merge branch 'master' into burgermenu

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

8 years agoMerge remote-tracking branch 'origin/master' into searchengine
Vincent Vanwaelscappel [Tue, 19 Sep 2017 12:20:36 +0000 (14:20 +0200)]
Merge remote-tracking branch 'origin/master' into searchengine

8 years agofix #1671 @1
Vincent Vanwaelscappel [Tue, 19 Sep 2017 09:59:02 +0000 (11:59 +0200)]
fix #1671 @1

8 years agoRefactor zoom popups and make display sharper. Match behaviour of Flash player. Done...
Stephen Cameron [Mon, 18 Sep 2017 13:08:08 +0000 (15:08 +0200)]
Refactor zoom popups and make display sharper. Match behaviour of Flash player. Done #1653 @3