Commit Graph
1339 Commits
Author SHA1 Message Date
孙广明 f09c614299 * Add comment. 2022-06-14 09:25:04 +08:00
孙广明 7c7a364102 * Finish task #56635. 2022-06-13 14:28:57 +08:00
孙广明 753a5e557a * Finish task #56635. 2022-06-13 11:11:01 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liumengyi e40d982355 * Fix bug #23290. 2022-06-06 16:15:39 +08:00
xieqiyu d93f2aca36 * Fix bug#23159. 2022-06-06 00:35:16 +08:00
xieqiyu d5f294fd7b * Fix bug#23159. 2022-06-02 04:25:09 +08:00
孙广明 ea678a3736 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23132.

See merge request easycorp/zentaopms!3710
2022-06-02 05:55:29 +00:00
liyuchun 29ceb63023 * Fix bug #23132. 2022-06-02 02:49:27 +00:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
liumengyi 1b89018e2f * Optimized code for task #55684, #55683. 2022-05-31 13:55:59 +08:00
liumengyi 04d79592c4 * Finish task #55684. 2022-05-31 13:44:05 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
王怡栋 276d1b2197 Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570

See merge request easycorp/zentaopms!3477
2022-05-18 05:35:22 +00:00
lanzongjun 867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00
lanzongjun ece8976470 * fix bug #22570 2022-05-18 13:20:43 +08:00
wangyidong cceff98fd5 * Add id for post data. 2022-05-18 10:47:23 +08:00
王怡栋 44d98b2cc3 Merge branch 'sprint/daitingting_flow_addID' into 'master'
* Add id for post data.

See merge request easycorp/zentaopms!3463
2022-05-18 02:44:59 +00:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
daitingting d9ee3c8fdc * Add id for post data. 2022-05-18 01:07:33 +00:00
lanzongjun 10eebbd136 * fix bug #22570 2022-05-17 17:13:17 +08:00
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
mayue 96b422d247 * Fix bug #22411. 2022-05-12 08:41:39 +00:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
liumengyi 78bd314db5 * Fix bug #13255. 2022-04-24 15:50:21 +08:00
mayue 181d0d67de * Fix bug #21948. 2022-04-24 09:58:10 +08:00
mayue 2ed8646488 * Fix bug #21948. 2022-04-24 09:31:14 +08:00
hufangzhou 2dc575a760 * Fix bug #11074. 2022-04-21 14:53:38 +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
周旭东 4e7fcd1ad1 Update model.php 2022-04-13 03:08:48 +00: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
tianshujie a8b051c12b * Fix bug #16527. 2022-04-12 12:58:56 +08:00
孙广明 c7dc63ff11 Merge branch 'master_xieqiyu_18072' into 'master'
* Fix bug#18072.

See merge request easycorp/zentaopms!2852
2022-04-11 09:21:34 +00:00
王怡栋 68085fc030 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2862
2022-04-11 08:00:17 +00:00
tianshujie f1c24db544 * Fix bug #16350. 2022-04-11 14:16:45 +08:00
孙广明 a8674ddc91 * Add testtask test. 2022-04-11 13:52:02 +08:00
xieqiyu 4ff65cf031 * Fix bug#18072. 2022-04-11 13:18:41 +08:00
孙广明 9d8df16da8 * Add testtask. 2022-04-09 15:58:16 +08:00
zhouxudong d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +08:00