]> _ Git - cubeextranet.git/log
cubeextranet.git
8 years agoMerge master changes to burgermenu branch.
stephen@cubedesigners.com [Mon, 30 Oct 2017 10:22:59 +0000 (10:22 +0000)]
Merge master changes to burgermenu branch.

8 years ago#1710
vincent@cubedesigners.com [Mon, 23 Oct 2017 17:15:26 +0000 (17:15 +0000)]
#1710

8 years ago#813
vincent@cubedesigners.com [Mon, 23 Oct 2017 14:05:16 +0000 (14:05 +0000)]
#813

8 years ago#1739
vincent@cubedesigners.com [Thu, 19 Oct 2017 17:09:47 +0000 (17:09 +0000)]
#1739

8 years ago#813
vincent@cubedesigners.com [Thu, 19 Oct 2017 15:43:17 +0000 (15:43 +0000)]
#813

8 years ago#1761
vincent@cubedesigners.com [Thu, 19 Oct 2017 12:57:57 +0000 (12:57 +0000)]
#1761

8 years ago#1758
vincent@cubedesigners.com [Wed, 18 Oct 2017 15:43:05 +0000 (15:43 +0000)]
#1758

8 years agowip #1748 @2
vincent@cubedesigners.com [Mon, 16 Oct 2017 16:43:15 +0000 (16:43 +0000)]
wip #1748 @2

8 years ago#1749
vincent@cubedesigners.com [Fri, 13 Oct 2017 15:16:32 +0000 (15:16 +0000)]
#1749

8 years ago#807
vincent@cubedesigners.com [Wed, 11 Oct 2017 17:21:54 +0000 (17:21 +0000)]
#807

8 years ago#807
vincent@cubedesigners.com [Wed, 11 Oct 2017 11:44:51 +0000 (11:44 +0000)]
#807

8 years ago#1738
vincent@cubedesigners.com [Tue, 10 Oct 2017 09:38:33 +0000 (09:38 +0000)]
#1738

8 years agofix #1737 @2
vincent@cubedesigners.com [Mon, 9 Oct 2017 13:07:09 +0000 (13:07 +0000)]
fix #1737 @2

8 years ago#1735
vincent@cubedesigners.com [Fri, 6 Oct 2017 16:32:19 +0000 (16:32 +0000)]
#1735

8 years ago#1735
vincent@cubedesigners.com [Fri, 6 Oct 2017 16:20:24 +0000 (16:20 +0000)]
#1735

8 years ago#1735
vincent@cubedesigners.com [Fri, 6 Oct 2017 15:59:40 +0000 (15:59 +0000)]
#1735

8 years ago#1659
vincent@cubedesigners.com [Fri, 6 Oct 2017 15:38:05 +0000 (15:38 +0000)]
#1659

8 years ago#812
vincent@cubedesigners.com [Fri, 6 Oct 2017 15:28:23 +0000 (15:28 +0000)]
#812

8 years agoWIP #1564 @0.25
stephen@cubedesigners.com [Fri, 6 Oct 2017 10:32:45 +0000 (10:32 +0000)]
WIP #1564 @0.25

8 years agoWIP #1715 @0.5
stephen@cubedesigners.com [Fri, 6 Oct 2017 09:39:46 +0000 (09:39 +0000)]
WIP #1715 @0.5

8 years agowip #1649 @0.5
vincent@cubedesigners.com [Fri, 6 Oct 2017 09:31:09 +0000 (09:31 +0000)]
wip #1649 @0.5

8 years agodone #1729 @0.75
vincent@cubedesigners.com [Thu, 5 Oct 2017 16:48:59 +0000 (16:48 +0000)]
done #1729 @0.75

8 years agodone #1694 @1.5
vincent@cubedesigners.com [Thu, 5 Oct 2017 14:54:12 +0000 (14:54 +0000)]
done #1694 @1.5

8 years agodone #1727 @0.5
vincent@cubedesigners.com [Thu, 5 Oct 2017 10:34:58 +0000 (10:34 +0000)]
done #1727 @0.5

8 years agodone #1719 @1
vincent@cubedesigners.com [Thu, 5 Oct 2017 10:24:38 +0000 (10:24 +0000)]
done #1719 @1

8 years agowip #1719 @1
vincent@cubedesigners.com [Wed, 4 Oct 2017 19:17:03 +0000 (19:17 +0000)]
wip #1719 @1

8 years agowip #1719 @3
vincent@cubedesigners.com [Wed, 4 Oct 2017 17:56:50 +0000 (17:56 +0000)]
wip #1719 @3

8 years ago#1694
vincent@cubedesigners.com [Wed, 4 Oct 2017 14:15:27 +0000 (14:15 +0000)]
#1694

8 years ago#1719
vincent@cubedesigners.com [Wed, 4 Oct 2017 14:14:19 +0000 (14:14 +0000)]
#1719

