Commit Graph
414 Commits
Author SHA1 Message Date
zhujinyong f97bb8f1b5 + Fix api: parent field of project. 2022-05-16 10:02:05 +08:00
宋辰轩 8197fa9ac1 * Fix bug #22261. 2022-05-12 17:12:15 +08:00
宋辰轩 9248c49b0e * Fix feedback adminView bug . 2022-05-09 10:41:54 +08:00
= 23c0bc9140 * Delete method. 2022-05-06 10:52:54 +08:00
= 678effdb62 * Fix feedback bug. 2022-05-06 10:22:03 +08:00
= 744ea69809 * Fix feedback modulePath bug. 2022-05-06 09:19:01 +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
孙广明 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
= 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
孙广明 ef62cf94aa Merge branch 'sprint/scx_feedbackassign' into 'master'
* Feedback assign api.

See merge request easycorp/zentaopms!3220
2022-04-29 07:11:21 +00:00
= 0e372e50b7 * Feedback assign api. 2022-04-29 14:35:28 +08:00
= 8349bfa5cf * Add $bug->productStatus, fix bug #21375. 2022-04-29 13:43:43 +08:00
= af8a97cf59 * Edit feedback api. 2022-04-29 10:42:26 +08:00
zhujinyong e7df5d8a5f Merge branch 'api_zry' 2022-04-29 08:52:34 +08:00
zhengrunyu 403d1099f7 * Add api for feedback. 2022-04-29 08:43:03 +08:00
孙广明 919ba2de2d Merge branch 'sprint/scx_feedbackapi' into 'master'
* Feedback post api and fix taskassign api bug.

See merge request easycorp/zentaopms!3193
2022-04-28 07:39:20 +00:00
= 24ae72739f * Feedback post api and fix taskassign api bug. 2022-04-28 15:29:27 +08:00
孙广明 950c04080c Merge branch 'api_zry' into 'master'
Api zry

See merge request easycorp/zentaopms!3173
2022-04-28 02:53:11 +00:00
= c5c2362da7 * Add story->productStatus. 2022-04-28 10:26:06 +08:00
zhengrunyu aae6c0c378 * Delete api. 2022-04-28 09:55:35 +08:00
zhengrunyu 5daa800c2c * Fix api for limit. 2022-04-28 09:41:35 +08:00
孙广明 d3f34c1748 Merge branch 'sprint/scx_settingapi' into 'master'
* Add bug->productStatus and task->executionStatus .

See merge request easycorp/zentaopms!3169
2022-04-27 08:43:18 +00:00
= a2f3cfc2da * Add bug->productStatus and task->executionStatus . 2022-04-27 16:37:39 +08:00
朱金勇 8b4e68b5a4 Merge branch 'api_zry' into 'master'
Api zry

See merge request easycorp/zentaopms!3159
2022-04-27 08:19:56 +00:00
zhengrunyu 00dda5315a * Change function name. 2022-04-27 16:17:08 +08:00
zhengrunyu 6f18ae83c2 * Add model function to static. 2022-04-27 15:01:46 +08:00
孙广明 056e9c9fd9 Merge branch 'sprint/scx_feedbackapi' into 'master'
* Feedback api.

See merge request easycorp/zentaopms!3133
2022-04-26 07:18:07 +00:00
朱金勇 91e055a713 Merge branch 'api_zry' into 'master'
Api zry

See merge request easycorp/zentaopms!3131
2022-04-26 07:09:18 +00:00
= 2fe95ae659 * Feedback api. 2022-04-26 15:06:22 +08:00
= 928149db30 * Feedback api. 2022-04-26 14:50:30 +08:00
zhengrunyu d288ef5b11 * Fix api for stories limit. 2022-04-26 14:45:40 +08:00
zhengrunyu 5e6290cda4 * Fix api for chartdata. 2022-04-26 14:40:32 +08:00
wangyidong c2f6b3220a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-24 16:08:55 +08:00
wangyidong a7bc51b608 * code bug #18835. 2022-04-24 16:08:28 +08:00
zhengrunyu 94d4a6acd9 * Fix param. 2022-04-24 16:05:21 +08:00
zhengrunyu bc86b34e6d * Delete black. 2022-04-24 16:00:55 +08:00
zhengrunyu 0001e7b16b * Fix bug 21319. 2022-04-24 15:58:25 +08:00
zhengrunyu 24530f75ca * When create story can choise parent story. 2022-04-24 08:40:45 +08:00
caoyanyi f181738957 * Fix bug #21898. 2022-04-22 01:33:55 +00:00
孙广明 951fd2c19f Merge branch 'zry_app' into 'master'
* Fix api for story USR.

See merge request easycorp/zentaopms!3056
2022-04-21 09:21:33 +00:00
zhengrunyu 48ffd99733 * Fix api for story USR. 2022-04-21 14:38:38 +08:00
songchenxuan efcc54d604 * Fix bug #21677. 2022-04-20 17:15:53 +08:00
zhengrunyu 406ba944eb * Fix bug 21561. 2022-04-20 13:38:22 +08:00
zhujinyong 2f3f356790 * Fix product param. 2022-04-19 08:36:02 +08:00
朱金勇 fcb09f3afe Merge branch 'sprint/scx_file' into 'master'
* Fix json_decode twice image data(url) not found.

See merge request easycorp/zentaopms!2926
2022-04-14 02:17:25 +00:00
songchenxuan 7de520a748 * Fix json_decode twice image data(url) not found. 2022-04-14 09:18:12 +08:00