Commit Graph
118 Commits
Author SHA1 Message Date
liumengyi 8a8666f158 * Finish task #57099. 2022-06-15 10:06:26 +08:00
zhouxudong d376e41579 * Finish task #56908 #56914 #56921. 2022-06-13 07:35:54 +00: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
王怡栋 df6d8bcb0e Merge branch 'sprint/201' into 'master'
Sprint/201

See merge request easycorp/zentaopms!3793
2022-06-08 06:45:01 +00:00
孙广明 0c0af6336a Merge branch 'sprint/master_zhouxudong_23026' into 'sprint_200'
Sprint/master zhouxudong 23026

See merge request easycorp/zentaopms!3777
2022-06-08 06:37:32 +00:00
zhouxudong edd66c028d * Fix bug #23026. 2022-06-08 06:25:06 +00:00
liumengyi 5e74d3bd9f * Finish task #56454. 2022-06-08 10:32:01 +08:00
xieqiyu 86561ba4ca * Code for task#56393,#56390,#56389. 2022-06-08 10:15:01 +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
zhouxudong 0f645a096e * Finish task #56396. 2022-06-07 05:39:44 +00:00
zhouxudong d67617d5ce * Fix bug #29936. 2022-05-31 00:17:10 +00:00
wangyidong 22ee2ff226 * adjust for flow lang. 2022-05-26 09:28:14 +08:00
zhouxudong f7d41d2ddd * Fix bug #22722. 2022-05-24 09:06:23 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
李玉春 3c59f5c4a0 Merge branch 'sprint/191_tianshujie_fixbug' into 'master'
* Fix bug #22617.

See merge request easycorp/zentaopms!3540
2022-05-20 03:09:22 +00:00
tianshujie 4ff0410aca * Fix bug #22617. 2022-05-20 10:45:48 +08:00
zhouxudong ab9f80ecfb * Finish task #54478. 2022-05-19 08:52:19 +00:00
liumengyi dee4ff7043 * Finish task #54318. 2022-05-19 08:55:27 +08:00
wangyidong f9b06ea3f9 * adjust for workflow field name. 2022-05-17 13:50:20 +08:00
wangyidong 759ace3700 * code for task #54026. 2022-05-16 16:36:04 +08:00
xieqiyu 7e2ee4fcdd * Fix bug#22487. 2022-05-13 11:56:46 +08:00
王怡栋 5674160b7e Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666

See merge request easycorp/zentaopms!3353
2022-05-12 05:05:25 +00:00
xieqiyu ce7c0afdc1 * Finish task#53666. 2022-05-11 18:24:13 +08:00
zhouxudong 1723a78c92 * Finish task #53651. 2022-05-10 09:11:06 +00:00
王怡栋 7ae35d4a12 * fix bug #21806. 2022-04-21 15:38:33 +08:00
孙华伟 03cf60bdcb *project,execution,bug have the same problem. 2022-04-12 14:26:12 +08:00
tianshujie 14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
liyuchun 3804046bdb * Fix bug #21182. 2022-04-07 09:15:35 +08:00
liyuchun 1aa30343a4 * Adjust style. 2022-03-30 11:38:04 +08:00
liyuchun ca5ef459da * Fix bug #16579. 2022-03-30 10:36:12 +08:00
孙广明 d9505fa9fa Merge branch 'pailei2_zhouxin_50796' into 'pailei2'
Pailei2 zhouxin 50796

See merge request easycorp/zentaopms!2341
2022-03-18 03:25:54 +00:00
zhouxin 9062870343 Fix bug #18766. 2022-03-17 06:48:33 +00:00
sunjun ab9a3bfc0a fixbug #19324 2022-03-17 13:33:15 +08:00
sunjun 316b989ffc fixbug #19324 2022-03-15 13:24:06 +08:00
孙华伟 5d61f31c3b * 2022-03-02 11:22:23 +08:00
孙华伟 a282e6c0e6 *Story #30528. 2022-03-02 09:56:58 +08:00
孙广明 9748e70a31 * Fix bug #19356. 2022-02-10 09:37:34 +08:00
孙广明 19aaf9740c * Fix details and add upgrade logic. 2022-01-14 14:31:59 +08:00
孙广明 e82f0f5655 Merge branch 'sprint/182_tianshujie_47313' into 'kanban'
* Finish task #47333,47313.

See merge request easycorp/zentaopms!1374
2022-01-13 03:18:01 +00:00
liumengyi 0403bb58d1 * Modify the opening method of link story. 2022-01-13 11:03:21 +08:00
tianshujie bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
liumengyi ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
songchenxuan 2507b9ba75 *Fix bug 17682. 2021-12-23 16:24:11 +08:00
songchenxuan 47d7d7a92d *Fix bug #17682. 2021-12-23 15:24:23 +08:00
孙广明 69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
zhengrunyu f274c52e33 *Finish task #fixbug. 2021-12-02 08:14:09 +08:00
zhujinyong 8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
zhengrunyu 3e4fa30030 *Finish task #45150. 2021-12-01 10:14:15 +08:00
Hao Sun 5424c131dc * task #45145, support to change scale size for execution kanban. 2021-12-01 08:30:57 +08:00