8 years agodone #1718 @0.5
vincent@cubedesigners.com [Tue, 3 Oct 2017 16:45:42 +0000 (16:45 +0000)]
done #1718 @0.5

8 years agodone #1704 @1
vincent@cubedesigners.com [Tue, 3 Oct 2017 16:19:18 +0000 (16:19 +0000)]
done #1704 @1

8 years agoMerge master changes to burgermenu branch. WIP #807 @0:05
stephen@cubedesigners.com [Tue, 3 Oct 2017 14:38:39 +0000 (14:38 +0000)]
Merge master changes to burgermenu branch. WIP #807 @0:05

8 years agodone#1716 @0:05
vincent@cubedesigners.com [Tue, 3 Oct 2017 14:06:31 +0000 (14:06 +0000)]
done#1716 @0:05

8 years agoMerge master changes to burgermenu branch. WIP #807 @0.5
stephen@cubedesigners.com [Tue, 3 Oct 2017 09:45:01 +0000 (09:45 +0000)]
Merge master changes to burgermenu branch. WIP #807 @0.5

8 years agodone #1684 @0:20
vincent@cubedesigners.com [Tue, 3 Oct 2017 09:29:14 +0000 (09:29 +0000)]
done #1684 @0:20

8 years agoWIP #1707 @1
stephen@cubedesigners.com [Mon, 2 Oct 2017 15:21:44 +0000 (15:21 +0000)]
WIP #1707 @1

8 years agowip #1704 @1
vincent@cubedesigners.com [Fri, 29 Sep 2017 15:10:32 +0000 (15:10 +0000)]
wip #1704 @1

8 years agowip #1704 @1.5
vincent@cubedesigners.com [Fri, 29 Sep 2017 12:38:59 +0000 (12:38 +0000)]
wip #1704 @1.5

8 years agowip #1704 @2
vincent@cubedesigners.com [Fri, 29 Sep 2017 10:52:51 +0000 (10:52 +0000)]
wip #1704 @2

8 years agowip #1704 @4
vincent@cubedesigners.com [Fri, 29 Sep 2017 09:09:21 +0000 (09:09 +0000)]
wip #1704 @4

8 years agoAllow other image types to be uploaded for menu. Done #1647 @0:20
stephen@cubedesigners.com [Wed, 27 Sep 2017 16:33:03 +0000 (16:33 +0000)]
Allow other image types to be uploaded for menu. Done #1647 @0:20

8 years ago#1689
vincent@cubedesigners.com [Wed, 27 Sep 2017 11:15:04 +0000 (11:15 +0000)]
#1689

8 years agoMerge bookedges in master @1
vincent@cubedesigners.com [Mon, 25 Sep 2017 15:17:25 +0000 (15:17 +0000)]
Merge bookedges in master @1

8 years agowip #1694 @4
vincent@cubedesigners.com [Fri, 22 Sep 2017 17:12:52 +0000 (17:12 +0000)]
wip #1694 @4

8 years agoMerge compiler changes from searchengine branch to burgermenu branch. WIP #807 @0.25
stephen@cubedesigners.com [Thu, 21 Sep 2017 16:25:16 +0000 (16:25 +0000)]
Merge compiler changes from searchengine branch to burgermenu branch. WIP #807 @0.25

8 years agoLatest merge from master + compiler changes for menu icon order. WIP #1676 @0.75
stephen@cubedesigners.com [Thu, 21 Sep 2017 14:43:05 +0000 (14:43 +0000)]
Latest merge from master + compiler changes for menu icon order. WIP #1676 @0.75

8 years agoMerge burgermenu inside searchengine | #1666
vincent@cubedesigners.com [Wed, 20 Sep 2017 16:24:13 +0000 (16:24 +0000)]
Merge burgermenu inside searchengine | #1666

8 years agowip #1675 @1
vincent@cubedesigners.com [Wed, 20 Sep 2017 14:38:14 +0000 (14:38 +0000)]
wip #1675 @1

8 years agoTidy up compiler and merge performance fix from master branch. WIP #1653 @1.5
stephen@cubedesigners.com [Mon, 18 Sep 2017 13:03:43 +0000 (13:03 +0000)]
Tidy up compiler and merge performance fix from master branch. WIP #1653 @1.5

8 years agodone #1667 @1
vincent@cubedesigners.com [Fri, 15 Sep 2017 13:19:52 +0000 (13:19 +0000)]
done #1667 @1

8 years ago#1466
vincent@cubedesigners.com [Thu, 14 Sep 2017 16:09:52 +0000 (16:09 +0000)]
#1466

8 years ago#1659
vincent@cubedesigners.com [Tue, 12 Sep 2017 13:23:28 +0000 (13:23 +0000)]
#1659

