 wangxiaomeng
|
8cec8ea0bd
|
fixbug_21650.
|
2022-04-21 16:00:44 +08: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 |
|
|
孙广明
|
3ac0ae876c
|
Merge branch 'mayue_fix_bug21904' into 'master'
* Fix bug #21904.
See merge request easycorp/zentaopms!3059
|
2022-04-21 07:18:06 +00:00 |
|
|
孙广明
|
47962dc5b2
|
Merge branch 'master_xieqiyu_2598' into 'master'
* Fix bug#2598.
See merge request easycorp/zentaopms!3053
|
2022-04-21 07:15:41 +00:00 |
|
|
mayue
|
5f5cc8768e
|
* Fix bug #21904.
|
2022-04-21 15:04:59 +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 |
|
|
孙广明
|
87517394ec
|
Merge branch 'sprint/fixbug_hufangzhou_11074' into 'master'
* Fix bug #11074.
See merge request easycorp/zentaopms!3058
|
2022-04-21 06:55:02 +00:00 |
|
|
hufangzhou
|
2dc575a760
|
* Fix bug #11074.
|
2022-04-21 14:53:38 +08:00 |
|
|
李玉春
|
77f85a3080
|
Merge branch 'sprint/sunhao/fix_kanban_sort_cards' into 'master'
* fix cards sorting in kanban column not work.
See merge request easycorp/zentaopms!3057
|
2022-04-21 06:49:05 +00:00 |
|
|
Hao Sun
|
1bc448da58
|
* fix cards sorting in kanban column not work.
|
2022-04-21 14:46:41 +08:00 |
|
|
孙广明
|
63f22116a4
|
Merge branch 'fixbugs_zhouxin_2296,1832' into 'master'
* Fix bug #2296,#1832.
See merge request easycorp/zentaopms!3054
|
2022-04-21 05:53:47 +00:00 |
|
|
zhouxin
|
8ec6de5fb5
|
* Fix bug #2296,#1832.
|
2022-04-21 05:50:05 +00:00 |
|
|
tanghucheng
|
700c706916
|
* Fix bug #18266.
|
2022-04-21 05:33:41 +00:00 |
|
|
xieqiyu
|
c87d9a96a5
|
* Fix bug#2598.
|
2022-04-21 13:15:49 +08:00 |
|
|
李玉春
|
5d1b39b4a6
|
Merge branch 'sprint/fixbug_liumengyi_19143' into 'master'
* Fix bug #19143.
See merge request easycorp/zentaopms!3052
|
2022-04-21 05:12:22 +00:00 |
|
|
liumengyi
|
3c053ada91
|
* Add english lang item.
|
2022-04-21 13:11:14 +08:00 |
|
|
liumengyi
|
80bbd19c9d
|
* Fix bug #19143.
|
2022-04-21 13:00:36 +08:00 |
|
|
李玉春
|
9240a007d7
|
Merge branch 'cyy_15292' into 'master'
* Fix bug #15292.
See merge request easycorp/zentaopms!3042
|
2022-04-21 02:54:01 +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 |
|
|
孙广明
|
e4295fdbe5
|
* Code for workflow bug.
|
2022-04-21 10:40:56 +08:00 |
|
|
孙广明
|
7fb3a62058
|
* Fix workflow bug.
|
2022-04-21 10:24:25 +08:00 |
|
|
孙广明
|
57a39efdea
|
* Fix bug #17618.
|
2022-04-21 10:17:47 +08:00 |
|
|
孙广明
|
d48e22cad9
|
* Fix bug #17618.
|
2022-04-21 10:16:01 +08:00 |
|
|
Zongjun Lan
|
473d5a6566
|
* fix bug #21853
|
2022-04-21 10:13:39 +08: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 |
|
|
tanghucheng
|
37514f79c3
|
* Fix bug #21370 for update.
|
2022-04-21 02:08:47 +00:00 |
|
|
孙广明
|
1f3bbca59d
|
Merge branch 'dht_Webhook' into 'master'
add ztest
See merge request easycorp/zentaopms!3048
|
2022-04-21 02:01:44 +00:00 |
|
|
孙广明
|
27d12a861b
|
Merge branch 'dht_personnel' into 'master'
finish personnel unittest
See merge request easycorp/zentaopms!3045
|
2022-04-21 02:01:35 +00:00 |
|
|
denghongtao
|
b43b5266e5
|
add ztest
|
2022-04-21 09:55:32 +08:00 |
|
|
caoyanyi
|
6883f9b5fb
|
* Fix bug #12918.
|
2022-04-21 01:52:21 +00:00 |
|
|
孙广明
|
6bc026840e
|
Merge branch 'sprint/master_zhouxudong_17536' into 'master'
Sprint/master zhouxudong 17536
See merge request easycorp/zentaopms!3047
|
2022-04-21 01:50:04 +00:00 |
|
|
zhouxudong
|
1741957f2d
|
* Fix bug from max #17536.
|
2022-04-21 09:48:13 +08: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 |
|
|
Zongjun Lan
|
cc17a999ec
|
* fix code
|
2022-04-21 09:32:11 +08:00 |
|
|
孙广明
|
80f42f3c31
|
Merge branch 'sprint/fixbug_hufangzhou_19984' into 'master'
* Fix bug #19984.
See merge request easycorp/zentaopms!3044
|
2022-04-21 01:28:51 +00:00 |
|
|
hufangzhou
|
d4f1453db1
|
* Fix bug #19984.
|
2022-04-21 09:26:15 +08:00 |
|
|
denghongtao
|
d5f1179111
|
finish personnel unittest
|
2022-04-21 09:24:24 +08:00 |
|
|
孙广明
|
ac0eb8c657
|
Merge branch 'liyuchun_fixbug_21632' into 'master'
* Fix bug #21632.
See merge request easycorp/zentaopms!3024
|
2022-04-21 01:22:29 +00:00 |
|
|
孙广明
|
5f18c15827
|
Merge branch 'fixbug_sunjun_21811' into 'master'
*Fixbug_sunjun_21811
See merge request easycorp/zentaopms!3040
|
2022-04-21 01:17:53 +00:00 |
|
|
周旭东
|
a46767fc3d
|
Update control.php
|
2022-04-21 01:12:13 +00:00 |
|
|
周旭东
|
ee649fba71
|
Update zh-cn.php
|
2022-04-21 01:11:00 +00:00 |
|
|
zhouxudong
|
9f6fc42c11
|
* Fix bug from max #17536.
|
2022-04-21 09:09:00 +08:00 |
|
|
caoyanyi
|
fa3411ce92
|
* Fix bug #15292.
|
2022-04-21 01:04:50 +00:00 |
|
|
王怡栋
|
884c145ce2
|
Merge branch 'fixbug' into 'master'
* Fix bug #21846.
See merge request easycorp/zentaopms!3019
|
2022-04-21 00:44:21 +00:00 |
|
|
王怡栋
|
21c0fbb067
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-20 17:19:32 +08:00 |
|
|
王怡栋
|
54040e5777
|
* code for bug #16770.
|
2022-04-20 17:19:07 +08:00 |
|
|
孙广明
|
48c8950520
|
Merge branch 'sprint/scx_taskapi' into 'master'
* Fix bug #21677.
See merge request easycorp/zentaopms!3038
|
2022-04-20 09:18:38 +00:00 |
|