xieqiyu
|
07231be2d2
|
* Code for task#59543.
|
2022-07-07 17:23:09 +08:00 |
|
王怡栋
|
5dd799ee9e
|
Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #24942, #24949.
See merge request easycorp/zentaopms!4400
|
2022-07-07 05:10:46 +00:00 |
|
王怡栋
|
10b95d1e48
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4398
|
2022-07-07 05:10:07 +00:00 |
|
孙广明
|
d02553620f
|
Merge branch 'srpint213_zg_24853' into 'master'
* Fix bug#24853
See merge request easycorp/zentaopms!4396
|
2022-07-07 02:54:25 +00:00 |
|
mayue
|
8192f8b185
|
* Fix bug #24811.
|
2022-07-07 10:52:45 +08:00 |
|
liumengyi
|
119175e5c9
|
* Fix bug #24942.
|
2022-07-07 10:28:57 +08:00 |
|
xieqiyu
|
157c60bd64
|
* Code for task#59546. Update unlink story.
|
2022-07-07 10:04:24 +08:00 |
|
王怡栋
|
5879801b8b
|
Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.
See merge request easycorp/zentaopms!4395
|
2022-07-07 01:49:35 +00:00 |
|
zenggang
|
270ab7ce6e
|
* Fix bug#24853
|
2022-07-07 01:47:23 +00:00 |
|
liumengyi
|
59bbb4577a
|
* Finish task #59482.
|
2022-07-07 09:44:33 +08:00 |
|
王怡栋
|
779e95fde9
|
Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59546. Update create story and copy bug.
See merge request easycorp/zentaopms!4391
|
2022-07-07 01:40:11 +00:00 |
|
liumengyi
|
3049879a44
|
* Fix bug of task #59482.
|
2022-07-07 09:40:07 +08:00 |
|
王怡栋
|
e7502f6641
|
Merge branch 'master' into 'sprint212_leiyong_task_59528'
# Conflicts:
# module/execution/css/create.css
|
2022-07-07 01:38:20 +00:00 |
|
xieqiyu
|
e10272248b
|
* Code for task#59546. Update create story and copy bug.
|
2022-07-07 09:06:33 +08:00 |
|
zenggang
|
93da33e08d
|
* Adjust cfd style
|
2022-07-06 09:38:39 +00:00 |
|
zenggang
|
4825e51b78
|
* Adjust cfd css
|
2022-07-06 09:04:56 +00:00 |
|
liumengyi
|
73fe07dd49
|
* Finish task #59482.
|
2022-07-06 16:18:44 +08:00 |
|
mayue
|
fbb92627b8
|
* Fix bug #24832.
|
2022-07-06 15:51:28 +08:00 |
|
孙广明
|
c97ff18621
|
Merge branch 'master' into 'sprint213_zg'
# Conflicts:
# module/execution/css/cfd.css
# module/execution/js/cfd.js
|
2022-07-06 07:02:38 +00:00 |
|
mayue
|
ef88d29c90
|
* Fix bug #24811#24814.
|
2022-07-06 14:58:46 +08:00 |
|
zenggang
|
4c0375925c
|
* Adjust code
|
2022-07-06 06:58:25 +00:00 |
|
zenggang
|
b1d6a4a93d
|
* Adjust code
|
2022-07-06 06:44:54 +00:00 |
|
zenggang
|
8773257051
|
* Finish task#59703,59711
|
2022-07-06 06:42:19 +00:00 |
|
孙广明
|
84876b851d
|
* Fix cfd line style.
|
2022-07-06 14:05:52 +08:00 |
|
王怡栋
|
e3a045ac61
|
Merge branch 'sprint/master_zhouxudong_59748' into 'master'
Sprint/master zhouxudong 59748
See merge request easycorp/zentaopms!4366
|
2022-07-06 01:40:46 +00:00 |
|
孙广明
|
9a6689837b
|
* Add date to cfd.
|
2022-07-06 09:16:36 +08:00 |
|
孙广明
|
6fe5ef5a23
|
Merge branch 'sprint_59473' into 'master'
Sprint 59473
See merge request easycorp/zentaopms!4362
|
2022-07-06 01:13:32 +00:00 |
|
sunjun
|
e5ed8133b1
|
sprint_59473
|
2022-07-06 01:06:35 +00:00 |
|
孙广明
|
cbe74dd653
|
* Code for cfd details.
|
2022-07-06 08:44:57 +08:00 |
|
sunjun
|
d34e8f8638
|
sprint_59473
|
2022-07-06 00:29:14 +00:00 |
|
sunjun
|
84e078c1b2
|
sprint_59473
|
2022-07-05 14:35:33 +00:00 |
|
孙广明
|
781259ee6f
|
* Code for CFD.
|
2022-07-05 21:11:03 +08:00 |
|
孙广明
|
1166775664
|
Merge branch 'sgm_kanban' into 'master'
* Code for cfd.
See merge request easycorp/zentaopms!4355
|
2022-07-05 08:53:26 +00:00 |
|
孙广明
|
9ed8604daf
|
* Code for cfd.
|
2022-07-05 16:52:47 +08:00 |
|
leiyong
|
53ed45658e
|
* Adjust CSS.
|
2022-07-05 08:25:10 +00:00 |
|
sunjun
|
900b52a96b
|
sprint_59473
|
2022-07-05 08:24:41 +00:00 |
|
sunjun
|
5b228a2604
|
sprint_59473
|
2022-07-05 08:04:57 +00:00 |
|
sunjun
|
2a28c13c7e
|
sprint_59473
|
2022-07-05 07:39:55 +00:00 |
|
王怡栋
|
0c8c179094
|
Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban
See merge request easycorp/zentaopms!4344
|
2022-07-05 07:13:24 +00:00 |
|
王怡栋
|
e7e50fde0b
|
Merge branch 'sprint/master_zhouxudong_24751' into 'master'
* Fix bug #24751.
See merge request easycorp/zentaopms!4347
|
2022-07-05 07:12:20 +00:00 |
|
王怡栋
|
ae7cc6764d
|
Merge branch 'sgm_kanban' into 'master'
* Finish task #59701.
See merge request easycorp/zentaopms!4348
|
2022-07-05 07:08:41 +00:00 |
|
孙广明
|
837c796c32
|
* Fix code details.
|
2022-07-05 15:07:31 +08:00 |
|
孙广明
|
25028997fa
|
* Finish task #59701.
|
2022-07-05 15:03:15 +08:00 |
|
zhouxudong
|
b9ee65ddfd
|
* Fix bug #24751.
|
2022-07-05 06:54:04 +00:00 |
|
xieqiyu
|
2148419cb2
|
* Code for task#59543.
|
2022-07-05 14:43:37 +08:00 |
|
zhouxudong
|
8110d73bd7
|
* Finish task #59748.
|
2022-07-05 06:20:33 +00:00 |
|
xieqiyu
|
74b3fb5eeb
|
* Code for task#59544. Update lane color and set column and WIP.
|
2022-07-05 13:59:03 +08:00 |
|
zhouxudong
|
994ca59405
|
* Finish task #59748.
|
2022-07-05 02:50:25 +00:00 |
|
王怡栋
|
7a01041c35
|
Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59545,#59546. Update lane name.
See merge request easycorp/zentaopms!4334
|
2022-07-05 02:45:38 +00:00 |
|
xieqiyu
|
704711ce6f
|
* Code for task#59545,#59546. Update lane name.
|
2022-07-05 10:32:39 +08:00 |
|