Commit Graph
117 Commits
Author SHA1 Message Date
wangyidong 0832e0e231 * fix bug #1053. 2017-04-18 15:17:30 +08:00
Catouse 7e7a334e39 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/project/css/tree.css
	module/project/lang/en.php
	module/project/view/tree.html.php
2017-02-03 15:45:42 +08:00
chenfeiCF 117fe64412 * adjust for task #2868. 2017-01-16 16:52:44 +08:00
chenfeiCF 0ecaa6306f * finish task 2879. 2017-01-09 15:35:46 +08:00
chenfeiCF f5c4cdbfe5 * finish task #2868. 2017-01-09 14:36:37 +08:00
Catouse 79ebafe91d * fix style for project/managemembers view. 2016-12-05 09:28:18 +08:00
chenfeiCF 915c55e001 * adjust task #2790. 2016-12-02 12:28:38 +08:00
chenfeiCF cb39cc9f08 * adjust task #2784. 2016-12-01 17:33:45 +08:00
chenfeiCF 82b61dc1da * adjust the style of create button group. 2016-12-01 16:59:45 +08:00
chenfeiCF dd29125b58 * adjust task #2725. 2016-12-01 15:24:11 +08:00
wangyidong 88167e8151 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 11:33:03 +08:00
chenfeiCF 8720e886e8 * adjust task #2696. 2016-12-01 11:23:04 +08:00
wangyidong 45d37f489e * revert for task #2730. 2016-12-01 11:22:35 +08:00
wangyidong 8e4c380397 * code for task #2773. 2016-11-29 13:05:14 +08:00
chenfeiCF f3aef78223 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/project/css/task.css
2016-11-28 09:11:57 +08:00
chenfeiCF be29473333 * finish task #2770, #2771, #2767. 2016-11-28 09:01:45 +08:00
Catouse ec4804aff9 * finish task #2763. 2016-11-26 18:20:53 +08:00
Catouse 92a398bb1d * improve UI of project/manageproducts view. 2016-11-26 17:25:24 +08:00
wangyidong 7ef7b45060 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-25 15:42:42 +08:00
wangyidong cc1e0f2cf0 * finish task #2730. 2016-11-24 16:55:39 +08:00
Catouse 8951f8d0af * improve UI of views with table, finish task #2687,task #2749 and task #2762. 2016-11-24 15:47:47 +08:00
wangyidong a70a30f837 * finish task #2733. 2016-11-24 13:48:28 +08:00
Catouse c2a4699d5c * improve project task tree UI. 2016-11-23 17:03:28 +08:00
Catouse a30a1b7b35 * code for task #2751. 2016-11-23 16:49:43 +08:00
Catouse 6fe63dcc59 * finish task #2781. 2016-11-22 13:42:41 +08:00
Catouse edfa25e8cf * finish task #2751, task #2792. 2016-11-18 15:46:46 +08:00
chenfeiCF 3041a53124 * finish task #2709. 2016-11-18 13:13:13 +08:00
chenfeiCF c4878d4522 * finish task #2784. 2016-11-15 16:59:44 +08:00
chenfeiCF 68ebaf540e * finish task #2790. 2016-11-14 13:27:49 +08:00
Catouse c2dc58d64d * change story items color in kanban. 2016-06-23 13:37:25 +08:00
wangyidong 458a055d14 * adjust for kanban. 2016-06-15 13:13:11 +08:00
wangyidong 75f38e2ce9 * finish task #4036 for backyard. 2016-06-15 11:08:22 +08:00
wangyidong 48aa11d4e5 * change for upgrade. 2016-05-04 17:13:09 +08:00
Catouse 76830e1176 * change style of project/managemembers. 2016-05-04 16:48:57 +08:00
Catouse 1fd086dad9 * fix style of project/managemembers for ie. 2016-05-04 16:46:14 +08:00
Catouse 1289702d41 * change UI of 'project/manageMembers'. 2016-05-03 10:28:04 +08:00
wangyidong c53e78728d * revert project-task and adjust grouptask page. 2016-04-29 14:46:03 +08:00
Catouse 9a0bf1da6a * change grouptask UI. 2016-04-28 15:17:20 +08:00
Catouse 4b23bfabee * change project tree view UI. 2016-04-28 13:31:16 +08:00
Catouse 26c54d376e * change project tree view UI. 2016-04-28 12:05:05 +08:00
wangyidong fbccbf45b7 * adjust code for error. 2016-04-25 10:55:47 +08:00
Catouse 9f2e4e99ea * fix product tasks tree view. 2016-04-21 15:12:54 +08:00
wangyidong d89d674cdd * code for task #2522,2579. 2016-04-20 14:51:05 +08:00
Catouse b356e65732 * finish task #2552. 2016-04-18 18:45:58 +08:00
Catouse ba2eff3f57 * code for task #2552. 2016-04-18 16:35:50 +08:00
wangyidong ceb50edff9 * code for task #2527. 2016-04-08 13:28:33 +08:00
wangyidong 2e72d5724b * finish task #2551. 2016-04-01 16:24:38 +08:00
wangyidong 2cbcebc17f Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-29 15:10:38 +08:00
wangyidong 647e9bee18 * finish task #2580. 2016-03-29 15:08:46 +08:00
chenfeiCF 590afbf92e * finish task #2569. 2016-03-29 14:27:57 +08:00