Commit Graph
8165 Commits
Author SHA1 Message Date
chenfeiCF af195c974d * remove console.log. 2016-04-26 09:37:09 +08:00
chenfeiCF 734da9eb37 * remove 'arrow' for fixing product index page style.
* add english lang item for search module.
2016-04-26 09:26:13 +08:00
wangyidong 6f2024abac Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-26 09:23:24 +08:00
wangyidong 03a8e3a2d6 * build tutorial data and add wizard function. 2016-04-26 09:22:46 +08:00
chenfeiCF 1f84eac3e3 * fix colspan for results method of testtask module. 2016-04-26 09:03:03 +08:00
Catouse 5200d26e7b Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-25 18:31:35 +08:00
Catouse 40d5b4190c * finish task #2544. 2016-04-25 18:31:25 +08:00
Catouse 131e996a59 * update zui. 2016-04-25 18:26:47 +08:00
Catouse 9ce9183d8b * remove console.log. 2016-04-25 17:45:15 +08:00
chenfeiCF 81eea5e27d * add english lang item. 2016-04-25 17:04:12 +08:00
chenfeiCF 044f7de265 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-25 16:34:37 +08:00
chenfeiCF 09059f6b7d * add english lang item and change for zh-cn. 2016-04-25 16:33:03 +08:00
Catouse 6a48745fcb * fix percent calculate method. 2016-04-25 16:28:28 +08:00
Catouse 1fda3a1498 * finish task #2581. 2016-04-25 16:16:34 +08:00
Catouse 72bab02bef * ajust code. 2016-04-25 16:16:02 +08:00
Catouse dfa4471e26 * improve tutorial UI. 2016-04-25 12:06:10 +08:00
Catouse 3a11f1972c * fix code error. 2016-04-25 11:46:18 +08:00
Catouse dcf2d475f7 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/tutorial/control.php
	module/tutorial/view/index.html.php
2016-04-25 11:44:41 +08:00
Catouse 2f5e3e3d6d * finish task #2563. 2016-04-25 11:41:40 +08:00
chenfeiCF 473e4ab805 * fix style for uploading and checking attached files. 2016-04-25 11:12:20 +08:00
wangyidong fbccbf45b7 * adjust code for error. 2016-04-25 10:55:47 +08:00
wangyidong 1e49a490c4 * adjust for branch and add restore function. 2016-04-25 10:04:09 +08:00
Catouse 47de6173f9 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-25 08:42:27 +08:00
Catouse 64811aa633 * code for task #2563. 2016-04-25 08:42:17 +08:00
chenfeiCF 1defa3dacd * fix table head for product all, project all, productplan browse and testtask cases method. 2016-04-24 18:39:59 +08:00
chenfeiCF 7a601b1172 * fix error for fixedTheadOfList and fixedTfootAction method after ajax loading. 2016-04-24 18:02:46 +08:00
Catouse c39b58eaa6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-22 20:38:26 +08:00
Catouse 37ffcf59d8 * code for task #2562. 2016-04-22 18:04:15 +08:00
wangyidong 2872ae3f8f * code for browse filter. 2016-04-22 14:19:37 +08:00
wangyidong ed4ad97ac3 * adjust for custom menu. 2016-04-22 14:16:22 +08:00
chenfeiCF 4f6744ec47 * code for task #2576: add color tag for story, task, bug, case in block and my module. 2016-04-22 13:25:16 +08:00
Catouse b820895a55 * code for task #2562. 2016-04-22 11:30:46 +08:00
Catouse 7b15a503af * add footer to misc/about view. 2016-04-22 10:35:06 +08:00
Catouse 525a649749 * change tree method. 2016-04-22 10:21:56 +08:00
Catouse 063b1c97e2 * make close modal button work. 2016-04-22 09:58:31 +08:00
Catouse ad91d7b16c * improve UI of project tree view. 2016-04-22 09:35:26 +08:00
Catouse 44b225bbde * update zui. 2016-04-22 09:35:02 +08:00
chenfeiCF cd5b5e8a38 * fix bug: can not set custom lang when lang is en. 2016-04-21 21:24:45 +08:00
Catouse 4b92f379ec Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-21 18:04:07 +08:00
Catouse e2702036cf * tree support update after actions with ajax. 2016-04-21 18:03:57 +08:00
Catouse 2894c8b046 * fix menu custom UI. 2016-04-21 17:28:37 +08:00
chenfeiCF 0927768631 * add english lang item for 'list'. 2016-04-21 17:13:21 +08:00
chenfeiCF 9fba47c584 Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-21 16:36:20 +08:00
chenfeiCF ae05ed236d * fix bug #827. 2016-04-21 16:35:00 +08:00
Catouse 077f52214a Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-04-21 16:27:21 +08:00
Catouse a64adf09c8 * ajust code. 2016-04-21 16:22:47 +08:00
wangyidong c64b48ebad Merge branch 'master' of github.com:easysoft/zentaopms 2016-04-21 16:11:20 +08:00
wangyidong 30464151ce * fix bug and adjust code for product-tree. 2016-04-21 16:10:38 +08:00
Catouse dd3b0bbb5e * fix an error on display user account information. 2016-04-21 16:03:36 +08:00
Catouse 05c5c2e50a Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/project/model.php
2016-04-21 15:45:08 +08:00