Commit Graph
2099 Commits
Author SHA1 Message Date
wangyidong e44484c7b4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-25 09:11:22 +08:00
wangyidong 75ebcb18dc * code for task #5387. 2019-04-25 09:10:42 +08:00
yfl 1c67650da6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-24 16:02:01 +08:00
yfl d35eb8dfaf * Finsish task #5379,#5385,#5389,#5393,#5403,5409 2019-04-24 15:59:56 +08:00
wangyidong 4a6ec03672 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-24 13:32:07 +08:00
wangyidong bd29dcdf7d * finish task #5390. 2019-04-24 13:30:42 +08:00
reneeteng 49a0969c0e * M-P lang file updates. 2019-04-24 11:17:17 +08:00
Yagami 1432c13d18 * Fix lang file error. 2019-04-23 16:24:49 +08:00
reneeteng 4988a7450e * Solved lang file conflicts. 2019-04-23 16:20:29 +08:00
yfl fd307b4467 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-19 11:18:37 +08:00
yfl a9aab79f65 * project team expect feedback 2019-04-19 11:17:29 +08:00
reneeteng 9cad7d87d2 * Lang change b. 2019-04-19 10:35:56 +08:00
reneeteng 6d414d84b3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-17 11:14:48 +08:00
reneeteng 992d5fa425 * Lang changed. 2019-04-17 10:47:23 +08:00
reneteng 9c46bf4aa6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-16 15:17:46 +08:00
wangyidong 916128d515 * adjust for create task in modal. 2019-04-04 10:39:18 +08:00
wangyidong 24427df0df Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-01 13:59:34 +08:00
wangyidong 4308ae4a70 * fix for update user view. 2019-04-01 13:57:58 +08:00
Yagami 8d06d00235 * Fix project warning. 2019-03-28 11:20:22 +08:00
wangyidong bd0098ef08 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-27 13:52:40 +08:00
wangyidong 055340062f * adjust for print subMenu. 2019-03-27 13:51:04 +08:00
Yagami 81da2b6326 * Fix burn select condition. 2019-03-27 10:58:42 +08:00
Yagami 8563882212 * Fix en task menu. 2019-03-25 13:36:04 +08:00
chenfei d39a315e79 * Prepare for zentao 11.4 upgrade. 2019-03-22 17:36:42 +08:00
Yagami 50eea70d01 * Fix project task button. 2019-03-22 15:23:56 +08:00
Yagami fc5a8396a1 * Fix INT zentao button. 2019-03-22 15:02:37 +08:00
Yagami be952195ce * Fix burn select width. 2019-03-22 13:02:03 +08:00
Yagami 8c6015a5ea * Finish task #5346. 2019-03-21 09:53:46 +08:00
chenfei fa5f377d52 * Code for task #5343, #5346. 2019-03-20 15:58:19 +08:00
Yagami 7242802aa4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-20 15:53:03 +08:00
Yagami 7df289c7ee * Fix burn target. 2019-03-20 15:52:40 +08:00
wangyidong 559ff6b3b0 * finish task #5364. 2019-03-20 14:39:55 +08:00
chenfei b66c5ec7fa * Finish task #5330. 2019-03-19 17:23:35 +08:00
Yagami 602e8244de * Finish task #5339. 2019-03-19 10:25:17 +08:00
Yagami d790b5e942 * Finish task #5329. 2019-03-19 09:37:46 +08:00
chenfei 5e32a88966 * Finish task #5372. 2019-03-19 08:11:58 +08:00
wangyidong 487e802420 * finish task #7499. 2019-03-08 14:48:50 +08:00
chenfeiCF 296290f9c8 * Set acl default when create product or project. 2019-02-28 09:55:45 +08:00
chenfeiCF e171290300 * Adjust code. 2019-02-27 17:03:16 +08:00
wangyidong 8846db5269 * fix error. 2019-02-27 14:09:34 +08:00
Yagami efe734f04a * Code for task #5284. 2019-02-26 14:28:26 +08:00
reneeteng 97f55a77fa *Lang change. 2019-02-26 13:41:41 +08:00
wangyidong 750550d9ed * code task #5302. 2019-02-25 16:42:02 +08:00
wangyidong 0226ae1a9e * code for task #5302. 2019-02-25 14:52:40 +08:00
wangyidong 0f7f6d4e9a * adjust for hidden module item in tree page. 2019-02-25 14:23:48 +08:00
wangyidong 5ed0ed92fd * code for task #5302. 2019-02-25 13:59:27 +08:00
wangyidong b392cde948 * code for task #5302. 2019-02-25 11:46:34 +08:00
wangyidong 178527100c * code for task #5271. 2019-02-25 11:26:51 +08:00
wangyidong a1ed14507f * finish task #5302. 2019-02-25 09:13:49 +08:00
reneeteng d771b4fcd3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-22 08:54:21 +08:00