Commit Graph
293 Commits
Author SHA1 Message Date
zhouxudong 26a57e00cd * Fix bug #23543 #23434 #23427 #23419. 2022-06-13 04:24:33 +00:00
zhouxudong 94c8b0a523 * Finish task #56374. 2022-06-10 01:32:52 +00:00
王怡栋 a9981b0a33 Merge branch 'master' into 'sprint/201_tianshujie_56469'
# Conflicts:
#   module/execution/control.php
#   module/execution/js/kanban.js
#   module/kanban/control.php
#   module/kanban/model.php
2022-06-10 01:05:39 +00:00
liumengyi a5d2a87fdf * Finish task #56469. 2022-06-09 17:33:46 +08:00
王怡栋 c9a29bb420 Merge branch 'master' into 'sprint200_leiyong_task_56384'
# Conflicts:
#   module/kanban/view/space.html.php
2022-06-09 07:40:03 +00:00
leiyong 1b511cac59 * Handling html tags. 2022-06-09 07:33:00 +00:00
王怡栋 ad0ebf0aa1 Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
#   module/execution/js/kanban.js
2022-06-09 07:24:23 +00:00
liumengyi 63717f4fd0 * Fix bug of task #56454. 2022-06-09 15:18:56 +08:00
leiyong aec5b3612e * Finish task#56384. 2022-06-09 06:23:50 +00:00
leiyong 38a7d7334a * Fix bug#23481,bug#23466. 2022-06-09 03:42:53 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tianshujie aec74869fe * Finish task #55675. 2022-06-01 14:47:21 +08:00
tianshujie 7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
tianshujie 2fb1cc0032 * Finish task #55675. 2022-06-01 10:57:07 +08:00
tianshujie 0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
sunjun 2219a42fa2 fixbug_sunjun_194 2022-05-25 05:09:51 +00:00
李玉春 ed24d92ae2 Merge branch 'master' into 'sprint_sunjun_29766'
# Conflicts:
#   module/kanban/config.php
2022-05-25 02:27:08 +00:00
sunjun 45a511df33 sprint_sunjun_29766 2022-05-24 07:16:14 +00:00
sunjun 5590973533 sprint_sunjun_29766 2022-05-24 07:03:03 +00:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
tianshujie 3b98d078af * Fix bug #22595. 2022-05-20 08:17:06 +08:00
李玉春 282f694f17 Merge branch 'sprint/191_tianshujie_54391' into 'master'
Sprint/191 tianshujie 54391

See merge request easycorp/zentaopms!3453
2022-05-18 00:53:44 +00:00
tianshujie 738ec653cb * Finish task #54391. 2022-05-17 15:17:06 +08:00
tianshujie e2e88e4952 * Finish task #54391. 2022-05-17 14:53:43 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
孙广明 887657308a Merge branch 'sprint/189_liumengyi_53663' into 'master'
* Finish task #53663.

See merge request easycorp/zentaopms!3311
2022-05-10 09:23:24 +00:00
tianshujie 5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
liumengyi 987edcc3cf * Finish task #53663. 2022-05-10 16:29:56 +08:00
liumengyi c5ee9d9873 * Finish task #53663. 2022-05-10 15:35:32 +08:00
tianshujie 4e2de99018 * Stages of updating trunk stories. 2022-05-10 14:25:01 +08:00
tianshujie c3fdb74a24 * Finish task #53668. 2022-05-10 10:12:48 +08:00
tianshujie c00b2a9cc6 * Fix bug #21638. 2022-04-11 15:41:09 +08:00
Zongjun Lan 1542533e44 * fix bug #21455#21413 2022-04-02 14:36:13 +08:00
tianshujie 5e7034e5c1 * Fix bug #20653. 2022-03-23 14:11:25 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
Zongjun Lan 2af12a5c0d * fix bug #20905 2022-03-18 10:12:06 +08:00
Zongjun Lan 4c8a7a3eae * fix bug #20905 2022-03-18 10:11:22 +08:00
Zongjun Lan 2435d84cdc * fix bug #20905 2022-03-18 10:06:04 +08:00
Zongjun Lan 9a53b1d0fe * fix bug #20905 2022-03-18 09:39:52 +08:00
xieqiyu 00a8efaf80 * Fix bug#18756. 2022-03-17 13:37:20 +08:00
tianshujie 050cefdbcd * Fix bug #20837. 2022-03-16 16:19:39 +08:00
tianshujie a18c511ab0 * Fix bug #19312. 2022-03-16 09:25:11 +08:00
tianshujie 6a7671fb9a * Fix bug #19312. 2022-03-15 14:32:44 +08:00
zhujinyong 819fad539e * Finish story#31282, story#31284. 2022-03-10 16:21:27 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
孙华伟 719cd91f8e Update kanban control.php 2022-03-09 01:08:17 +00:00
孙华伟 8f3dc47e67 Update kanban control.php 2022-03-09 00:55:06 +00:00
zhouxudong 027fbc1472 * Fix bug #19120. 2022-03-08 17:12:52 +08:00
孙华伟 67a0272d96 *Story #31107. 2022-03-08 14:41:51 +08:00