Commit Graph
1384 Commits
Author SHA1 Message Date
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 34752d2c04 * Modify version judgment logic. 2022-02-24 16:49:56 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
zhouxudong 6a6700b932 * FIx bug #19685. 2022-02-24 13:18:16 +08:00
zhengrunyu c07ca10dd7 *Fix bug 19932 . 2022-02-23 16:39:35 +08:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
songchenxuan 73faff3b7d *Delete and Add langs. 2022-02-18 15:33:58 +08:00
songchenxuan 490c5e397e *Delete lang. 2022-02-18 14:17:48 +08:00
zhengrunyu 22f29fd8d4 *Fix bug 49283 2022-02-18 10:40:09 +08:00
王怡栋 3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +08:00
zhengrunyu 069f009b6d *Finish task 49283 2022-02-17 14:34:11 +08:00
zhujinyong d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tanghucheng 3aa7be4881 * fix bug. 2022-02-15 15:52:57 +08:00
孙广明 9e171958bf Merge branch 'liyuchun_bug_19323' into 'master'
* Fix bug #19323.

See merge request easycorp/zentaopms!1800
2022-02-15 05:27:00 +00:00
liyuchun 0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
zhouxudong b356c5fda0 *Fix bug #19293. 2022-02-14 16:59:47 +08:00
liyuchun 5583b62fc9 Merge branch 'devops21' 2022-02-14 10:20:11 +08:00
liyuchun 42619874a2 * Fix bug #19445. 2022-02-11 14:59:40 +08:00
李玉春 052da8f12b Merge branch 'sprint/fixbug_19294' into 'master'
Sprint/fixbug 19294

See merge request easycorp/zentaopms!1757
2022-02-11 01:22:53 +00:00
周旭东 5ba86b7707 Update execution.zh-cn.css 2022-02-11 01:20:38 +00:00
周旭东 a909b67371 Update execution.en.css 2022-02-11 01:20:25 +00:00
zhouxudong 6ddf3fdc98 *Fix bug #19294. 2022-02-11 08:59:20 +08:00
孙广明 c2f7881b41 Merge branch 'sprint/fixbug_19293' into 'master'
Sprint/fixbug 19293

See merge request easycorp/zentaopms!1733
2022-02-09 05:05:33 +00:00
周旭东 218eab7fa1 Update execution.css 2022-02-09 02:00:31 +00:00
zhouxudong c38b5803a5 *Fix bug #19292. 2022-02-09 09:24:26 +08:00
周旭东 4ec0dc2b9a Update execution.css 2022-02-09 01:13:58 +00:00
zhouxudong 87445eca72 *Fix bug #19293. 2022-02-09 09:10:41 +08:00
zhouxudong b05b565abe *Fix bug #19294. 2022-02-08 17:22:18 +08:00
zhouxin 71cd99f3e3 Fix bugs. 2022-02-07 07:38:08 +00:00
tianshujie 86649bcad9 * Modify the format. 2022-01-24 16:38:52 +08:00
tianshujie 7234d6bc9b * Fix bug #18861. 2022-01-24 16:37:46 +08:00
xieqiyu 93fa4d0468 * Fix bug: click work sort error. 2022-01-19 17:25:20 +08:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +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
liyuchun fbc3d00e7d * Fix bug #18437. 2022-01-18 09:14:41 +08:00
liumengyi 9cea290feb * Fix bug of execution kanban. 2022-01-17 15:26:19 +08:00
liumengyi 39a8882626 * Modify language item. 2022-01-17 14:44:47 +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
孙广明 db0e90f53e Merge branch 'sprint/180_mayue_bug18147,18149' into 'master'
* Fix bug #18147,18149.

See merge request easycorp/zentaopms!1290
2022-01-06 05:55:04 +00:00
tanghucheng b5de7cebfa * Fix bug. 2022-01-06 13:46:58 +08:00
mayue fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
xieqiyu ac110317ee * Fix bug: test task count error. 2022-01-06 13:11:08 +08:00