Commit Graph
395 Commits
Author SHA1 Message Date
孙广明 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
zhengrunyu 7643aa1122 * Fix api. 2022-04-13 16:28:47 +08:00
zhengrunyu 0b793291df * Fix api for active bug. 2022-04-13 15:37:09 +08:00
zhengrunyu 2f1aed748b * Add api for active task. 2022-04-13 14:14:04 +08:00
zhengrunyu d03d8ba2a4 * Add api for record estimate for bug. 2022-04-13 10:48:47 +08:00
zhengrunyu 6676b9a7c2 * Fix api for bug to story. 2022-04-13 09:44:51 +08:00
朱金勇 e1eb543ed7 Merge branch 'app_zry' into 'master'
App zry

See merge request easycorp/zentaopms!2872
2022-04-12 07:28:24 +00:00
zhengrunyu 0909c6602b * Add api for active bug. 2022-04-12 15:25:04 +08:00
zhengrunyu a13a8ce570 * Fix api. 2022-04-12 15:23:31 +08:00
zhengrunyu 581479860a * Fix api . 2022-04-12 15:08:45 +08:00
zhengrunyu 9cb5cb1134 * Add api for resolve bug. 2022-04-12 14:40:48 +08:00
zhengrunyu 7d3a91ab39 * Change function name for getBudgetWithUnit. 2022-04-12 09:53:30 +08:00
zhengrunyu 73642794a1 * Fix api. 2022-04-12 09:39:01 +08:00
zhujinyong 4f8d2791ed * Reset cookie. 2022-04-12 09:12:07 +08:00
zhengrunyu f46d469050 * Finish task 52558. 2022-04-12 09:01:17 +08:00
zhengrunyu 94fa7866c9 * Delete blank. 2022-04-12 08:58:08 +08:00
zhengrunyu fba6ac6a0e * Conversion budget unit. 2022-04-12 08:56:26 +08:00
朱金勇 1547d004d7 Merge branch 'app_zry' into 'master'
* Fix api for review story.

See merge request easycorp/zentaopms!2857
2022-04-11 07:29:38 +00:00
zhengrunyu 83b20ad291 * Fix api for review story. 2022-04-11 13:48:06 +08:00
朱金勇 1518796b03 Merge branch 'app_zry' into 'master'
* Fix bug 21591.

See merge request easycorp/zentaopms!2828
2022-04-08 06:05:36 +00:00