8 years agowip #1659 @0.5
vincent@cubedesigners.com [Tue, 12 Sep 2017 13:22:25 +0000 (13:22 +0000)]
wip #1659 @0.5

8 years ago(no commit message)
vincent@cubedesigners.com [Tue, 12 Sep 2017 13:18:28 +0000 (13:18 +0000)]

8 years agofix #1657 @2
vincent@cubedesigners.com [Tue, 12 Sep 2017 12:32:03 +0000 (12:32 +0000)]
fix #1657 @2

8 years agoDebugging problems with zoomarea cache inconsistencies + adjustments to zoom image...
stephen@cubedesigners.com [Fri, 8 Sep 2017 17:42:35 +0000 (17:42 +0000)]
Debugging problems with zoomarea cache inconsistencies + adjustments to zoom image generation. WIP #1653 @4

8 years agodone #1652 @0:35
vincent@cubedesigners.com [Thu, 7 Sep 2017 15:02:16 +0000 (15:02 +0000)]
done #1652 @0:35

8 years agoWIP #1647 @2
stephen@cubedesigners.com [Wed, 6 Sep 2017 17:06:44 +0000 (17:06 +0000)]
WIP #1647 @2

8 years agofix #1651 @0.25
vincent@cubedesigners.com [Wed, 6 Sep 2017 15:39:17 +0000 (15:39 +0000)]
fix #1651 @0.25

8 years agoWIP #1646 @0.25
stephen@cubedesigners.com [Tue, 5 Sep 2017 17:05:30 +0000 (17:05 +0000)]
WIP #1646 @0.25

8 years agoRemove redundant menu position option from workshop parameters. WIP #1642 @0.25
stephen@cubedesigners.com [Tue, 5 Sep 2017 15:47:24 +0000 (15:47 +0000)]
Remove redundant menu position option from workshop parameters. WIP #1642 @0.25

8 years agoRemove interact.js from compiler since it is no longer used and was causing errors...
stephen@cubedesigners.com [Fri, 1 Sep 2017 16:32:00 +0000 (16:32 +0000)]
Remove interact.js from compiler since it is no longer used and was causing errors and adding weight to the final JS bundle. WIP #807 @0.25

8 years ago#1639
vincent@cubedesigners.com [Thu, 31 Aug 2017 14:05:41 +0000 (14:05 +0000)]
#1639

8 years agofix #1629 @3
vincent@cubedesigners.com [Tue, 29 Aug 2017 15:27:37 +0000 (15:27 +0000)]
fix #1629 @3

8 years agoTidy up compiler scripts - no longer need to specify extra CSS/LESS files manually...
stephen@cubedesigners.com [Tue, 29 Aug 2017 10:40:11 +0000 (10:40 +0000)]
Tidy up compiler scripts - no longer need to specify extra CSS/LESS files manually since everything is copied from the /styles directory by the _writeLess() function. WIP #807 @0.5

8 years agoWIP #1560 @0.25
stephen@cubedesigners.com [Tue, 29 Aug 2017 10:04:05 +0000 (10:04 +0000)]
WIP #1560 @0.25

8 years agoTidy up old files and fix some errors that were polluting the logs. Merge master...
stephen@cubedesigners.com [Mon, 28 Aug 2017 14:43:43 +0000 (14:43 +0000)]
Tidy up old files and fix some errors that were polluting the logs. Merge master to burgermenu. WIP #807 @0.5

8 years ago#811
vincent@cubedesigners.com [Mon, 28 Aug 2017 11:41:37 +0000 (11:41 +0000)]
#811

8 years agoMerge video related fixes to compiler. WIP #897 @0.5
stephen@cubedesigners.com [Mon, 28 Aug 2017 10:19:32 +0000 (10:19 +0000)]
Merge video related fixes to compiler. WIP #897 @0.5

8 years ago#1625
vincent@cubedesigners.com [Mon, 28 Aug 2017 09:14:14 +0000 (09:14 +0000)]
#1625

8 years agofix #1623 @0:05
vincent@cubedesigners.com [Mon, 28 Aug 2017 08:51:40 +0000 (08:51 +0000)]
fix #1623 @0:05

8 years agowip #811 @2
vincent@cubedesigners.com [Fri, 25 Aug 2017 18:24:54 +0000 (18:24 +0000)]
wip #811 @2

8 years ago#811
vincent@cubedesigners.com [Fri, 25 Aug 2017 18:24:40 +0000 (18:24 +0000)]
#811

8 years agoNotes about video size calculations for #1585.
stephen@cubedesigners.com [Fri, 25 Aug 2017 17:27:46 +0000 (17:27 +0000)]
Notes about video size calculations for #1585.

8 years agofix #1622 @1
vincent@cubedesigners.com [Fri, 25 Aug 2017 15:48:32 +0000 (15:48 +0000)]
fix #1622 @1

