Commit Graph

35383 Commits

Author SHA1 Message Date
liyang
dff861e2d1 add doclib data 2022-03-17 17:20:09 +08:00
liyang
33f827522e rm surplus data 2022-03-17 14:03:05 +08:00
liyang
53e1f051bb rm move.sh and runtime.zip 2022-03-17 13:55:51 +08:00
孙广明
a253bc2246 Merge branch 'autotest_ly' into 'master'
update bug story data

See merge request easycorp/zentaopms!2333
2022-03-17 05:47:09 +00:00
liyang
6f7a1d32d4 update bug story data 2022-03-17 13:44:39 +08:00
孙广明
d4105656d1 Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2329
2022-03-17 05:27:55 +00:00
孙广明
808ca1ee66 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2330
2022-03-17 05:27:17 +00:00
liyang
88af905a7a update executon class 2022-03-17 13:25:09 +08:00
liyang
46e54767fb add guest data 2022-03-17 13:23:05 +08:00
liumengyi
d2adc653d4 * Add auto test of bug. 2022-03-17 13:22:35 +08:00
liyang
2431a437de add userview data 2022-03-17 13:16:22 +08:00
孙广明
2a4bbc6261 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2327
2022-03-17 03:16:40 +00:00
liumengyi
455410f3af * Add function annotations. 2022-03-17 11:13:28 +08:00
liumengyi
b0a66982be * Add auto test of bug. 2022-03-17 11:00:52 +08:00
朱金勇
2ae97554eb Merge branch 'sprint/187_hufangzhou_sql' into 'master'
* Fix sql.

See merge request easycorp/zentaopms!2322
2022-03-17 02:07:57 +00:00
hufangzhou
8011a9dc0e * Fix sql. 2022-03-17 10:05:40 +08:00
王怡栋
e865920607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-16 16:46:25 +08:00
王怡栋
69d7749489 * code for welcome block. 2022-03-16 16:35:33 +08:00
朱金勇
dd15735c4f Merge branch 'sgm_upgrade' into 'master'
* Remove unused code.

See merge request easycorp/zentaopms!2312
2022-03-16 07:49:13 +00:00
孙广明
d058c26177 * Remove unused code. 2022-03-16 15:48:03 +08:00
王怡栋
83738dadb6 Merge branch 'sgm_unittest' into 'master'
Sgm unittest

See merge request easycorp/zentaopms!2310
2022-03-16 07:20:59 +00:00
王怡栋
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
孙广明
b9d5745fc7 * Code for unittest. 2022-03-16 15:10:02 +08: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