 Hao Sun
|
2f8bf5331f
|
* update zui lib.
|
2021-12-06 09:37:22 +08:00 |
|
|
Hao Sun
|
74ef8b9a10
|
* refactor: comment.
|
2021-12-06 09:36:59 +08:00 |
|
|
孙广明
|
a2d33ec110
|
Merge branch 'sprint/liyuchun_bug_16639' into 'master'
* Fix bug #16639.
See merge request easycorp/zentaopms!775
|
2021-12-06 01:10:28 +00:00 |
|
|
liyuchun
|
5c23642d36
|
* Fix bug #16639.
|
2021-12-06 09:06:50 +08:00 |
|
|
李玉春
|
7331e5c8e3
|
Merge branch 'sprint/175_sgm_fixbug' into 'master'
Sprint/175 sgm fixbug
See merge request easycorp/zentaopms!773
|
2021-12-06 00:52:44 +00:00 |
|
|
孙广明
|
5a8e51a9c6
|
Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Merge programplan into stage.
See merge request easycorp/zentaopms!760
|
2021-12-06 00:33:10 +00:00 |
|
|
孙广明
|
c3836a8327
|
* Fix release lang.
|
2021-12-06 08:22:31 +08:00 |
|
|
孙广明
|
664ba5336a
|
* Add lang.
|
2021-12-06 08:20:21 +08:00 |
|
|
zhujinyong
|
035c35d2e2
|
* Fix status of testcase.
|
2021-12-06 08:19:15 +08:00 |
|
|
zhujinyong
|
5f3b5817c9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-05 23:51:59 +08:00 |
|
|
zhujinyong
|
f6d7234156
|
* Fix bugs of api.
|
2021-12-05 23:51:27 +08:00 |
|
|
李玉春
|
f59d0863cd
|
Merge branch 'devops_16786' into 'master'
* Fix bug#16786,16981
See merge request easycorp/zentaopms!771
|
2021-12-03 09:45:15 +00:00 |
|
|
zenggang
|
2b50a60ddc
|
* Adjust code style
|
2021-12-03 09:36:33 +00:00 |
|
|
tanghucheng
|
2935b5964c
|
* Merge programplan into stage.
|
2021-12-03 15:49:18 +08:00 |
|
|
王怡栋
|
2b8a51de68
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 15:48:07 +08:00 |
|
|
王怡栋
|
c16478c5d0
|
* fix for upgrade from lower version.
|
2021-12-03 15:47:39 +08:00 |
|
|
孙广明
|
b464d9d108
|
* Fix bug #17080.
|
2021-12-03 15:45:00 +08:00 |
|
|
zenggang
|
303ecdf5c8
|
* Adjust code stye
|
2021-12-03 07:40:08 +00:00 |
|
|
孙广明
|
8d72bedc6d
|
Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Fixbug 17066.
See merge request easycorp/zentaopms!769
|
2021-12-03 07:27:07 +00:00 |
|
|
zenggang
|
7248447ed7
|
* Fix bug#16786,16981
|
2021-12-03 06:59:44 +00:00 |
|
|
王怡栋
|
16bb344a1f
|
Merge branch 'sprint/174_xieqiyu_17075' into 'master'
* Fix bug#17075.
See merge request easycorp/zentaopms!770
|
2021-12-03 06:50:05 +00:00 |
|
|
xieqiyu
|
a944ec7ccd
|
* Fix bug#17075.
|
2021-12-03 14:46:12 +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 |
|
|
王怡栋
|
7344486770
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 13:54:05 +08:00 |
|
|
zhengrunyu
|
d5f6181ea3
|
*Fixbug 17066.
|
2021-12-03 13:53:53 +08:00 |
|
|
王怡栋
|
9cf38e4ff8
|
* adjust for projectOverview.
|
2021-12-03 13:53:50 +08:00 |
|
|
孙广明
|
9144c435bc
|
* Fix bug #17068.
|
2021-12-03 13:49:57 +08:00 |
|
|
孙广明
|
acf95daf8a
|
Merge branch 'sprint/174_hufangzhou_17065' into 'master'
* Fix bug #17065.
See merge request easycorp/zentaopms!768
|
2021-12-03 05:35:30 +00:00 |
|
|
hufangzhou
|
e76a988bbe
|
* Fix bug #17065.
|
2021-12-03 13:25:51 +08:00 |
|
|
李玉春
|
0f2ea93509
|
Merge branch 'devops_16884' into 'master'
* Fix bug#16884,16856
See merge request easycorp/zentaopms!758
|
2021-12-03 05:22:07 +00:00 |
|
|
liyuchun
|
8c83a45cd3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 13:21:23 +08:00 |
|
|
liyuchun
|
0c888e8dff
|
Merge branch 'sprint/174_xieqiyu_45015'
|
2021-12-03 13:20:29 +08:00 |
|
|
xieqiyu
|
47f1099039
|
* Fix bug#17061.
|
2021-12-03 13:09:22 +08:00 |
|
|
李玉春
|
f0f0325a8d
|
Merge branch 'master' into 'sprint/174_xieqiyu_45015'
# Conflicts:
# module/testcase/control.php
|
2021-12-03 05:07:19 +00:00 |
|
|
李玉春
|
3455ec3004
|
Merge branch 'sprint/174_xieqiyu_17022' into 'master'
* Add judgment on null parameters.
See merge request easycorp/zentaopms!740
|
2021-12-03 05:05:42 +00:00 |
|
|
zhujinyong
|
d73d395995
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 12:37:58 +08:00 |
|
|
zhujinyong
|
e660a67e40
|
* Fix product api.
|
2021-12-03 12:37:45 +08:00 |
|
|
xieqiyu
|
5d5045a4dd
|
* Adjust code for import form lib.
|
2021-12-03 12:30:30 +08:00 |
|
|
zenggang
|
f619cf0341
|
* Adjust mr view button
|
2021-12-03 03:09:37 +00:00 |
|
|
tanghucheng
|
499605d81e
|
* Merge programplan into stage.
|
2021-12-03 11:09:28 +08:00 |
|
|
李玉春
|
671cf2a8fa
|
Merge branch 'sprint/174_sunhao/bug16878' into 'master'
* Bug 16878, fix layout when open execution/task in iframe modal.
See merge request easycorp/zentaopms!765
|
2021-12-03 02:57:22 +00:00 |
|
|
liyuchun
|
c919c8105d
|
* Adjust code style.
|
2021-12-03 10:56:55 +08:00 |
|
|
xieqiyu
|
e61c87a6ff
|
* Code for task#45015.
|
2021-12-03 10:49:42 +08:00 |
|
|
李玉春
|
26056ba15b
|
Merge branch 'devops_16736' into 'master'
* Fix bug#16736,17037,16844
See merge request easycorp/zentaopms!766
|
2021-12-03 02:25:07 +00:00 |
|
|
孙广明
|
87c7acdf03
|
Merge branch 'sprint/175_liyuchun_45162' into 'master'
* Finish task #45154.
See merge request easycorp/zentaopms!762
|
2021-12-03 02:11:49 +00:00 |
|
|
孙广明
|
fd0e67494d
|
Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Fixbug .
See merge request easycorp/zentaopms!767
|
2021-12-03 02:11:31 +00:00 |
|
|
zhengrunyu
|
cda9cdf969
|
*Fixbug .
|
2021-12-03 10:04:54 +08:00 |
|
|
zhujinyong
|
fc9fe1ac84
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2021-12-03 10:01:17 +08:00 |
|
|
zhujinyong
|
861e92107c
|
+ Add user type for api.
|
2021-12-03 10:01:01 +08:00 |
|