Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
35,098 Commits 2 Branches 292 Tags
e80534e80a8f1cb985652d9550eaaa34b6bbf9f4
Commit Graph
1400 Commits
Author SHA1 Message Date
tianshujie eab4c059a3 * Finish task #50388. 2022-03-09 16:02:00 +08:00
tianshujie d6692b22c1 * Fix bug #20522. 2022-03-09 10:39:45 +08:00
tianshujie e1dd273c3c * Modify the add contact popup style. 2022-03-09 08:49:13 +08:00
liumengyi 92c6de35f0 * Finish task #50324. 2022-03-07 14:27:50 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
liumengyi 0ca866ed99 * Fix bug #50325. 2022-03-07 09:37:42 +08:00
tianshujie 5b5213c761 * Fix bug #20301. 2022-03-04 13:21:09 +08:00
tianshujie ae154aea0c * Modify the code logic. 2022-03-04 11:18:03 +08:00
tianshujie fc2bd0bbdc * Fix bug #20307,18089. 2022-03-04 11:00:58 +08:00
孙广明 43b873f7ae Merge branch 'sprint/186_tianshujie_upgrade' into 'master' 
* Adjust the project field of the zt_task.

See merge request easycorp/zentaopms!2065
 2022-03-04 02:40:52 +00:00
liumengyi f82ba22467 * Fix bug #20314. 2022-03-04 09:33:00 +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
liumengyi f1835c9662 * Fix bug #20142. 2022-03-02 13:19:02 +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
zhengrunyu 62699ca48d * Finish task 49294 . 2022-02-28 15:51:59 +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