王怡栋
|
22406348f6
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20787
See merge request easycorp/zentaopms!2306
|
2022-03-16 07:14:08 +00:00 |
|
王怡栋
|
6b44c9e08b
|
Merge branch 'sprint/187_hufangzhou_globalSearch' into 'master'
* Adjust the width of global search box.
See merge request easycorp/zentaopms!2309
|
2022-03-16 07:09:02 +00:00 |
|
hufangzhou
|
f1f3f13f5d
|
* Adjust the width of global search box.
|
2022-03-16 15:08:00 +08:00 |
|
孙广明
|
d21ec4ac9a
|
Merge branch 'autotest_ly' into 'master'
update execution test and add usercontact data
See merge request easycorp/zentaopms!2303
|
2022-03-16 07:03:23 +00:00 |
|
liyang
|
664e4f82e5
|
update execution
|
2022-03-16 15:01:31 +08:00 |
|
孙广明
|
833786e128
|
Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.
See merge request easycorp/zentaopms!2305
|
2022-03-16 06:38:40 +00:00 |
|
Zongjun Lan
|
3b66cf35f2
|
* fix bug #20787
|
2022-03-16 14:37:42 +08:00 |
|
liumengyi
|
c859175f5d
|
* Add auto test of bug.
|
2022-03-16 14:37:10 +08:00 |
|
liyang
|
7cef7f13ec
|
update execution test and add usercontact data
|
2022-03-16 14:21:35 +08:00 |
|
王怡栋
|
a7f00ab8db
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-16 14:07:07 +08:00 |
|
王怡栋
|
5dcb56bf35
|
* remove ldap dependent when build rpm and deb.
|
2022-03-16 14:05:58 +08:00 |
|
孙广明
|
c40cc261ec
|
Merge branch 'devops_liyuchun_gitlab' into 'master'
Fix bug #20833
See merge request easycorp/zentaopms!2298
|
2022-03-16 05:40:30 +00:00 |
|
zhujinyong
|
38a53e94df
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-16 13:38:53 +08:00 |
|
zhujinyong
|
56c0ef9064
|
* Fix sql.
|
2022-03-16 13:38:33 +08:00 |
|
liyuchun
|
15e03af077
|
* Fix bug #20833.
|
2022-03-16 13:36:28 +08:00 |
|
liyuchun
|
53dec485b8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-16 13:28:57 +08:00 |
|
王怡栋
|
e187adafd8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-16 13:27:01 +08:00 |
|
王怡栋
|
eac22108fe
|
* code for story #31383.
|
2022-03-16 13:25:44 +08:00 |
|
zhujinyong
|
489be02f3f
|
* Fix review.
|
2022-03-16 12:11:09 +08:00 |
|
孙广明
|
df8fdc5c9c
|
Merge branch 'autotest_denghongtao' into 'master'
update unittest
See merge request easycorp/zentaopms!2289
|
2022-03-16 02:42:04 +00:00 |
|
孙广明
|
88c8d61e5c
|
Merge branch 'sprint/tianshujie_icon' into 'master'
* Fix icon for kanban project.
See merge request easycorp/zentaopms!2291
|
2022-03-16 02:41:23 +00:00 |
|
tianshujie
|
df14bc65ef
|
* Fix icon for kanban project.
|
2022-03-16 10:39:50 +08:00 |
|
denghongtao
|
2a00c3febd
|
change size
|
2022-03-16 10:07:57 +08:00 |
|
denghongtao
|
1bd4bcf1c1
|
update unittest
|
2022-03-16 10:01:30 +08:00 |
|
王怡栋
|
cc6c164063
|
Merge branch 'fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2290
|
2022-03-16 02:00:35 +00:00 |
|
tanghucheng
|
b9542612cb
|
* Fix bug.
|
2022-03-16 09:51:36 +08:00 |
|
denghongtao
|
d18ddc8ebb
|
update unittest
|
2022-03-16 09:42:37 +08:00 |
|
朱金勇
|
8a4bda1fb8
|
Merge branch 'sgm_upgrade' into 'master'
* Change version.
See merge request easycorp/zentaopms!2283
|
2022-03-16 00:40:49 +00:00 |
|
孙广明
|
c498c964ba
|
* Change version.
|
2022-03-16 08:35:21 +08:00 |
|
王怡栋
|
f8b6ae99bb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-15 17:17:49 +08:00 |
|
王怡栋
|
c2e8cea442
|
* adjust code for check update.
|
2022-03-15 17:17:12 +08:00 |
|
孙广明
|
985a3d5d95
|
Merge branch 'autotest_ly' into 'master'
add execution test
See merge request easycorp/zentaopms!2280
|
2022-03-15 09:17:11 +00:00 |
|
liyang
|
0fecbc4834
|
add execution test
|
2022-03-15 17:13:16 +08:00 |
|
孙广明
|
4883fe8444
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add function annotations.
See merge request easycorp/zentaopms!2277
|
2022-03-15 08:58:51 +00:00 |
|
liumengyi
|
d8f9da553f
|
* Add function annotations.
|
2022-03-15 16:54:32 +08:00 |
|
王怡栋
|
092c020b32
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20692
See merge request easycorp/zentaopms!2272
|
2022-03-15 08:42:55 +00:00 |
|
孙广明
|
69c22ecbf3
|
Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20779,20782,20783.
See merge request easycorp/zentaopms!2275
|
2022-03-15 08:34:33 +00:00 |
|
tanghucheng
|
72095bf38a
|
* Fix bug #20803.
|
2022-03-15 16:31:27 +08:00 |
|
tanghucheng
|
88230cd949
|
* Fix bug #20779,20782,20783.
|
2022-03-15 15:49:25 +08:00 |
|
孙广明
|
9d2c1baa9f
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of task.
See merge request easycorp/zentaopms!2274
|
2022-03-15 07:48:07 +00:00 |
|
liumengyi
|
2550fd101c
|
* Add auto test of task.
|
2022-03-15 15:45:02 +08:00 |
|
朱金勇
|
9ae2933c5e
|
Merge branch 'sgm_unittest' into 'master'
Sgm unittest
See merge request easycorp/zentaopms!2273
|
2022-03-15 07:44:47 +00:00 |
|
孙广明
|
69fc328a1e
|
* Code for auto test.
|
2022-03-15 15:41:39 +08:00 |
|
Zongjun Lan
|
114416d345
|
* fix bug #20692
|
2022-03-15 15:36:07 +08:00 |
|
王怡栋
|
2acf7fd44e
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20760,#20761,#20762,#20763
See merge request easycorp/zentaopms!2267
|
2022-03-15 07:24:22 +00:00 |
|
孙广明
|
df49ac6f81
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Change file name to lowercase.
See merge request easycorp/zentaopms!2271
|
2022-03-15 07:16:29 +00:00 |
|
liumengyi
|
33ef68d31b
|
* Change file name to lowercase.
|
2022-03-15 14:58:35 +08:00 |
|
孙广明
|
503e169dbd
|
Merge branch 'sprint/187_hufangzhou_20735' into 'master'
* Fix bug #20735.
See merge request easycorp/zentaopms!2269
|
2022-03-15 06:36:53 +00:00 |
|
王怡栋
|
78de67f523
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-15 14:31:51 +08:00 |
|
hufangzhou
|
0ead3997b7
|
* Fix bug #20735.
|
2022-03-15 14:31:43 +08:00 |
|