8 years agofix #1622 @1.5
vincent@cubedesigners.com [Fri, 25 Aug 2017 14:57:01 +0000 (14:57 +0000)]
fix #1622 @1.5

8 years ago#811 @5
vincent@cubedesigners.com [Fri, 25 Aug 2017 13:29:26 +0000 (13:29 +0000)]
#811 @5

8 years agoBug des textes de certaines pages non surlignées | #811 @2
vincent@cubedesigners.com [Fri, 25 Aug 2017 13:26:58 +0000 (13:26 +0000)]
Bug des textes de certaines pages non surlignées | #811 @2

8 years agoMerging master to html5video + burgermenu branches and adding/adjusting some paramete...
stephen@cubedesigners.com [Fri, 25 Aug 2017 12:39:17 +0000 (12:39 +0000)]
Merging master to html5video + burgermenu branches and adding/adjusting some parameter options.

8 years agowip #811 @2
vincent@cubedesigners.com [Thu, 24 Aug 2017 15:47:44 +0000 (15:47 +0000)]
wip #811 @2

8 years ago#811
vincent@cubedesigners.com [Wed, 23 Aug 2017 16:35:16 +0000 (16:35 +0000)]
#811

8 years agowip #811 @7
vincent@cubedesigners.com [Wed, 23 Aug 2017 16:33:11 +0000 (16:33 +0000)]
wip #811 @7

8 years agowip #811 @12
vincent@cubedesigners.com [Tue, 22 Aug 2017 17:05:43 +0000 (17:05 +0000)]
wip #811 @12

8 years agodone #1608 @0.25
vincent@cubedesigners.com [Thu, 17 Aug 2017 12:07:37 +0000 (12:07 +0000)]
done #1608 @0.25

8 years agofix #1609 @0.5
vincent@cubedesigners.com [Thu, 17 Aug 2017 10:26:03 +0000 (10:26 +0000)]
fix #1609 @0.5

8 years agofix #1562 @1
vincent@cubedesigners.com [Tue, 18 Jul 2017 17:04:11 +0000 (17:04 +0000)]
fix #1562 @1

8 years agofix #1549 @2
vincent@cubedesigners.com [Tue, 11 Jul 2017 10:31:10 +0000 (10:31 +0000)]
fix #1549 @2

8 years agoMerge changes from master branch. WIP #807 @0.5
stephen@cubedesigners.com [Mon, 10 Jul 2017 18:00:43 +0000 (18:00 +0000)]
Merge changes from master branch. WIP #807 @0.5

8 years agowip #1551 @1
vincent@cubedesigners.com [Fri, 7 Jul 2017 10:44:35 +0000 (10:44 +0000)]
wip #1551 @1

8 years agowip #1550 @0.25
vincent@cubedesigners.com [Fri, 7 Jul 2017 09:42:58 +0000 (09:42 +0000)]
wip #1550 @0.25

8 years ago#1532
vincent@cubedesigners.com [Thu, 6 Jul 2017 16:33:14 +0000 (16:33 +0000)]
#1532

8 years agofix #1547 @2
vincent@cubedesigners.com [Thu, 6 Jul 2017 14:38:16 +0000 (14:38 +0000)]
fix #1547 @2

8 years agoMerge master branch to html5video and solve conflicts. WIP #897 @1
stephen@cubedesigners.com [Thu, 29 Jun 2017 17:27:21 +0000 (17:27 +0000)]
Merge master branch to html5video and solve conflicts. WIP #897 @1

8 years ago#1512
vincent@cubedesigners.com [Thu, 29 Jun 2017 16:17:46 +0000 (16:17 +0000)]
#1512

8 years agoMerge slider branch & master | done #1392 @1.5
vincent@cubedesigners.com [Wed, 28 Jun 2017 17:56:48 +0000 (17:56 +0000)]
Merge slider branch & master | done #1392 @1.5

8 years ago#1503
vincent@cubedesigners.com [Wed, 28 Jun 2017 14:35:10 +0000 (14:35 +0000)]
#1503

8 years agowip #1503 @1
vincent@cubedesigners.com [Tue, 27 Jun 2017 17:00:17 +0000 (17:00 +0000)]
wip #1503 @1

8 years ago#1375
vincent@cubedesigners.com [Tue, 27 Jun 2017 15:18:33 +0000 (15:18 +0000)]
#1375

8 years ago#1505
vincent@cubedesigners.com [Tue, 27 Jun 2017 15:17:42 +0000 (15:17 +0000)]
#1505

8 years agoClean up errors and add icon colour to LESS variables. WIP #807 @0.25
stephen@cubedesigners.com [Fri, 23 Jun 2017 16:49:27 +0000 (16:49 +0000)]
Clean up errors and add icon colour to LESS variables. WIP #807 @0.25