Commit Graph

1391 Commits

Author SHA1 Message Date
chenfeiCF
496964c1b0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-11-15 15:21:16 +08:00
chenfeiCF
cefdbaa5d3 * Finish task #5133. 2018-11-15 15:20:42 +08:00
Catouse
9fc889340f * finish task #5086. 2018-11-15 15:19:39 +08:00
reneeteng
b9e4f1c766 * Lang optimized. 2018-11-15 09:57:30 +08:00
Yagami
8b71c1ea3a * Finish task #5142. 2018-11-14 16:28:07 +08:00
Yagami
bf1dc7be3f * Fix child task bug. 2018-11-14 13:52:02 +08:00
chenfeiCF
ca70a83395 * Adjust for task #5111, #5106. 2018-11-13 17:28:12 +08:00
Yagami
54b8536e8b * Fix parent task bug. 2018-11-13 17:00:17 +08:00
Yagami
5d1e76c14d * Fix edit parent task bug. 2018-11-13 16:41:08 +08:00
chenfeiCF
424a98db4a * Finish task #5111. 2018-11-13 13:49:08 +08:00
chenfeiCF
c30ce17efc * Fix error variable name. 2018-11-12 17:41:30 +08:00
Yagami
b960442999 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 17:10:42 +08:00
Yagami
70e0591023 * Fix parent task status. 2018-11-12 17:09:27 +08:00
chenfeiCF
92ce72bfad * Finish task #5106. 2018-11-12 17:00:22 +08:00
Yagami
b22c8ca558 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-12 14:44:39 +08:00
Yagami
bff8f0161a * Finish task #5105. 2018-11-12 14:44:27 +08:00
chenfeiCF
2b47dbed37 * Finish task #5085. 2018-11-12 14:20:59 +08:00
Yagami
764287bf07 * Finish task #5104. 2018-11-12 14:06:19 +08:00
Yagami
394df4295f * Finish task #5092. 2018-11-09 15:05:24 +08:00
Yagami
2c2830d018 * Finish task #5087. 2018-11-09 11:06:28 +08:00
Yagami
a478cfdba5 * Finish task #5067. 2018-11-08 16:15:09 +08:00
reneeteng
b8527f6988 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-05 11:25:40 +08:00
reneeteng
cabb96f338 * Change date prep. 2018-11-05 11:25:11 +08:00
wangyidong
7a6e458de1 * add version and upgrade it. 2018-11-05 09:05:01 +08:00
Yagami
38b342032d * Fix task lang. 2018-11-01 13:24:39 +08:00
Yagami
dae378d7c3 * Add task lang. 2018-11-01 10:02:45 +08:00
wangyidong
9687651633 * adjust for export word. 2018-10-31 14:23:13 +08:00
Yagami
30c66ff864 * Fix child task export name. 2018-10-29 10:08:03 +08:00
滔哥
f22ed2b6c2 * Fix bug. 2018-10-26 11:18:12 +08:00
wangyidong
2cd31f731e * change version and upgrade. 2018-10-25 09:30:44 +08:00
wangyidong
2a0a11bb92 * add projectID for export tree and calendar. 2018-10-24 17:22:25 +08:00
reneeteng
6ec315b2fe Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-23 16:25:06 +08:00
reneeteng
1473f6de30 * Modify lang. 2018-10-23 16:23:17 +08:00
wangyidong
d64306aa90 * adjust code. 2018-10-23 16:18:30 +08:00
wangyidong
e2ed6070d1 * fix bug for batch child. 2018-10-22 14:32:45 +08:00
wangyidong
cf167ce697 * adjust code for task. 2018-10-19 14:57:21 +08:00
wangyidong
8f7c3f8c4e Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-12 14:16:04 +08:00
wangyidong
0558da4e38 * finish task #4967. 2018-10-12 14:00:09 +08:00
滔哥
bd5d253791 * Finished task#4970. 2018-10-12 11:18:08 +08:00
滔哥
9f115f2a8e * Finished task#4968. 2018-10-11 21:33:57 +08:00
滔哥
1b93b8a28a * Finished task#4971. 2018-10-11 21:02:39 +08:00
wangyidong
254b69382c * finish task #4989. 2018-10-10 16:50:58 +08:00
Yagami
5c24ece14a * Fix pri width. 2018-10-09 16:28:33 +08:00
Yagami
4b8a44f68b * Finish task #4972. 2018-10-09 10:21:11 +08:00
Catouse
8adf256701 * fix assignto button style. 2018-10-08 10:27:11 +08:00
Catouse
55fecfe0be * change status label colors. 2018-10-08 10:14:56 +08:00
滔哥
12e366d54d * Finish task#4796. 2018-09-27 22:30:07 +08:00
Catouse
165b8899c9 * change module label style in task list. 2018-09-27 16:41:27 +08:00
Catouse
ea932f7f9f * finish task #4913. 2018-09-27 15:51:12 +08:00
Catouse
389b7d77c0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-27 11:27:22 +08:00