Commit Graph
770 Commits
Author SHA1 Message Date
tanghucheng 2d3c8464d3 * Fix bug #20458,20369,20140,20373. 2022-03-09 10:20:46 +08:00
王怡栋 c753960b31 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #50357

See merge request easycorp/zentaopms!2147
2022-03-08 09:19:09 +00:00
Zongjun Lan 12245e26a7 * fix code format 2022-03-08 17:18:05 +08:00
Zongjun Lan b7ba61136e * fix bug 50357 2022-03-08 16:32:29 +08:00
王怡栋 b2aa0be020 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 19010,19464,19496

See merge request easycorp/zentaopms!2112
2022-03-07 07:41:30 +00:00
王怡栋 aa08dd8b07 * fix bug for batch create todo. 2022-03-07 15:01:11 +08:00
Zongjun Lan bbd580c373 * fix bug 19010 2022-03-07 13:44:17 +08:00
tianshujie b8adb47787 * Modify the code logic. 2022-03-04 10:02:52 +08:00
tianshujie 35d1bc80dd * Fix bug #20269. 2022-03-04 09:58:49 +08:00
tianshujie cfb4b274a4 * Fix bug #20170. 2022-03-01 20:06:44 +08:00
tianshujie 59ee1b9038 * Fix bug #19786. 2022-03-01 15:51:11 +08:00
孙广明 25f71e0a51 Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'
# Conflicts:
#   module/task/model.php
2022-02-25 00:41:58 +00:00
liumengyi 9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
王怡栋 189158dabd Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong 2022-02-23 17:01:24 +08:00
王怡栋 f34bce05bf * code for task #49401. 2022-02-23 17:00:55 +08:00
Wenrui LI 11d3afd565 * use actual idvalue name for todo create/edit, bug #19011. 2022-02-23 08:27:02 +08:00
zhujinyong 49af622fd8 * Move exit to return. 2022-02-22 14:25:14 +08:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
zhangzilong 590c56d6fc * Fix bug #18305. 2022-02-08 09:43:38 +08:00
tanghucheng 02fde213b0 * fix bug #18977. 2022-01-27 13:07:00 +08:00
Wenrui LI 91ec8b687b * filter todo by vision, task #47905. 2022-01-25 14:08:31 +08:00
Wenrui LI 30f61c2acc * add vision for todo and tweak todo create to set vision, part of task #47905. 2022-01-25 14:03:24 +08:00
hufangzhou 7cd0246265 * Code for task #47991. 2022-01-24 13:52:49 +08:00
chaideqing 250d944b73 * fix bug #18039,task #47399, show html page when in client create bug/story/task/doc/todo 2022-01-17 14:40:39 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
tanghucheng 8d1e5cd785 * Finish task #43619,43620. 2021-10-29 09:17:57 +08:00
tanghucheng 488c4a8cb2 * Finish task #43619,43620 2021-10-28 13:50:41 +08:00
王怡栋 076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
王怡栋 96bf22be3a * finish task #43339. 2021-10-21 16:43:37 +08:00
王怡栋 5920491ee0 * code for task #43339. 2021-10-21 16:22:43 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
lichengjun b1dfaa21bb * Fix Bug #15200. 2021-09-17 07:14:30 +00:00
tianshujie 441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
tianshujie 3246254d04 * Fix bug #15075. 2021-09-09 15:08:07 +08:00
dingguodong 5b9332cfff * Remove mrapprove from todo type list due to incomplete implementation. 2021-09-09 14:47:27 +08:00
王怡栋 462d61fcf3 * adjust priv and fix bug for view assigned todo. 2021-09-09 10:25:06 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
zenggang d3ffc97d41 * Fix bug#14927 and Finish task#42423,42420,42419 2021-09-08 13:52:53 +08:00
王怡栋 c0bcc61b1e * finish task #42422. 2021-09-08 11:33:25 +08:00
zhujinyong 489a87e0ec * Adjust response of api. 2021-09-08 10:40:25 +08:00
dingguodong 314c3c593e Merge branch 'jihuMR' 2021-09-07 20:47:10 +08:00
zenggang 4ee76f3b82 * Fix bug#14923 2021-09-07 08:57:59 +08:00