Commit Graph
38321 Commits
Author SHA1 Message Date
宋辰轩 08dcf36583 * Modify testcase. 2022-05-16 09:14:37 +08:00
宋辰轩 b21e8bf480 * Modify. 2022-05-10 15:21:06 +08:00
liyuchun 01344d05b9 Merge branch 'sprint/scx_testcase' of https://gitlab.zcorp.cc/easycorp/zentaopms into scx_testcase 2022-05-09 07:43:25 +00:00
liyuchun e74e7c90a1 * Add unitcase. 2022-05-09 07:43:07 +00:00
宋辰轩 603ee02060 * Add testcase. 2022-05-07 17:20:29 +08:00
宋辰轩 1aec2a21cd * Add testcase. 2022-05-07 15:39:22 +08:00
宋辰轩 4fcdc3c728 * Add testcase. 2022-05-07 14:32:04 +08:00
= 35cd9dd288 * Publishlib and updatestruct testcase. 2022-05-07 10:38:10 +08:00
= deaa482c0a * CreateStructTest. 2022-05-06 17:25:09 +08:00
= dc5ba2d895 * Module/api testcase. 2022-05-06 16:04:07 +08:00
孙广明 8fbb2fe0ed Merge branch 'autotest_ly' into 'master'
add data

See merge request easycorp/zentaopms!3240
2022-05-06 02:03:50 +00:00
liyang a41eec6f7d add data 2022-05-06 10:03:06 +08:00
孙广明 f48b5c4e6f Merge branch 'autotest_ly' into 'master'
add data

See merge request easycorp/zentaopms!3239
2022-05-06 01:54:36 +00:00
liyang 837cd364c7 add data 2022-05-06 09:53:31 +08:00
孙广明 5d05c728fd Merge branch 'mayue_add_group' into 'master'
* Add group module.

See merge request easycorp/zentaopms!3238
2022-05-06 01:48:53 +00:00
mayue d5ca6ae34c * Add group module. 2022-05-06 01:45:38 +00:00
孙广明 a80c84d468 Merge branch 'autotest_ly' into 'master'
add holiday data

See merge request easycorp/zentaopms!3237
2022-05-06 00:56:31 +00:00
liyang 000ee1b332 add holiday data 2022-05-06 08:55:07 +08:00
朱金勇 9ff9ea7891 Merge branch 'autotest_wangxiaomeng' into 'master'
init weekly

See merge request easycorp/zentaopms!3236
2022-05-06 00:15:37 +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
hufangzhou bb3587b65b * Fix bug #22153. 2022-05-05 17:33:46 +08:00
wangxiaomeng a3e9eb2de0 init weekly 2022-05-05 17:30:53 +08:00
孙广明 07dc4c4055 Merge branch 'api_zry' into 'master'
* Fix bug 22061.

See merge request easycorp/zentaopms!3234
2022-05-05 08:22:46 +00:00
zhengrunyu e7699d04f1 * Fix bug 22061. 2022-05-05 16:19:48 +08:00
孙广明 a4db4d1916 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of batch create story in kanban with upload images.

See merge request easycorp/zentaopms!3231
2022-05-05 07:41:08 +00:00
孙广明 37e51fcf28 Merge branch 'sprint/tianshujie_bug22146' into 'master'
* Fix bug #22146.

See merge request easycorp/zentaopms!3233
2022-05-05 06:26:19 +00:00
tianshujie 93e05ff8c7 * Fix bug #22146. 2022-05-05 14:24:33 +08:00
xieqiyu 88f641e2a7 * Append build branch when project unlink this branch. 2022-05-05 13:49:05 +08:00
孙广明 43fb12acfc Merge branch 'mayue_fix_bug#22148' into 'master'
* Fix bug #22148.

See merge request easycorp/zentaopms!3232
2022-05-05 05:45:44 +00:00
mayue 0552260277 * Fix bug #22148. 2022-05-05 05:43:52 +00:00
xieqiyu 971579ab22 * Fix bug of batch create story in kanban with upload images. 2022-05-05 13:31:59 +08:00
孙广明 ce4e16819d Merge branch 'master_xieqiyu_22144' into 'master'
* Fix bug#22144.

See merge request easycorp/zentaopms!3230
2022-05-05 03:20:05 +00:00
xieqiyu 0946351076 * Fix bug#22144. 2022-05-05 11:17:45 +08:00
孙广明 eafc0916a6 Merge branch 'sprint/tianshujie_bug22139' into 'master'
* Fix bug #22139.

See merge request easycorp/zentaopms!3229
2022-05-05 02:11:36 +00:00
tianshujie 025fc5b0b0 * Fix bug #22139. 2022-05-05 10:09:40 +08:00
孙广明 d0ef8f574c Merge branch 'sprint/scx_feedbackclose' into 'master'
* Close feedback api.

See merge request easycorp/zentaopms!3226
2022-04-29 08:53:24 +00:00
李玉春 71a2c032f5 Merge branch 'cyy_1914' into 'master'
* Fix bug #1914.

See merge request easycorp/zentaopms!3228
2022-04-29 08:51:06 +00:00
caoyanyi 614329cbe8 * Fix bug #1914. 2022-04-29 16:44:59 +08:00
朱金勇 fa9e263bce Merge branch 'sprint/sunhao/bug16382' into 'master'
* bug #16382, fix position for #notifyEmailLabel.

See merge request easycorp/zentaopms!3227
2022-04-29 08:43:24 +00:00
Hao Sun f46b84446e * bug #16382, fix position for #notifyEmailLabel. 2022-04-29 16:39:08 +08:00
= 7d106cf4d3 * Close feedback api. 2022-04-29 16:38:10 +08:00
zhujinyong 342667de6c Merge branch 'api_zry' 2022-04-29 16:36:25 +08:00
zhengrunyu b2f1929673 * Delete black. 2022-04-29 16:02:35 +08:00
zhengrunyu 15d243767d * Fix api. 2022-04-29 15:56:01 +08:00
李玉春 eea036c1ee Merge branch 'sprint/sunhao/bug20570' into 'master'
* update zui.js, fix js error in ie 11.

See merge request easycorp/zentaopms!3224
2022-04-29 07:37:55 +00:00
李玉春 83b9cf3de8 Merge branch 'sprint/sunhao/kindeditor' into 'master'
* update kindeditor.

See merge request easycorp/zentaopms!3223
2022-04-29 07:37:40 +00:00
李玉春 452f40d2fc Merge branch 'devops_zg' into 'master'
Fix refresh jump to other branches

See merge request easycorp/zentaopms!3212
2022-04-29 07:29:50 +00:00
Hao Sun 6dba3bc41c * update zui.js, fix js error in ie 11. 2022-04-29 15:24:23 +08:00
Hao Sun db9b293ea0 * update kindeditor. 2022-04-29 15:23:03 +08:00
孙广明 234baf4594 Merge branch 'liyuchun_fixbug_22098' into 'master'
* Fix bug #21887.

See merge request easycorp/zentaopms!3222
2022-04-29 07:12:02 +00:00