Commit Graph
38330 Commits
Author SHA1 Message Date
xieqiyu b2c5366ee5 * Add unit test of search module. 2022-05-14 04:47:58 +08:00
xieqiyu e0a74354c5 * Delete unsed file. 2022-05-13 03:03:44 +08:00
xieqiyu 672b576ffa * Add search module test. 2022-05-10 09:09:15 +08:00
孙广明 5a40e3ad3c Merge branch 'sprint/hufangzhou_package' into 'master'
* Fix an error for 15 version upgrading.

See merge request easycorp/zentaopms!3249
2022-05-06 06:45:40 +00:00
hufangzhou 7833ed1ceb * Fix an error for 15 version upgrading. 2022-05-06 14:44:22 +08:00
孙广明 8e01d7111e Merge branch 'sunhuawei_group_getByIDTest' into 'master'
*Test group getByID.

See merge request easycorp/zentaopms!3247
2022-05-06 06:01:12 +00:00
孙广明 547a9a8862 Merge branch 'sunhuawei_test_group_getByAccount' into 'master'
*Test group getByAccount.

See merge request easycorp/zentaopms!3245
2022-05-06 06:01:03 +00:00
孙华伟 3a8165f775 Update getbyaccount.php 2022-05-06 06:00:21 +00:00
孙华伟 221e427e27 Update getbyid.php 2022-05-06 05:57:43 +00:00
孙广明 1d1facfd44 Merge branch 'mayue_autotest' into 'master'
* mayue.

See merge request easycorp/zentaopms!3244
2022-05-06 05:55:07 +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
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
孙华伟 19835d835a *Test group getByAccount. 2022-05-06 13:48:14 +08:00
mayue 3d3f0708a3 * mayue. 2022-05-06 05:48:05 +00:00
孙广明 7770df9e3c Merge branch 'mayue_autotest' into 'master'
* Add unit test for create.

See merge request easycorp/zentaopms!3243
2022-05-06 05:28:46 +00:00
mayue ba6e411dd4 * Add unit test for create. 2022-05-06 05:24:46 +00:00
孙华伟 7356711ab0 *Test group getByID. 2022-05-06 11:13:10 +08:00
孙广明 32febfd349 Merge branch 'autotest_ly' into 'master'
Add weeklyreport data

See merge request easycorp/zentaopms!3242
2022-05-06 02:35:23 +00:00
liyang 074b91ff76 Add weeklyreport data 2022-05-06 10:34:20 +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