Commit Graph
802 Commits
Author SHA1 Message Date
tianshujie 025fc5b0b0 * Fix bug #22139. 2022-05-05 10:09:40 +08:00
liumengyi 69cac92d99 * Fix bug #14472. 2022-04-28 11:26:06 +08:00
tianshujie f5d69d5c30 * Fix bug #12154. 2022-04-26 11:14:54 +08:00
xieqiyu f5a269af8a * Fix bug#1736. 2022-04-24 10:48:14 +08:00
zenggang 0ef2e99bca * Fix bug#21876 2022-04-22 02:29:51 +00:00
xieqiyu 4abb324459 * Fix bug#21896. 2022-04-21 16:46:09 +08:00
sunjun d2325e9b93 *Fixbug_sunjun_21811 2022-04-20 16:05:26 +08:00
李玉春 e13aed8c7c Merge branch 'fixbug_sunjun_19262' into 'master'
*Fixbug_sunjun_19262

See merge request easycorp/zentaopms!2985
2022-04-18 07:52:30 +00:00
sunjun 0aa9ee7db1 *Fixbug_sunjun_19262 2022-04-18 14:21:57 +08:00
sunjun efb1b2eee2 *Fixbug_sunjun_19262 2022-04-18 14:16:04 +08:00
sunjun ccca03fb97 *Fixbug_sunjun_qijian 2022-04-16 22:52:43 +08:00
sunjun db0fd23155 *Fixbug_sunjun_qijian 2022-04-16 22:46:42 +08:00
zhouxudong e6ceaf1201 * Fix bug #17353. 2022-04-15 09:05:10 +08:00
zhouxudong 40aaa97681 * Fix bug #17353. 2022-04-14 17:05:38 +08:00
zhouxudong 7fe4729a58 * Fix bug #17353. 2022-04-14 16:58:37 +08:00
sunjun 38aa249dac *Fixbug_sunjun#21630 2022-04-14 13:08:59 +08:00
王怡栋 a8983445c8 Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
#   module/bug/model.php
#   module/task/model.php
2022-04-13 07:52:03 +00:00
周旭东 e9e20ffae0 Update control.php 2022-04-13 07:24:55 +00:00
zhouxudong dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
zhouxudong 37337bdb68 * Fix bug #17994. 2022-04-13 10:59:25 +08:00
zhouxudong 19f499e121 * Fix bug #17994. 2022-04-13 10:36:39 +08:00
zhouxudong 1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
zhouxudong 233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
zenggang 654da8565f * Fix bug#21649,21512 2022-04-12 03:15:39 +00:00
xieqiyu 7892d031e4 * Fix bug#21468. 2022-04-07 11:18:58 +08:00
孙广明 1c8f929a0d Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #13324.

See merge request easycorp/zentaopms!2684
2022-04-02 06:49:30 +00:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
liyuchun 4240b563c9 * Fix bug #21061. 2022-04-01 10:27:27 +08:00
Zongjun Lan bbea31bd09 * fix bug #20256 2022-04-01 10:01:48 +08:00
Zongjun Lan 733cbedc1e * fix bug #21005 2022-03-25 14:26:17 +08:00
hufangzhou 57bbeeddd7 * Remove the unused code. 2022-03-10 11:01:21 +08:00
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