 caoyanyi
|
f1425eff27
|
Merge branch 'master' into zenops_46
|
2022-11-14 08:55:13 +08:00 |
|
|
caoyanyi
|
d0b7ccbdef
|
* Add language.
|
2022-11-14 08:47:34 +08:00 |
|
|
孙广明
|
461aa69449
|
Merge branch 'master_xieqiyu_29549' into 'master'
* Fix bug#29549,#29654.
See merge request easycorp/zentaopms!6126
|
2022-11-14 00:27:23 +00:00 |
|
|
wangyidong
|
9406625989
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-11 17:35:59 +08:00 |
|
|
wangyidong
|
549290cf9d
|
* fix bug for create project release.
|
2022-11-11 17:35:34 +08:00 |
|
|
xieqiyu
|
fde21ff897
|
* Fix bug#29549,#29654.
|
2022-11-11 17:06:48 +08:00 |
|
|
孙广明
|
a4785c2760
|
Merge branch 'sprint/zentaopms259_mayue_task#75649' into 'master'
* Finish task #75649.
See merge request easycorp/zentaopms!6125
|
2022-11-11 09:03:28 +00:00 |
|
|
mayue
|
c92e9f119a
|
* Finish task #75649.
|
2022-11-11 17:02:17 +08:00 |
|
|
王怡栋
|
bf598b3f86
|
Merge branch 'testcase_zg' into 'master'
* Adjust code
See merge request easycorp/zentaopms!6123
|
2022-11-11 07:35:17 +00:00 |
|
|
王怡栋
|
31a84ce03c
|
Merge branch 'zentaopms_258_wangyuting' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!6124
|
2022-11-11 07:34:43 +00:00 |
|
|
wangyuting
|
bec09e5a0a
|
* Adjust isFeature to canConfigFeature.
|
2022-11-11 07:28:46 +00:00 |
|
|
wangyuting
|
e94c895d51
|
* Optimize code.
|
2022-11-11 07:22:33 +00:00 |
|
|
wangyuting
|
bb49320ee7
|
* Fix bug.
|
2022-11-11 07:07:17 +00:00 |
|
|
zenggang
|
6aa84d40f4
|
* Adjust code
|
2022-11-11 06:55:59 +00:00 |
|
|
孙广明
|
f59a0d4ade
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish bug #29448#29404
See merge request easycorp/zentaopms!6120
|
2022-11-11 06:51:06 +00:00 |
|
|
孙广明
|
be11caa710
|
Merge branch 'master_xieqiyu_29618' into 'master'
* Fix bug#29618.
See merge request easycorp/zentaopms!6122
|
2022-11-11 06:50:47 +00:00 |
|
|
孙广明
|
ca3de7cc84
|
Merge branch 'lyk_feedback_1411' into 'master'
* Resolve feedback #1411.
See merge request easycorp/zentaopms!6121
|
2022-11-11 06:50:22 +00:00 |
|
|
zenggang
|
9a3ee4027f
|
* Adjust code
|
2022-11-11 06:49:04 +00:00 |
|
|
xieqiyu
|
38dd19a6c3
|
* Fix bug#29551.
|
2022-11-11 14:34:51 +08:00 |
|
|
lanzongjun
|
0d07d33818
|
* finish bug #29404
|
2022-11-11 14:04:25 +08:00 |
|
|
lanzongjun
|
3965d9a40f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-11-11 14:03:09 +08:00 |
|
|
xieqiyu
|
6263f5a84f
|
* Fix bug#29618.
|
2022-11-11 13:12:34 +08:00 |
|
|
liuyongkai
|
dd519c7587
|
* Resolve feedback #1411.
|
2022-11-11 13:02:26 +08:00 |
|
|
王怡栋
|
f758694397
|
Merge branch 'zentaopms_258_optimize_code' into 'master'
* Rename config->custom->feature.
See merge request easycorp/zentaopms!6119
|
2022-11-11 03:31:24 +00:00 |
|
|
lanzongjun
|
3fe8a0b6ad
|
* finish bug #29448
|
2022-11-11 11:25:51 +08:00 |
|
|
王怡栋
|
ea0f94ca47
|
Merge branch 'sprint/wangzemei/theme' into 'master'
* fix bug 29464 29473
See merge request easycorp/zentaopms!6117
|
2022-11-11 02:54:43 +00:00 |
|
|
王怡栋
|
88253aa6d5
|
Merge branch 'zentaopms_258_bug#29562' into 'master'
* Finish task #29562.
See merge request easycorp/zentaopms!6116
|
2022-11-11 02:53:47 +00:00 |
|
|
daitingting
|
be40637a66
|
* Rename config->custom->feature.
|
2022-11-11 02:52:58 +00:00 |
|
|
wangyidong
|
8c3c3bc660
|
Merge branch 'zentaopms258_wyd'
|
2022-11-11 10:51:20 +08:00 |
|
|
王怡栋
|
66b9e6b116
|
Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
# framework/base/router.class.php
|
2022-11-11 02:49:32 +00:00 |
|
|
wangyidong
|
8a178c72fe
|
* adjust for project release link story and bug.
|
2022-11-11 10:47:01 +08:00 |
|
|
wangzemei
|
44f35e9827
|
* fix green
|
2022-11-11 10:45:12 +08:00 |
|
|
wangzemei
|
bd32b35659
|
* fix bug 29464 29473
|
2022-11-11 10:24:45 +08:00 |
|
|
wangyuting
|
152364d338
|
* Finish task #29562.
|
2022-11-11 02:12:03 +00:00 |
|
|
王怡栋
|
3c83b8dbcb
|
Merge branch 'fixbug' into 'master'
* Add gantt icon.
See merge request easycorp/zentaopms!6109
|
2022-11-11 01:57:19 +00:00 |
|
|
王怡栋
|
fe22184cd4
|
Merge branch 'zentaopms_258_bug#29593' into 'master'
* Fix bug #29593.
See merge request easycorp/zentaopms!6115
|
2022-11-11 01:57:04 +00:00 |
|
|
王怡栋
|
ca6c5eeb68
|
Merge branch 'zentaopms_258_task#75239' into 'master'
* Finish task #75239.
See merge request easycorp/zentaopms!6112
|
2022-11-11 01:56:45 +00:00 |
|
|
孙广明
|
1a65c652fc
|
Merge branch 'master_xieqiyu_29483' into 'master'
* Fix bug#29483.
See merge request easycorp/zentaopms!6114
|
2022-11-11 01:41:38 +00:00 |
|
|
孙广明
|
3b5f93bd66
|
Merge branch 'sprint/tianshujie_issue' into 'master'
Sprint/tianshujie issue
See merge request easycorp/zentaopms!6113
|
2022-11-11 01:40:09 +00:00 |
|
|
wangyuting
|
3c36bfbb70
|
* Fix bug #29593.
|
2022-11-11 01:38:47 +00:00 |
|
|
tianshujie
|
ea99f50a0a
|
* Fix bug #29361.
|
2022-11-11 09:36:10 +08:00 |
|
|
xieqiyu
|
318f8b7b31
|
* Fix bug#29483.
|
2022-11-11 01:32:38 +00:00 |
|
|
tianshujie
|
caaf32b57a
|
* Fix bug #29508.
|
2022-11-11 09:23:39 +08:00 |
|
|
tianshujie
|
0544c75976
|
* Modify the project list name display question.
|
2022-11-11 09:20:55 +08:00 |
|
|
tianshujie
|
2c75eaf8f6
|
* Modify the statistics of the plan list.
|
2022-11-11 09:04:31 +08:00 |
|
|
wangyuting
|
2f5e0ac70d
|
* Finish task #75239.
|
2022-11-11 00:46:54 +00:00 |
|
|
孙广明
|
3cc1a5f1ef
|
Merge branch 'mayue_fix_bug#29466' into 'master'
* Fix bug #29466.
See merge request easycorp/zentaopms!6103
|
2022-11-11 00:28:22 +00:00 |
|
|
孙广明
|
b21f84513b
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug
See merge request easycorp/zentaopms!6104
|
2022-11-11 00:28:11 +00:00 |
|
|
王怡栋
|
bca89293fb
|
Merge branch 'zentaopms_258_task_#75243' into 'master'
* Finish task #75243.
See merge request easycorp/zentaopms!6111
|
2022-11-10 08:31:57 +00:00 |
|
|
王怡栋
|
77280a9aad
|
Merge branch 'zentaopms_258_task#75237' into 'master'
Zentaopms 258 task#75237
See merge request easycorp/zentaopms!6110
|
2022-11-10 08:31:34 +00:00 |
|