Commit Graph
28381 Commits
Author SHA1 Message Date
hufangzhou e5d8340402 * Add the upgrade sql in upgrade module. 2021-10-19 13:48:28 +08:00
zhujinyong 68e738fdd7 * Reformat code style. 2021-10-19 13:21:22 +08:00
zhujinyong 64af527b27 * Adjust code for api. 2021-10-19 12:11:43 +08:00
李玉春 a11155b1db Merge branch 'sprint/167_sgm_apitest' into 'sprint/167'
* Add insert user test.

See merge request easycorp/zentaopms!89
2021-10-19 03:56:56 +00:00
王怡栋 6ee64dffe7 Merge branch 'api_doc' into sprint/167 2021-10-19 11:36:19 +08:00
孙广明 eea0631507 * Add insert user test. 2021-10-19 11:03:44 +08:00
zhujinyong 4bb27b624e * Adjust code for Api doc. 2021-10-19 11:00:55 +08:00
王怡栋 57fcb19976 Merge branch 'sprint/167_sgm_apitest' into 'sprint/167'
* Fix story bug and add user test.

See merge request easycorp/zentaopms!88
2021-10-19 01:46:51 +00:00
孙广明 27086797f3 * Fix story bug and add user test. 2021-10-19 08:54:24 +08:00
李玉春 310190aeb9 Merge branch 'sprint/167_mayue_15506' into 'sprint/167'
Sprint/167 mayue 15506

See merge request easycorp/zentaopms!87
2021-10-18 09:32:25 +00:00
mayue d506cba4a5 *Fix bug #15506. 2021-10-18 17:17:13 +08:00
xiawenlong e667a33996 fix English language. 2021-10-18 17:14:18 +08:00
mayue 1bfd0b0b62 * Fix bug #15506. 2021-10-18 16:55:50 +08:00
xiawenlong d7166c8bc1 fix code style. 2021-10-18 16:46:08 +08:00
xiawenlong 90a357a980 finish api release manage. 2021-10-18 16:42:38 +08:00
李玉春 68c2d64f67 Merge branch 'sprint/167_xieqiyu_15561' into 'sprint/167'
* Fix bug#15561.

See merge request easycorp/zentaopms!86
2021-10-18 08:39:46 +00:00
xieqiyu e9b614a72b * Fix bug#15561. 2021-10-18 16:37:36 +08:00
王怡栋 7f1f5c8993 Merge branch 'sprint/167_hufangzhou_15557' into 'sprint/167'
* Fix bug #15557.

See merge request easycorp/zentaopms!85
2021-10-18 08:35:14 +00:00
hufangzhou cf3654bd0d * Modify the variable name. 2021-10-18 16:34:33 +08:00
hufangzhou 20fbf2436c * Modify the variable name. 2021-10-18 16:32:31 +08:00
hufangzhou 5691e39633 * Fix bug #15557. 2021-10-18 16:27:36 +08:00
xiawenlong e1bed5bc55 finish api release. 2021-10-18 16:13:46 +08:00
王怡栋 352ec4d0b4 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-18 16:04:22 +08:00
王怡栋 775f9942d2 * fix bug #15553. 2021-10-18 16:03:42 +08:00
王怡栋 d8ac3d1950 Merge branch 'sprint/167_hufangzhou_package' into 'sprint/167'
* Check the code for upgrade.

See merge request easycorp/zentaopms!84
2021-10-18 05:14:44 +00:00
hufangzhou c4824ba3d7 * Check the code for upgrade. 2021-10-18 13:11:07 +08:00
孙广明 7dae5e88f5 Merge branch 'sprint/167_liyuchun_15541' into 'sprint/167'
* Fix bug #15541.

See merge request easycorp/zentaopms!82
2021-10-18 02:58:03 +00:00
liyuchun 672598aada * Fix bug #15541. 2021-10-18 10:39:15 +08:00
孙广明 66b80ac558 Merge branch 'sprint/167_liyuchun_15541' into 'sprint/167'
Sprint/167 liyuchun 15541

See merge request easycorp/zentaopms!81
2021-10-18 02:32:29 +00:00
liyuchun fac2119507 * Fix bug #15541. 2021-10-18 10:28:47 +08:00
王怡栋 8ca427b1c7 Merge branch 'sprint/167_wangyidong' into sprint/167 2021-10-18 10:26:28 +08:00
王怡栋 06f6d31579 * add my bug data for api. 2021-10-18 10:24:28 +08:00
liyuchun c8fe1f5e14 * Fix bug #15541. 2021-10-18 10:21:08 +08:00
王怡栋 e5dc2e2f59 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-18 10:20:31 +08:00
王怡栋 621eecf52c * adjust for execution action list. 2021-10-18 10:18:40 +08:00
zhujinyong abc5c4a302 * Fix code error. 2021-10-18 09:20:56 +08:00
王怡栋 375b74b9d6 * adjust for api. 2021-10-18 09:20:10 +08:00
zhujinyong 7ec9315a9b Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-18 09:18:48 +08:00
zhujinyong 4fe24e06a5 + Add test for api. 2021-10-18 09:18:19 +08:00
李玉春 1ee2b61d95 Merge branch 'sprint/167_xieqiyu_15457' into 'sprint/167'
* Fix bug#15457.

See merge request easycorp/zentaopms!78
2021-10-18 01:17:58 +00:00
liyuchun e3291b0e2a * Fix bug #15541. 2021-10-18 09:07:11 +08:00
王怡栋 72c92b6b0d * fix error. 2021-10-18 09:06:48 +08:00
王怡栋 5e0ac98809 Merge branch 'sprint/167_wangyidong' into sprint/167 2021-10-18 08:53:30 +08:00
王怡栋 351b07352b Merge branch '15.6' into sprint/167 2021-10-18 08:53:13 +08:00
王怡栋 68cd0eb2f9 Merge branch '15.6' into sprint/167_wangyidong 2021-10-18 08:44:13 +08:00
xieqiyu 3e8e0dbcce * Fix bug#15457. 2021-10-16 15:32:13 +08:00
xieqiyu 21ad4ecf0a * Code for bug#15543.Modify the consumed hours of the project in the block. 2021-10-16 08:27:28 +08:00
王怡栋 d4c32965e2 * adjust for zui. 2021-10-15 17:20:51 +08:00
朱金勇 2864a8301c Merge branch 'sprint/167_sunhao/task43181' into 'sprint/167'
* Task #43181, bug #15371, fix nest toggle in program table not work when...

See merge request easycorp/zentaopms!77
2021-10-15 09:03:35 +00:00
Hao Sun 1fbf34f9bc * Task #43181, bug #15371, fix nest toggle in program table not work when close program dialog first time. 2021-10-15 15:31:30 +08:00