Commit Graph

141 Commits

Author SHA1 Message Date
zhujinyong
489be02f3f * Fix review. 2022-03-16 12:11:09 +08:00
孙广明
6a6af4e1a2 * Fix weekly bug. 2022-03-13 15:08:54 +08:00
liumengyi
084d882f9b * Fix bug #50341. 2022-03-08 10:07:42 +08:00
孙广明
62f755c3b2 * Finish task #50341. 2022-03-07 15:28:52 +08:00
liumengyi
119fde1713 * Finish task #50341. 2022-03-07 13:56:51 +08:00
hufangzhou
59181566ff * Move the gantt extension file to common/view. 2022-03-02 13:22:53 +08:00
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
孙广明
30f5033357 Merge branch 'sprint/32_zhouxin_fixbugs' into 'master'
Fix bug #18201.

See merge request easycorp/zentaopms!1269
2022-01-05 06:48:31 +00:00
zhouxin
d34b83cd96 Fix bug #18201. 2022-01-05 05:54:10 +00:00
zhouxin
ee431f18e3 Fix bug #18199. 2022-01-05 05:09:08 +00:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhouxin
68f27d5fd8 Change geshi. 2022-01-04 07:48:11 +00:00
zhouxin
d44067f4e6 Fix a bug. 2022-01-04 07:31:20 +00:00
zhouxin
68647da31c Finish task #46683. 2022-01-04 01:57:16 +00:00
xieqiyu
5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
zhouxin
2e79c5f869 Finish task #46679 and fix a bug. 2021-12-29 03:49:17 +00:00
hufangzhou
4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
tanghucheng
d97494e257 * Code for stage. 2021-12-15 11:14:15 +08:00
tanghucheng
b64b4cfc6f * Code for task #45806. 2021-12-13 09:37:38 +08:00
tanghucheng
d556f52381 * Finish task #45806. 2021-12-10 16:11:06 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
tanghucheng
1ee592147a * Fix programplan lang. 2021-12-07 08:41:51 +08:00
孙广明
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