 王怡栋
|
5090da4280
|
Merge branch 'branch/workflow' into 'master'
#Do task # 53548 and task #53550.
See merge request easycorp/zentaopms!3296
|
2022-05-09 09:20:05 +00:00 |
|
|
王怡栋
|
59e1a3e57e
|
Merge branch 'sprint/master_lanzongjun_unit_test2' into 'master'
finish unit test job
See merge request easycorp/zentaopms!3294
|
2022-05-09 08:37:05 +00:00 |
|
|
wangyidong
|
4459c89c4b
|
Merge branch 'sprint/master_lanzongjun_unit_test2'
|
2022-05-07 15:25:48 +08:00 |
|
|
王怡栋
|
efbdc30518
|
Merge branch 'master' into 'sprint/master_lanzongjun_unit_test2'
# Conflicts:
# test/ztest
|
2022-05-07 07:25:30 +00:00 |
|
|
王怡栋
|
274c0443f8
|
Merge branch 'sgm_fixbug' into 'master'
* Rename var.
See merge request easycorp/zentaopms!3276
|
2022-05-07 07:05:31 +00:00 |
|
|
wangyidong
|
e17cc3017c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-05-07 15:00:57 +08:00 |
|
|
wangyidong
|
54b4369059
|
Merge branch 'fixbug'
|
2022-05-07 15:00:43 +08:00 |
|
|
wangyidong
|
c82550c55c
|
* Finish jenkins test.
|
2022-05-07 15:00:13 +08:00 |
|
|
王怡栋
|
06195b0140
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# test/ztest
|
2022-05-07 06:59:57 +00:00 |
|
|
wangyidong
|
8d1f35aaf9
|
* Add for git unit.
|
2022-05-06 17:33:43 +08:00 |
|
|
王怡栋
|
48d33a7564
|
Merge branch 'sgm_testext' into 'master'
* Finish extension.
See merge request easycorp/zentaopms!3253
|
2022-05-06 08:54:39 +00:00 |
|
|
王怡栋
|
b5735ec037
|
Merge branch 'sprint/daitingting_flow_flow' into 'master'
* Update setFlowURI and mergeParams function according to zdoo.
See merge request easycorp/zentaopms!3251
|
2022-05-06 08:17:49 +00:00 |
|
|
王怡栋
|
bc4955b72b
|
Merge branch 'sprint/hufangzhou_package' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!3246
|
2022-05-06 05:51:40 +00:00 |
|
|
王怡栋
|
db12d1c18c
|
Merge branch 'sprint/fixbug_hufangzhou_22153' into 'master'
* Fix bug #22153.
See merge request easycorp/zentaopms!3235
|
2022-05-05 09:36:49 +00:00 |
|
|
王怡栋
|
5daf355f32
|
Merge branch 'fixbug' into 'master'
* Fix bug for gantt.
See merge request easycorp/zentaopms!3217
|
2022-04-29 05:38:38 +00:00 |
|
|
王怡栋
|
f005a22eb8
|
Merge branch 'sprint/fixbug_liumengyi' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3213
|
2022-04-29 03:09:44 +00:00 |
|
|
王怡栋
|
fd924b9f73
|
Merge branch 'fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!3208
|
2022-04-28 12:01:51 +00:00 |
|
|
wangyidong
|
b7792b6c44
|
* fix bug #14677.
|
2022-04-28 19:07:20 +08:00 |
|
|
wangyidong
|
1d9f9c0e75
|
* code for bug #22095.
|
2022-04-28 17:46:41 +08:00 |
|
|
王怡栋
|
65a94a2afd
|
Merge branch 'sprint/fixbug_hufangzhou_15662' into 'master'
* Fix bug #15662.
See merge request easycorp/zentaopms!3204
|
2022-04-28 09:31:47 +00:00 |
|
|
王怡栋
|
9850bfa641
|
Merge branch 'sprint/fixbug_hufangzhou_22102' into 'master'
* Fix bug #22102.
See merge request easycorp/zentaopms!3201
|
2022-04-28 08:52:13 +00:00 |
|
|
王怡栋
|
35c6389735
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22019
See merge request easycorp/zentaopms!3195
|
2022-04-28 08:51:30 +00:00 |
|
|
王怡栋
|
40dd0d318d
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3202
|
2022-04-28 08:50:56 +00:00 |
|
|
王怡栋
|
d968d4e7a5
|
Merge branch 'liwenrui-master-patch-52526' into 'master'
* fix default params in xuan, bug #21883.
See merge request easycorp/zentaopms!3194
|
2022-04-28 08:50:31 +00:00 |
|
|
王怡栋
|
a1f011506d
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #14997.
See merge request easycorp/zentaopms!3184
|
2022-04-28 08:47:17 +00:00 |
|
|
王怡栋
|
a0c13f4d80
|
Merge branch 'fixbug' into 'master'
* Fix bug #22025,22028.
See merge request easycorp/zentaopms!3181
|
2022-04-28 08:46:46 +00:00 |
|
|
wangyidong
|
4e24558f9f
|
* code for bug #15815.
|
2022-04-28 11:54:46 +08:00 |
|
|
wangyidong
|
fbd33f5262
|
* code bug #15815.
|
2022-04-28 11:54:46 +08:00 |
|
|
王怡栋
|
ae63462ee1
|
Merge branch 'sgm_fixbug' into 'master'
* Code for weekly bug.
See merge request easycorp/zentaopms!3179
|
2022-04-28 03:11:44 +00:00 |
|
|
wangyidong
|
af305d0916
|
* code bug #21710.
|
2022-04-28 11:07:17 +08:00 |
|
|
wangyidong
|
eca27bd9ed
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-28 10:32:36 +08:00 |
|
|
wangyidong
|
8f437f4537
|
* code for bug #22057.
|
2022-04-28 10:32:24 +08:00 |
|
|
王怡栋
|
ec08b7bfcc
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22008
See merge request easycorp/zentaopms!3162
|
2022-04-27 09:29:23 +00:00 |
|
|
王怡栋
|
56f4a1a6df
|
Merge branch 'fixbug' into 'master'
* Fix bug #15677.
See merge request easycorp/zentaopms!3156
|
2022-04-27 09:28:49 +00:00 |
|
|
王怡栋
|
80e6f3b16b
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21988
See merge request easycorp/zentaopms!3153
|
2022-04-27 06:33:30 +00:00 |
|
|
wangyidong
|
d9874358fe
|
* revert code for web extension.
|
2022-04-27 14:14:36 +08:00 |
|
|
wangyidong
|
504e73339b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-27 13:41:02 +08:00 |
|
|
wangyidong
|
701d007a9f
|
* code for bug #22030.
|
2022-04-27 13:40:47 +08:00 |
|
|
wangyidong
|
4205e0eb80
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-27 11:53:41 +08:00 |
|
|
wangyidong
|
7b1fc7ee04
|
* code for bug #22026.
|
2022-04-27 11:53:27 +08:00 |
|
|
wangyidong
|
2d82ad3e79
|
* fix bug.
|
2022-04-27 10:33:03 +08:00 |
|
|
wangyidong
|
9508d7729b
|
* code for bug #21400.
|
2022-04-27 09:55:50 +08:00 |
|
|
wangyidong
|
0e2c27746d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-27 09:37:18 +08:00 |
|
|
wangyidong
|
899c123dac
|
* code for bug #19303.
|
2022-04-27 09:37:01 +08:00 |
|
|
王怡栋
|
04af0c5055
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #15814
See merge request easycorp/zentaopms!3139
|
2022-04-27 00:19:19 +00:00 |
|
|
王怡栋
|
fb8609f174
|
Merge branch 'fixbug' into 'master'
* Fix bug .
See merge request easycorp/zentaopms!3141
|
2022-04-26 09:09:31 +00:00 |
|
|
wangyidong
|
988b796ed5
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-26 16:43:28 +08:00 |
|
|
wangyidong
|
66df7b4990
|
* code for bug #15377.
|
2022-04-26 16:43:10 +08:00 |
|
|
王怡栋
|
ceceb6bc9e
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #15834
See merge request easycorp/zentaopms!3119
|
2022-04-26 07:55:47 +00:00 |
|
|
王怡栋
|
9f28ff673a
|
Merge branch 'fixbug' into 'master'
*Fix bug #15552.
See merge request easycorp/zentaopms!3128
|
2022-04-26 07:51:51 +00:00 |
|
|
wangyidong
|
23726bdb49
|
* adjust code.
|
2022-04-26 14:36:44 +08:00 |
|
|
wangyidong
|
d8939cd2de
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-26 13:55:15 +08:00 |
|
|
wangyidong
|
47b07058f1
|
* code for bug #15453.
|
2022-04-26 13:54:55 +08:00 |
|
|
王怡栋
|
6ba9bfee42
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #10735.
See merge request easycorp/zentaopms!3120
|
2022-04-26 03:31:21 +00:00 |
|
|
wangyidong
|
5acdc8964c
|
* fix bug #22001.
|
2022-04-26 10:14:04 +08:00 |
|
|
wangyidong
|
27e377d1fb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-26 09:52:04 +08:00 |
|
|
wangyidong
|
f4e295ac8e
|
* adjust for sso.
|
2022-04-26 09:51:55 +08:00 |
|
|
wangyidong
|
f77b7875cc
|
* adjust for kilin.
|
2022-04-26 09:46:33 +08:00 |
|
|
王怡栋
|
c2800dc279
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #14842
See merge request easycorp/zentaopms!3114
|
2022-04-25 09:38:01 +00:00 |
|
|
王怡栋
|
d9efb65f46
|
Merge branch 'fixbug' into 'master'
* Fix bug #18209.
See merge request easycorp/zentaopms!3111
|
2022-04-25 09:24:23 +00:00 |
|
|
王怡栋
|
f76be66917
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #16663#17626
See merge request easycorp/zentaopms!3108
|
2022-04-25 09:22:47 +00:00 |
|
|
wangyidong
|
f208fcea12
|
* fix error.
|
2022-04-25 15:58:32 +08:00 |
|
|
wangyidong
|
875d7bd93f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-25 15:20:20 +08:00 |
|
|
wangyidong
|
668637fc18
|
* adjust for web page.
|
2022-04-25 15:20:05 +08:00 |
|
|
wangyidong
|
580132c2c8
|
* code for bug #18347.
|
2022-04-25 10:36:08 +08:00 |
|
|
wangyidong
|
bf252f261c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-25 08:56:04 +08:00 |
|
|
wangyidong
|
0705daa805
|
* adjust for performance issue.
|
2022-04-25 08:55:03 +08:00 |
|
|
王怡栋
|
4f1690ca0e
|
Merge branch 'liyuchun_fixbug_14805' into 'master'
* Fix bug #14805.
See merge request easycorp/zentaopms!3104
|
2022-04-24 09:26:29 +00:00 |
|
|
王怡栋
|
4f111c37f3
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
Sprint/master lanzongjun fixbug
See merge request easycorp/zentaopms!3103
|
2022-04-24 09:24:42 +00:00 |
|
|
王怡栋
|
b69bc3989d
|
Merge branch 'master_xieqiyu_2974' into 'master'
* Fix bug#2974.
See merge request easycorp/zentaopms!3100
|
2022-04-24 09:24:13 +00:00 |
|
|
wangyidong
|
c2f6b3220a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-24 16:08:55 +08:00 |
|
|
wangyidong
|
a7bc51b608
|
* code bug #18835.
|
2022-04-24 16:08:28 +08:00 |
|
|
wangyidong
|
422383fe9d
|
Merge branch 'sprint/master_lanzongjun_fixbug'
|
2022-04-24 15:03:36 +08:00 |
|
|
王怡栋
|
0faf44af53
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/stage/model.php
|
2022-04-24 07:02:51 +00:00 |
|
|
王怡栋
|
3cf83a54c6
|
Merge branch 'master_xieqiyu_1736' into 'master'
* Fix bug#1736.
See merge request easycorp/zentaopms!3094
|
2022-04-24 07:00:20 +00:00 |
|
|
王怡栋
|
480ca71da8
|
Merge branch 'fixbug' into 'master'
* Fix bug #17602,14850,21439.
See merge request easycorp/zentaopms!3097
|
2022-04-24 07:00:04 +00:00 |
|
|
王怡栋
|
048688e7e0
|
Merge branch 'sprint/fixbug_hufangzhou_17335' into 'master'
* Fix bug #17335.
See merge request easycorp/zentaopms!3095
|
2022-04-24 06:45:34 +00:00 |
|
|
王怡栋
|
e2f34e0f19
|
Merge branch 'sprint/fixbug_hufangzhou_17446' into 'master'
* Fix bug #17446.
See merge request easycorp/zentaopms!3093
|
2022-04-24 06:42:54 +00:00 |
|
|
王怡栋
|
1b25be3932
|
Merge branch 'master_xieqiyu_21947' into 'master'
* Fix bug#21947.
See merge request easycorp/zentaopms!3092
|
2022-04-24 06:42:36 +00:00 |
|
|
王怡栋
|
9d96c4d3ac
|
Merge branch 'liyuchun_fixbug_7008' into 'master'
* Fix bug #7008.
See merge request easycorp/zentaopms!3071
|
2022-04-24 06:41:59 +00:00 |
|
|
王怡栋
|
ff13c87122
|
Merge branch 'liyuchun_fixbug_21960' into 'master'
* Fix bug #21960.
See merge request easycorp/zentaopms!3099
|
2022-04-24 06:39:53 +00:00 |
|
|
wangyidong
|
8c9bf2550f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-22 15:29:21 +08:00 |
|
|
wangyidong
|
a08edd3336
|
* adjust for repo.
|
2022-04-22 15:29:06 +08:00 |
|
|
王怡栋
|
ff8ad82f8f
|
Merge branch 'sprint/tianshujie_bug21916' into 'master'
Sprint/tianshujie bug21916
See merge request easycorp/zentaopms!3085
|
2022-04-22 07:15:47 +00:00 |
|
|
王怡栋
|
089661adc6
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18855
See merge request easycorp/zentaopms!3083
|
2022-04-22 06:44:49 +00:00 |
|
|
王怡栋
|
fa729e5a22
|
Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug
See merge request easycorp/zentaopms!3084
|
2022-04-22 06:44:06 +00:00 |
|
|
王怡栋
|
0559230b1c
|
Merge branch 'sprint/fixbug_liumengyi_3079' into 'master'
* Fix bug #3079.
See merge request easycorp/zentaopms!3081
|
2022-04-22 05:59:27 +00:00 |
|
|
王怡栋
|
814599788b
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18933
See merge request easycorp/zentaopms!3067
|
2022-04-22 03:40:20 +00:00 |
|
|
王怡栋
|
f8ef430ad6
|
* fix error.
|
2022-04-22 10:59:30 +08:00 |
|
|
王怡栋
|
4aa567757b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-22 10:41:19 +08:00 |
|
|
王怡栋
|
b9eab52620
|
* fix vulnerability.
|
2022-04-22 10:38:41 +08:00 |
|
|
王怡栋
|
f93e474e26
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18934#21853
See merge request easycorp/zentaopms!3063
|
2022-04-21 08:24:08 +00:00 |
|
|
王怡栋
|
89e1854932
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-21 15:39:05 +08:00 |
|
|
王怡栋
|
7ae35d4a12
|
* fix bug #21806.
|
2022-04-21 15:38:33 +08:00 |
|
|
王怡栋
|
9f68a5c608
|
Merge branch 'fixbug' into 'master'
* Fix bug #18266.
See merge request easycorp/zentaopms!3055
|
2022-04-21 06:55:30 +00:00 |
|
|
王怡栋
|
65dac30fdf
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21853
See merge request easycorp/zentaopms!3049
|
2022-04-21 02:42:23 +00:00 |
|
|
王怡栋
|
abc8eed00e
|
Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug
See merge request easycorp/zentaopms!3050
|
2022-04-21 02:41:40 +00:00 |
|
|
王怡栋
|
ce9a48bf47
|
Merge branch 'fixbug' into 'master'
* Fix bug #21370 for update.
See merge request easycorp/zentaopms!3046
|
2022-04-21 02:11:50 +00:00 |
|
|
王怡栋
|
c5f4ad704e
|
Merge branch 'fixbug' into 'master'
* Fix bug #19142.
See merge request easycorp/zentaopms!3041
|
2022-04-21 01:34:48 +00:00 |
|
|
王怡栋
|
3e29be515f
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *19360
See merge request easycorp/zentaopms!3029
|
2022-04-21 01:33:48 +00:00 |
|