Commit Graph
411 Commits
Author SHA1 Message Date
sunjun e617dc2b43 sprint_sunjun_54322 2022-05-18 08:23:28 +00:00
sunjun 2193519bed sprint_sunjun_54322 2022-05-18 07:34:20 +00:00
sunjun 6be752163d sprint_sunjun_54322 2022-05-18 05:56:39 +00:00
sunjun 8346601953 sprint_sunjun_54322 2022-05-18 05:07:58 +00:00
孙广明 261ed30d03 Merge branch 'sprint_sunjun_54321' into 'master'
sprint_sunjun_54321

See merge request easycorp/zentaopms!3458
2022-05-18 02:13:38 +00:00
sunjun fca35134b5 sprint_sunjun_54324 2022-05-18 01:42:09 +00:00
sunjun fca85b0bcc sprint_fixbug 2022-05-18 00:59:07 +00:00
sunjun ae9e3b7df4 sprint_sunjun_54327 2022-05-17 13:54:08 +00:00
sunjun 3ce847a623 sprint_sunjun_54326 2022-05-17 13:38:50 +00:00
sunjun d6bf1abf9f sprint_sunjun_54325 2022-05-17 12:47:45 +00:00
sunjun 7ce0103bba sprint_sunjun_54321 2022-05-17 08:59:11 +00:00
zhouxudong cca3f56437 * Finish task #54480. 2022-05-17 07:38:22 +00:00
孙广明 7dfc7c62fe * Code for approval. 2022-05-14 15:14:26 +08:00
wangyidong 8f437f4537 * code for bug #22057. 2022-04-28 10:32:24 +08:00
zhouxudong aaffd2788c * Fix bug from max #16729. 2022-04-22 13:07:10 +08:00
王怡栋 884c145ce2 Merge branch 'fixbug' into 'master'
* Fix bug #21846.

See merge request easycorp/zentaopms!3019
2022-04-21 00:44:21 +00:00
tianshujie 0c55baddc6 * Fix bug #21858. 2022-04-20 10:57:00 +08:00
tianshujie 524a2214ab * Fix the query project name error. 2022-04-19 17:04:56 +08:00
tanghucheng 7ea847db02 * Fix bug #21846. 2022-04-19 15:41:14 +08:00
Zongjun Lan 51337cac92 * fix bug *15336 2022-04-14 11:13:31 +08:00
tanghucheng 3d3ffe9348 * Fix bug #21403,21474,21410,21414,21417,21456. 2022-04-07 15:27:54 +08:00
liyuchun e88a47ea3c * Fix bug #21061. 2022-04-01 15:41:21 +08:00
liyuchun b7d3bea247 * Fix bug #21061. 2022-04-01 10:31:38 +08:00
tanghucheng 08f9c25798 * Fix bug #21177. 2022-03-25 15:58:03 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
Hao Sun aee62254eb * fix $(window).height() value is difference in firefox: avoid to insert js before <!DOCTYPE html>. 2022-03-21 16:03:52 +08:00
tianshujie 34c8489218 * Fix pending review issues. 2022-03-18 15:20:59 +08:00
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
tianshujie af5a97ad40 * Fix bug #20591. 2022-03-11 08:34:54 +08:00
tianshujie d6692b22c1 * Fix bug #20522. 2022-03-09 10:39:45 +08:00
tianshujie fc2bd0bbdc * Fix bug #20307,18089. 2022-03-04 11:00:58 +08:00
tianshujie 6dc0d7a70d * Solve the problem that the project field of the pending task list is 0. 2022-03-04 09:04:02 +08:00
liumengyi fed5f3cb4e * Fix bug #20302. 2022-03-03 15:46:05 +08:00
zhujinyong 04b9fd749d * Fix switch vision. 2022-03-02 08:53:11 +08:00
liumengyi 8dd8c27d38 * Adjust code format. 2022-03-01 14:53:31 +08:00
liumengyi 02e14404c6 * Remove redundant code. 2022-03-01 14:43:15 +08:00
liumengyi 0854d8fe43 * Fix bug #20116. 2022-03-01 14:42:07 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
songchenxuan 73faff3b7d *Delete and Add langs. 2022-02-18 15:33:58 +08:00
王怡栋 3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
xieqiyu 93fa4d0468 * Fix bug: click work sort error. 2022-01-19 17:25:20 +08:00
王怡栋 03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
zhujinyong faff9d3dbd + Switch vision. 2022-01-18 11:50:29 +08:00
tianshujie 947c9586f5 * Finish task #47350. 2022-01-14 15:06:22 +08:00
liumengyi cc3c90291d * Finish task #47483. 2022-01-10 17:32:31 +08:00
zhengrunyu 1f78499a4a *Fix bug for write valiable name. 2022-01-07 10:28:30 +08:00
zhengrunyu 325a57c292 *Code edit and batchedit. 2022-01-07 09:27:39 +08:00
tanghucheng b5de7cebfa * Fix bug. 2022-01-06 13:46:58 +08:00