Commit Graph

117 Commits

Author SHA1 Message Date
孙广明
379baac86d Merge branch 'master' into 'sprint/master_tanghucheng_project'
# Conflicts:
#   module/programplan/lang/en.php
2021-12-07 00:38:58 +00:00
tanghucheng
ac12590b03 * Fix bug #17130,17129,17128. 2021-12-06 15:28:53 +08:00
王怡栋
7091037194 Merge branch 'sprint/175_sgm_upgrade' into 'master'
Sprint/175 sgm upgrade

See merge request easycorp/zentaopms!786
2021-12-06 07:14:51 +00:00
tanghucheng
fb84d28b4a * Fix bug #17128. 2021-12-06 15:04:49 +08:00
tanghucheng
cb23e8ff2b * adjust for date format for programplan. 2021-12-06 14:49:53 +08:00
tanghucheng
f2a989e851 * adjust for date format for programplan. 2021-12-06 14:21:23 +08:00
孙广明
69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
tanghucheng
c6b731717a * Fix project execution privilege. 2021-12-06 09:24:06 +08:00
tanghucheng
be4c1f3041 * Merge programplan into stage. 2021-12-03 14:31:47 +08:00
tanghucheng
30d1e22dca * Merge programplan into stage. 2021-12-03 13:57:08 +08:00
tanghucheng
19420bef7b * Code for stage. 2021-12-03 00:55:54 +08:00
孙广明
9ddee1bcea * Fix bug #17008. 2021-12-02 13:53:56 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
reneeteng
bd2b8ab2a6 * Edit lang file. 2021-11-29 16:31:18 +08:00
zhouxin
bbcdd1a8a1 Change planProject to project. 2021-11-29 03:17:59 +00:00
zhouxin
456b7d06a1 Finish task 45107. 2021-11-29 01:35:28 +00:00
孙广明
278bb30646 * Fix bug #16055. 2021-11-12 09:45:18 +08:00
孙广明
d9da6613ac * Fix bug #16050. 2021-11-12 09:32:34 +08:00
孙广明
d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
孙广明
75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
Yagami
774eceaf1d * Merge code. 2021-02-25 13:28:21 +08:00
leiyong
fa8ac71eee * Add version. 2021-01-29 17:10:24 +08:00
tianshujie98
a4690bdc72 * Finish task #9104. 2021-01-25 15:47:02 +08:00
holan20180123
dbb9e87fa2 * Adjust the code style. 2021-01-21 16:43:28 +08:00
holan20180123
b04e04c186 * Finish task #8988. 2021-01-21 15:42:54 +08:00
qiyu-xie
db6acf2cf2 * Modify the milestone icon for the release. 2021-01-20 13:24:47 +08:00
qiyu-xie
d8dc42d6c8 * Modify the milestone icon display of Gantt. 2021-01-20 10:57:38 +08:00
holan20180123
c9046ede6d * Finish task #8988. 2021-01-20 08:20:25 +08:00
holan20180123
1471f7fc61 * Finish task #8988. 2021-01-19 11:21:58 +08:00
holan20180123
b846cba424 * Finish task #8988. 2021-01-18 16:27:01 +08:00
holan20180123
02228d9f5a * Finish task #8988. 2021-01-18 10:58:18 +08:00
holan20180123
a5607fbb6b * Finish task #8988. 2021-01-18 10:16:36 +08:00
holan20180123
c131e1941e * Finish task #8988. 2021-01-15 14:23:16 +08:00
holan20180123
907dfc23d7 * Finish task #8988. 2021-01-15 14:17:46 +08:00
holan20180123
b2e53cf935 * Finish task #8986,#9002. 2021-01-15 09:49:16 +08:00
holan20180123
6a2505f025 * Finish task #8989. 2021-01-13 17:24:38 +08:00
holan20180123
81128047cc * Finish task #8987. 2021-01-13 15:34:19 +08:00
leiyong
2c4c3105e5 * Adjust the programplan modue code. 2021-01-13 11:47:15 +08:00
tianshujie98
3c3a5b8eaa * Finish task #8979. 2021-01-12 13:08:17 +08:00
qiyu-xie
ef37c1c9e8 * Finish task#8981. Add milestone flag color. 2021-01-12 10:56:16 +08:00
qiyu-xie
4eedf2f08e * Finish task#8981. 2021-01-12 09:46:48 +08:00
qiyu-xie
8604a02b7a * Finish task#8980. 2021-01-12 09:07:04 +08:00
qiyu-xie
df3d5186a7 * Finish task#8984. 2021-01-12 08:26:28 +08:00
qiyu-xie
ed5f574e7f * Adjust stage list column width. 2021-01-12 08:07:10 +08:00
qiyu-xie
937fc1f7e2 * Finish task#8982. 2021-01-11 16:48:30 +08:00
qiyu-xie
bae9c6ccec * Finish task#8985. 2021-01-11 16:41:24 +08:00
qiyu-xie
de3a853e2c * Finish task#8983. 2021-01-11 16:37:45 +08:00
qiyu-xie
02e2c34235 * Finish task#8985. 2021-01-11 16:30:32 +08:00
leiyong
82f655fc82 * Fix bug. 2020-12-24 14:44:01 +08:00
leiyong
8089ffe9a6 * Adjust code. 2020-12-18 16:18:41 +08:00