Commit Graph
1295 Commits
Author SHA1 Message Date
王怡栋 fb8ff15c2a Merge branch 'sprint/170_package_bug' 2021-11-25 08:34:16 +08:00
xieqiyu ccb9327c5a * Fix bug#16565. 2021-11-24 10:11:54 +08:00
xieqiyu 35bdfa9376 * Fix bug#16565. 2021-11-23 17:33:10 +08:00
王怡栋 043850220e * adjust for progress. 2021-11-23 10:42:07 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
xieqiyu df71f8ff9e * Fix bug#16545. 2021-11-22 16:17:37 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
王怡栋 d68ce78a66 * code for task #44325. 2021-11-16 14:40:42 +08:00
Hao Sun 9617d52d93 * task #44164, update task list after close modal. 2021-11-11 13:10:12 +08:00
zhengrunyu be094287b6 Finish task #44163. 2021-11-11 11:03:20 +08:00
zhengrunyu d4e0ccdef0 *Finish task #44163. 2021-11-11 10:49:13 +08:00
zhengrunyu e2b3ba1066 *Finish task #44163. 2021-11-11 10:47:02 +08:00
zhengrunyu db4ee8bbf8 *Finish task #44163. 2021-11-11 09:54:10 +08:00
zhengrunyu 411d2429ee Finish task #44157. 2021-11-09 13:55:56 +08:00
zhengrunyu 928784c9a9 Finish task #44157. 2021-11-09 13:52:13 +08:00
zhengrunyu 0f975ee3c4 *Finish task #44157. 2021-11-09 13:48:06 +08:00
zhengrunyu 26ec2238ee *Finish task #43908. 2021-11-08 11:31:46 +08:00
zhengrunyu ea6bcb8b5c *Finish task #43908. 2021-11-08 11:08:56 +08:00
zhengrunyu b18373c7e3 *Finish task #43908. 2021-11-08 10:52:14 +08:00
王怡栋 fce9a155c0 * adjust for js error. 2021-11-05 10:17:24 +08:00
dingna 2dd70ed7e4 * Finish task#43900. 2021-11-03 16:02:06 +08:00
dingna 7b19208c1b * Finish task#43900. 2021-11-03 13:50:07 +08:00
王怡栋 fb17df4424 * add upload file api. 2021-10-28 13:12:33 +08:00
王怡栋 076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
王怡栋 f21be3ec12 * code for task #43341. 2021-10-25 13:53:34 +08:00
王怡栋 95fde8eaca * code task #43342. 2021-10-25 09:49:14 +08:00
王怡栋 fe1f206e3d * adjust for task #43336. 2021-10-20 17:08:30 +08:00
王怡栋 8ca427b1c7 Merge branch 'sprint/167_wangyidong' into sprint/167 2021-10-18 10:26:28 +08:00
王怡栋 375b74b9d6 * adjust for api. 2021-10-18 09:20:10 +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
王怡栋 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
王怡栋 d4c32965e2 * adjust for zui. 2021-10-15 17:20:51 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
hufangzhou b09b80d4e7 * Fix an error: Divide the my bug query condition from bug query condition. 2021-09-17 09:30:11 +08:00
Hao Sun 116e8bab90 * remove unused ajax initialization. 2021-09-15 18:00:11 +08:00
liyuchun 33e1839583 * Fix bug #15121. 2021-09-13 15:01:40 +08:00
Hao Sun ebda4e7a4e * change features modal type to "iframe". 2021-09-13 14:12:28 +08:00
liyuchun 974633de86 * Finish task #42143. 2021-09-09 19:44:03 +08:00
王怡栋 71e494840a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:01:39 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
zenggang f495f058ed * Finish task#42421,42411,42409,42403,42392,42388,42386,42374 2021-09-08 15:31:11 +08:00
zhujinyong 489a87e0ec * Adjust response of api. 2021-09-08 10:40:25 +08:00
xieqiyu 3a30ffec77 * Finish task#42121. 2021-09-06 11:08:50 +08:00
hufangzhou 71624f48b0 * Finish task #42140: Remove the entrance of tutorial. 2021-09-06 10:36:59 +08:00
王怡栋 4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
zenggang 38e4833506 * Adjust my api 2021-09-02 15:19:05 +08:00
zenggang 8d33e803fe * Adjust my api 2021-09-02 14:09:54 +08:00
zenggang 8dddb63e9a * add my api workhour count 2021-09-01 17:29:43 +08:00
liyuchun 3170d8eb24 * Code for task #41764. 2021-09-01 11:33:29 +08:00