 xieqiyu
|
157c60bd64
|
* Code for task#59546. Update unlink story.
|
2022-07-07 10:04:24 +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 |
|
|
王怡栋
|
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 |
|
|
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 |
|
|
孙广明
|
0555f59112
|
Merge branch 'zg_bug_24689' into 'master'
* Fix bug #24689
See merge request easycorp/zentaopms!4323
|
2022-07-05 02:16:07 +00:00 |
|
|
王怡栋
|
bbf8176034
|
Merge branch 'master_xieqiyu_kanban' into 'master'
* Code for task#59544,#59546. Add update region when delete lane.
See merge request easycorp/zentaopms!4329
|
2022-07-05 02:10:12 +00:00 |
|
|
xieqiyu
|
c58e61ed26
|
* Code for task#59544,#59546. Add update region when delete lane.
|
2022-07-05 09:26:18 +08:00 |
|
|
zenggang
|
e4af7eab3b
|
* Fix bug #24689
|
2022-07-04 09:13:46 +00:00 |
|
|
zhouxudong
|
0b309f63bd
|
* Finish task #59534 #59530 #59529.
|
2022-07-04 08:54:44 +00:00 |
|
|
王怡栋
|
4e1f22be8a
|
Merge branch 'sprint/212_zhouxudong_59542' into 'master'
Sprint/212 zhouxudong 59542
See merge request easycorp/zentaopms!4321
|
2022-07-04 07:50:04 +00:00 |
|
|
zhouxudong
|
5af55d653b
|
* Finish task #59542 #59541.
|
2022-07-04 07:46:30 +00:00 |
|
|
王怡栋
|
1a82574947
|
Merge branch 'sprint/master_zhouxudong_22964' into 'master'
Sprint/master zhouxudong 22964
See merge request easycorp/zentaopms!4315
|
2022-07-04 06:56:52 +00:00 |
|
|
zhouxudong
|
6b960dc038
|
* Finish task #59542 #59541.
|
2022-07-04 05:57:34 +00:00 |
|
|
zhouxudong
|
c568a46744
|
* Fix bug #22964.
|
2022-07-01 07:20:01 +00:00 |
|
|
王怡栋
|
4b2b0ac214
|
Merge branch 'sprint/208_tianshujie_24393' into 'master'
* Restore code.
See merge request easycorp/zentaopms!4303
|
2022-07-01 05:00:40 +00:00 |
|