 朱金勇
|
ecbbc59166
|
Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest
See merge request easycorp/zentaopms!2775
|
2022-04-06 09:09:27 +00:00 |
|
|
孙广明
|
170393a33a
|
Merge branch 'master_xieqiyu_20278' into 'master'
* Fix bug#20278.
See merge request easycorp/zentaopms!2774
|
2022-04-06 09:07:45 +00:00 |
|
|
孙广明
|
650ea1a463
|
Merge branch 'master_xieqiyu_21290' into 'master'
* Fix bug#21290.
See merge request easycorp/zentaopms!2765
|
2022-04-06 09:06:57 +00:00 |
|
|
孙广明
|
a13a3214b5
|
* Add project test.
|
2022-04-06 17:01:25 +08:00 |
|
|
xieqiyu
|
09fa1197f6
|
* Fix bug#20278.
|
2022-04-06 16:59:00 +08:00 |
|
|
李玉春
|
ab11f42a19
|
Merge branch 'devops24_52072' into 'master'
Fix bug#21135
See merge request easycorp/zentaopms!2766
|
2022-04-06 08:53:06 +00:00 |
|
|
李玉春
|
ee99123c52
|
Merge branch 'sprint/master_zhouxudong_16780' into 'master'
* Fix bug #18545.
See merge request easycorp/zentaopms!2770
|
2022-04-06 08:46:53 +00:00 |
|
|
zhouxudong
|
37f76d050f
|
* Fix bug #18545.
|
2022-04-06 16:45:30 +08:00 |
|
|
zenggang
|
790932d79d
|
* Fix bug#20909
|
2022-04-06 08:43:29 +00:00 |
|
|
李玉春
|
0fe085d594
|
Merge branch 'cyy_app' into 'master'
* Modify api param.
See merge request easycorp/zentaopms!2771
|
2022-04-06 08:33:41 +00:00 |
|
|
caoyanyi
|
f654344656
|
* Modify api param.
|
2022-04-06 16:14:13 +08:00 |
|
|
孙广明
|
a2738a3421
|
Merge branch 'dht_productsonplan'
|
2022-04-06 16:01:31 +08:00 |
|
|
孙广明
|
bd895ca244
|
* Add project test and fix bug.
|
2022-04-06 16:01:06 +08:00 |
|
|
孙广明
|
8c4f6de97e
|
Merge branch 'master' into 'dht_productsonplan'
# Conflicts:
# test/data/zentao/processor.php
|
2022-04-06 08:00:23 +00:00 |
|
|
zenggang
|
8799957c73
|
* Fix bug#21218
|
2022-04-06 08:00:21 +00:00 |
|
|
zhouxudong
|
c776289815
|
* Fix bug #16780.
|
2022-04-06 16:00:00 +08:00 |
|
|
孙广明
|
32ef589b42
|
Update processor.php
|
2022-04-06 07:59:30 +00:00 |
|
|
李玉春
|
4f42d628fc
|
Merge branch 'cyy_20309' into 'master'
* Fix bug #20309.
See merge request easycorp/zentaopms!2768
|
2022-04-06 07:48:25 +00:00 |
|
|
caoyanyi
|
ae8728b5da
|
* Fix bug #20309.
|
2022-04-06 15:46:25 +08:00 |
|
|
李玉春
|
7dc812188f
|
Merge branch 'sunhuawei_fixbug_21514' into 'master'
*Fix bug#21514.
See merge request easycorp/zentaopms!2767
|
2022-04-06 07:45:27 +00:00 |
|
|
李玉春
|
d9393143a6
|
Merge branch 'sprint/tianshujie_bug18710' into 'master'
* Fix bug #18710.
See merge request easycorp/zentaopms!2764
|
2022-04-06 07:39:25 +00:00 |
|
|
zenggang
|
261d23bc57
|
* Fix bug#21135
|
2022-04-06 07:36:22 +00:00 |
|
|
xieqiyu
|
d8774117b9
|
* Fix bug#21290.
|
2022-04-06 15:36:20 +08:00 |
|
|
孙华伟
|
a10b23a5c0
|
*Fix bug#21514.
|
2022-04-06 15:24:00 +08:00 |
|
|
tianshujie
|
0530b892e4
|
* Fix bug #18710.
|
2022-04-06 15:22:15 +08:00 |
|
|
李玉春
|
64f7e522bf
|
Merge branch 'devops24_51071' into 'master'
Finish task#51071
See merge request easycorp/zentaopms!2760
|
2022-04-06 06:42:07 +00:00 |
|
|
zenggang
|
badb961a37
|
* Adjust code
|
2022-04-06 06:27:49 +00:00 |
|
|
zenggang
|
6cdf575678
|
* Adjust code
|
2022-04-06 06:07:46 +00:00 |
|
|
zenggang
|
c149ac6299
|
* Adjust code
|
2022-04-06 06:03:03 +00:00 |
|
|
李玉春
|
2116639010
|
Merge branch 'sunhuawei_fixbug_18381' into 'master'
*Fix bug#18381.
See merge request easycorp/zentaopms!2762
|
2022-04-06 05:42:23 +00:00 |
|
|
孙华伟
|
3eb12785f1
|
*Fix bug#18381.
|
2022-04-06 13:37:19 +08:00 |
|
|
朱金勇
|
a70a61f078
|
Merge branch 'spring/sunhao/bug18928' into 'master'
* bug #18928, fix switch button not work when statistic block place in right side.
See merge request easycorp/zentaopms!2747
|
2022-04-06 05:28:50 +00:00 |
|
|
孙广明
|
7cac3e87e0
|
Merge branch 'autotest_feilun' into 'master'
Autotest feilun
See merge request easycorp/zentaopms!2757
|
2022-04-06 05:26:00 +00:00 |
|
|
孙广明
|
2da5d460cf
|
Update ztest
|
2022-04-06 05:25:14 +00:00 |
|
|
zenggang
|
8e0fc555c8
|
* Fix bug#11398
|
2022-04-06 05:19:30 +00:00 |
|
|
王怡栋
|
d75d09e70a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-06 13:14:16 +08:00 |
|
|
王怡栋
|
4f5529867b
|
* code for bug #20933.
|
2022-04-06 13:13:29 +08:00 |
|
|
zenggang
|
4b87e07830
|
* Finish task#51071
|
2022-04-06 04:16:24 +00:00 |
|
|
孙广明
|
e7b10d4c3d
|
Merge branch 'autotest_ly' into 'master'
update action data
See merge request easycorp/zentaopms!2758
|
2022-04-06 02:49:15 +00:00 |
|
|
liyang
|
0b8768c1d6
|
update action data
|
2022-04-06 10:48:24 +08:00 |
|
|
zhangxuwen
|
4590b89567
|
Modify cron and caselib testcase
|
2022-04-06 10:22:24 +08:00 |
|
|
zhangxuwen
|
2abcb3ed75
|
Merge branch 'autotest_feilun' of https://gitlab.zcorp.cc/easycorp/zentaopms into autotest_feilun
|
2022-04-06 10:19:06 +08:00 |
|
|
孙广明
|
6a5231b013
|
Merge branch 'master_xieqiyu_13881' into 'master'
* Fix bug#13881.
See merge request easycorp/zentaopms!2754
|
2022-04-06 01:53:08 +00:00 |
|
|
xieqiyu
|
c4e9e00959
|
* Fix bug#13881.
|
2022-04-06 09:49:30 +08:00 |
|
|
李玉春
|
0bcc43bdff
|
Merge branch 'cyy_20793' into 'master'
* Fix bug #20793.
See merge request easycorp/zentaopms!2741
|
2022-04-06 01:40:29 +00:00 |
|
|
李玉春
|
938173d32c
|
Merge branch 'app_zry' into 'master'
* Change api for edit story.
See merge request easycorp/zentaopms!2753
|
2022-04-06 01:40:04 +00:00 |
|
|
zhengrunyu
|
365a048084
|
* Change api for edit story.
|
2022-04-06 09:38:07 +08:00 |
|
|
孙广明
|
56dc995d61
|
Merge branch 'master_xieqiyu_6948' into 'master'
* Fix bug#6948.
See merge request easycorp/zentaopms!2751
|
2022-04-06 00:51:24 +00:00 |
|
|
孙广明
|
918fd9af30
|
Merge branch 'autotest_ly' into 'master'
update action data
See merge request easycorp/zentaopms!2752
|
2022-04-06 00:50:13 +00:00 |
|
|
liyang
|
d05a941079
|
update action data
|
2022-04-06 08:48:56 +08:00 |
|