Commit Graph
1025 Commits
Author SHA1 Message Date
tianshujie c52fc59335 * Fix bug #25072. 2022-07-13 11:26:59 +08:00
zhouxudong 951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
liumengyi ef6ffd019b * Fix bug of task #59480, #59481. 2022-07-07 15:46:36 +08:00
liumengyi ecdd330102 * Fix bug of task #59480,#59481. 2022-07-07 14:41:10 +08:00
liumengyi e709c4bbda * Finish task #59480, #59481. 2022-07-07 14:12:45 +08:00
liyuchun 9771037534 * Fix bug #24312. 2022-07-01 00:42:44 +00:00
孙广明 3cac1a020c * Refactor action getDynamic. 2022-06-28 15:02:19 +08:00
王怡栋 1c45032e88 Merge branch 'sprint/208_tianshujie_58560' into 'master'
* Finish task #58560.

See merge request easycorp/zentaopms!4174
2022-06-28 03:28:15 +00:00
tianshujie 26f37ec09c * Finish task #58560. 2022-06-27 15:38:33 +08:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
tianshujie a974f333d2 * Modify Edit logic for switching program. 2022-06-17 11:46:43 +08:00
tianshujie a2421b85bb * Modify Edit logic for switching program. 2022-06-17 11:37:40 +08:00
王怡栋 8eb32c3062 Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23832.

See merge request easycorp/zentaopms!3979
2022-06-16 08:59:06 +00:00
wangyidong 048c5e362e * adjust for project batchedit menu. 2022-06-16 15:51:06 +08:00
tanghucheng ab9657abf9 * Fix bug #23832. 2022-06-16 13:49:10 +08:00
孙广明 6656dd71a5 Merge branch 'sprint_204_57093' into 'master'
Sprint 204 57093

See merge request easycorp/zentaopms!3919
2022-06-15 03:09:10 +00:00
sunjun 74726de8c1 sprint_204_57093 2022-06-14 06:48:24 +00:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
王怡栋 fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
zenggang 14ea5d8273 * Adjust code 2022-06-08 09:20:00 +00:00
zenggang 9549b91f83 * Adjust code 2022-06-08 09:13:48 +00:00
zenggang 6471116e48 * Finish task#56544 2022-06-08 06:25:13 +00:00
xieqiyu 86561ba4ca * Code for task#56393,#56390,#56389. 2022-06-08 10:15:01 +08:00
tanghucheng f3a1f7cf2a * Fix bug #23114. 2022-05-31 16:47:13 +08:00
lanzongjun 5eb84a81d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_package_lanzongjun 2022-05-25 09:45:32 +08:00
lanzongjun ae45c26343 * fix bug #54947 2022-05-25 09:45:13 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
王怡栋 e093aac4ca Merge branch 'sprint/master_zhouxudong_54477' into 'master'
Sprint/master zhouxudong 54477

See merge request easycorp/zentaopms!3541
2022-05-20 06:07:46 +00:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
xieqiyu 0cdfceebc9 * Code for task#54477. 2022-05-18 17:11:09 +08:00
zhouxin c5be32065d * Fix bug. 2022-05-18 07:50:26 +00:00
zhouxin 094db2e505 * Adjust code. 2022-05-18 07:39:05 +00:00
zhouxin 5ef4782e82 * Finish task #54351. 2022-05-18 07:31:45 +00:00
zhouxudong 50b39ac2d5 * Finish task #54477. 2022-05-18 03:13:21 +00:00
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
wangyidong aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00
李玉春 70fcf381cf Merge branch 'sunhuawei_fixbug_22365' into 'master'
Sunhuawei fixbug 22365

See merge request easycorp/zentaopms!3352
2022-05-12 05:33:28 +00:00
孙华伟 6c2b318da4 *Optimize the code. 2022-05-12 13:21:44 +08:00
孙广明 a770924dcf Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
#   module/project/model.php
2022-05-12 05:01:42 +00:00
孙华伟 0695047d20 *Finish task #53659. 2022-05-11 15:40:59 +08:00
mayue d560f6d2ab * Finish task #53652. 2022-05-11 05:38:29 +00:00
孙华伟 4464536c1f Update control.php 2022-04-19 07:34:10 +00:00
孙华伟 bce4e3267b * Fix bug #18898. 2022-04-19 15:27:58 +08:00
caoyanyi b27e1f76d7 * Modify field name. 2022-04-18 10:06:35 +08:00
caoyanyi e98d1ac4ab * Fix bug #21763. 2022-04-18 10:03:47 +08:00
王怡栋 4f5529867b * code for bug #20933. 2022-04-06 13:13:29 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
tianshujie 7407aabc00 * Fix bug #19104. 2022-04-01 14:32:00 +08:00