 李玉春
|
ed24d92ae2
|
Merge branch 'master' into 'sprint_sunjun_29766'
# Conflicts:
# module/kanban/config.php
|
2022-05-25 02:27:08 +00:00 |
|
|
李玉春
|
44325a46f2
|
Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22665.
See merge request easycorp/zentaopms!3576
|
2022-05-25 02:16:02 +00:00 |
|
|
liumengyi
|
7baafc5ca0
|
* Code format.
|
2022-05-25 10:07:06 +08:00 |
|
|
liumengyi
|
743ea79536
|
* Fix bug #22665.
|
2022-05-25 10:04:18 +08:00 |
|
|
王怡栋
|
4157c6041b
|
Merge branch 'sprint/daitingting_workflow_54954' into 'master'
* Set default value in getFieldControl function, finish task #54954.
See merge request easycorp/zentaopms!3572
|
2022-05-25 01:31:20 +00:00 |
|
|
daitingting
|
79af02f18a
|
* Remove useless object param.
|
2022-05-25 01:25:53 +00:00 |
|
|
daitingting
|
3a3549078f
|
* Remove useless object param.
|
2022-05-25 01:19:49 +00:00 |
|
|
daitingting
|
e2f7c10296
|
* Set default value in getFieldControl function, finish task #54954.
|
2022-05-25 01:03:06 +00:00 |
|
|
孙广明
|
5ff9894471
|
Merge branch 'springt/195_zg' into 'master'
* Adjust story sort default to desc
See merge request easycorp/zentaopms!3570
|
2022-05-24 09:21:28 +00:00 |
|
|
王怡栋
|
b54de18d66
|
Merge branch 'sprint/193_hufangzhou_54985' into 'master'
* Finish task #54985.
See merge request easycorp/zentaopms!3565
|
2022-05-24 09:20:24 +00:00 |
|
|
王怡栋
|
d6013819ab
|
Merge branch 'master_xieqiyu_54984' into 'master'
* Finish task#54984.
See merge request easycorp/zentaopms!3564
|
2022-05-24 09:19:08 +00:00 |
|
|
王怡栋
|
bc882d23bc
|
Merge branch 'master_xieqiyu_54989' into 'master'
* Finish task#54989.
See merge request easycorp/zentaopms!3569
|
2022-05-24 09:18:19 +00:00 |
|
|
孙广明
|
9b85ffb113
|
Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22715, #22759.
See merge request easycorp/zentaopms!3571
|
2022-05-24 09:14:43 +00:00 |
|
|
liumengyi
|
0a559f1e8d
|
* Fix bug #22715.
|
2022-05-24 17:12:13 +08:00 |
|
|
zenggang
|
7d5615ffac
|
* Adjust story sort default to desc
|
2022-05-24 09:10:28 +00:00 |
|
|
xieqiyu
|
23e2c29c1a
|
* Finish task#54989.
|
2022-05-24 17:04:09 +08:00 |
|
|
wangyidong
|
2bbae04ded
|
* adjust for tid.
|
2022-05-24 16:57:56 +08:00 |
|
|
孙广明
|
1926f2ee8d
|
Merge branch 'sprint/195_mayue_task#55175' into 'master'
* Finish task #55175.
See merge request easycorp/zentaopms!3563
|
2022-05-24 08:52:12 +00:00 |
|
|
mayue
|
815eb40a20
|
* Optimize code.
|
2022-05-24 08:39:55 +00:00 |
|
|
mayue
|
db30dd1cad
|
* Optimize code.
|
2022-05-24 08:37:10 +00:00 |
|
|
liumengyi
|
5a23ce2d5c
|
* Fix bug #22759.
|
2022-05-24 16:34:16 +08:00 |
|
|
孙广明
|
cc2d2abef4
|
Merge branch 'sprint/194_liumengyi_55254' into 'master'
* Finish task #55254 and fix bug.
See merge request easycorp/zentaopms!3568
|
2022-05-24 08:24:53 +00:00 |
|
|
xieqiyu
|
d9bbc81938
|
* Finish task#54989.
|
2022-05-24 16:23:54 +08:00 |
|
|
孙广明
|
c9ed9ca81f
|
Merge branch 'sprint/194_liumengyi_fixbug' into 'master'
* Fix bug #22800.
See merge request easycorp/zentaopms!3567
|
2022-05-24 08:23:23 +00:00 |
|
|
孙广明
|
ee54702941
|
Merge branch 'sprint/195_mayue_task#55171' into 'master'
* Finish task #55171.
See merge request easycorp/zentaopms!3566
|
2022-05-24 08:19:05 +00:00 |
|
|
liumengyi
|
2561c857b7
|
* Fix bug #22800.
|
2022-05-24 16:14:00 +08:00 |
|
|
tianshujie
|
7d4781fdd2
|
* Fixed edit Execution Kanban save error.
|
2022-05-24 16:13:37 +08:00 |
|
|
mayue
|
21402a6f66
|
* Finish task #55171.
|
2022-05-24 08:12:28 +00:00 |
|
|
liumengyi
|
39a163e0a8
|
* Fix bug for task #55254.
|
2022-05-24 16:04:10 +08:00 |
|
|
hufangzhou
|
79f28c9cb2
|
* Finish task #54985.
|
2022-05-24 16:02:05 +08:00 |
|
|
wangyidong
|
b072234b4d
|
* adjust for tid.
|
2022-05-24 15:53:57 +08:00 |
|
|
xieqiyu
|
5e314ba343
|
* Finish task#54984.
|
2022-05-24 15:50:52 +08:00 |
|
|
mayue
|
07906fb1f8
|
* Add code comments.
|
2022-05-24 07:38:39 +00:00 |
|
|
mayue
|
37125b72bc
|
* Finish task #55175.
|
2022-05-24 07:34:38 +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 |
|
|
liyuchun
|
e56bd44299
|
Merge branch 'sgm_sprint195'
|
2022-05-24 06:58:35 +00:00 |
|
|
李玉春
|
b5ad70bcb7
|
Merge branch 'master' into 'sgm_sprint195'
# Conflicts:
# db/update17.0.beta1.sql
|
2022-05-24 06:58:00 +00:00 |
|
|
孙广明
|
fb61022d2c
|
* Add sql for issue.
|
2022-05-24 14:56:53 +08:00 |
|
|
李玉春
|
23dc6ddccd
|
Merge branch 'sgm_unittest' into 'master'
Sgm unittest
See merge request easycorp/zentaopms!3554
|
2022-05-24 06:47:28 +00:00 |
|
|
liumengyi
|
816999dbeb
|
* Finish task #55254.
|
2022-05-24 14:41:42 +08:00 |
|
|
孙广明
|
77dd8b3b64
|
Merge branch 'sprint/matser_zhouxudong_22722' into 'master'
Sprint/matser zhouxudong 22722
See merge request easycorp/zentaopms!3560
|
2022-05-24 06:34:08 +00:00 |
|
|
zhouxudong
|
189ea8b1a7
|
* Fix bug #22722.
|
2022-05-24 06:33:04 +00:00 |
|
|
孙广明
|
495a034784
|
* Finish task #55178.
|
2022-05-24 14:15:34 +08:00 |
|
|
李玉春
|
856611ca70
|
Merge branch 'sprint/194_liumengyi_activeKanban' into 'master'
* Fnish task #55255.
See merge request easycorp/zentaopms!3558
|
2022-05-24 05:40:21 +00:00 |
|
|
liumengyi
|
94078cdc6c
|
* Fix bug for task #55255.
|
2022-05-24 13:39:27 +08:00 |
|
|
李玉春
|
03469dbd1e
|
Merge branch 'sprint/194_tianshujie_14741' into 'master'
Sprint/194 tianshujie 14741
See merge request easycorp/zentaopms!3557
|
2022-05-24 05:39:25 +00:00 |
|
|
tianshujie
|
63b5d64dc8
|
* Finish task #14741.
|
2022-05-24 13:38:11 +08:00 |
|
|
李玉春
|
ffb7904cee
|
Merge branch 'sprint/194_liumengyi_activeKanban' into 'master'
* Finish task #55255.
See merge request easycorp/zentaopms!3556
|
2022-05-24 05:38:09 +00:00 |
|
|
liumengyi
|
94e8879729
|
* Modify format fot ask #55255.
|
2022-05-24 13:34:29 +08:00 |
|