 liumengyi
|
26b430660a
|
* Fix bug #23123.
|
2022-07-08 13:29:56 +08:00 |
|
|
zenggang
|
b8c23acb69
|
* Adjust code
|
2022-07-08 01:42:17 +00:00 |
|
|
zenggang
|
a01d530a0a
|
* Hide cfd stat
|
2022-07-08 01:38:33 +00:00 |
|
|
孙广明
|
8ce405dec0
|
Merge branch 'sprint/213_mayue_bug#24848#24817' into 'master'
* Fix bug #24848#24817.
See merge request easycorp/zentaopms!4423
|
2022-07-08 01:20:09 +00:00 |
|
|
孙广明
|
6b33905ac8
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4422
|
2022-07-08 01:10:03 +00:00 |
|
|
mayue
|
f6d94ad4cb
|
* Fix bug #24848#24817.
|
2022-07-08 09:06:39 +08:00 |
|
|
孙广明
|
fc08eb2060
|
Merge branch 'fixbug_24248' into 'master'
fixbug_24248
See merge request easycorp/zentaopms!4413
|
2022-07-08 01:05:19 +00:00 |
|
|
tianshujie
|
ce191b4f9e
|
* Fix bug #24945.
|
2022-07-08 09:04:57 +08:00 |
|
|
liumengyi
|
e709c4bbda
|
* Finish task #59480, #59481.
|
2022-07-07 14:12:45 +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 |
|
|
孙广明
|
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 |
|
|
王怡栋
|
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
|
3049879a44
|
* Fix bug of task #59482.
|
2022-07-07 09:40:07 +08:00 |
|
|
xieqiyu
|
e10272248b
|
* Code for task#59546. Update create story and copy bug.
|
2022-07-07 09:06:33 +08:00 |
|
|
liumengyi
|
73fe07dd49
|
* Finish task #59482.
|
2022-07-06 16:18:44 +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
|
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 |
|
|
孙广明
|
6fe5ef5a23
|
Merge branch 'sprint_59473' into 'master'
Sprint 59473
See merge request easycorp/zentaopms!4362
|
2022-07-06 01:13:32 +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 |
|
|
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 |
|
|
王怡栋
|
ae7cc6764d
|
Merge branch 'sgm_kanban' into 'master'
* Finish task #59701.
See merge request easycorp/zentaopms!4348
|
2022-07-05 07:08:41 +00:00 |
|
|
孙广明
|
25028997fa
|
* Finish task #59701.
|
2022-07-05 15:03:15 +08:00 |
|
|
zhouxudong
|
8110d73bd7
|
* Finish task #59748.
|
2022-07-05 06:20:33 +00:00 |
|
|
zhouxudong
|
994ca59405
|
* Finish task #59748.
|
2022-07-05 02:50:25 +00:00 |
|
|
zhouxudong
|
0b309f63bd
|
* Finish task #59534 #59530 #59529.
|
2022-07-04 08:54:44 +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
|
c568a46744
|
* Fix bug #22964.
|
2022-07-01 07:20:01 +00:00 |
|
|
sunjun
|
66f26a72e8
|
fixbug_24248
|
2022-07-01 01:32:11 +00:00 |
|
|
xieqiyu
|
f45d133784
|
* Modify title color.
|
2022-06-30 16:26:59 +08:00 |
|
|
孙广明
|
4dc9c76e9c
|
Merge branch 'sprint209_leiyong_task_58578' into 'master'
* Finish task#58578.
See merge request easycorp/zentaopms!4200
|
2022-06-29 05:34:12 +00:00 |
|
|
tanghucheng
|
26ae6a991f
|
* Fix bug #23354.
|
2022-06-28 21:33:42 +08:00 |
|
|
leiyong
|
f888f66bf5
|
* Finish task#58578.
|
2022-06-28 09:59:34 +00:00 |
|
|
zhouxudong
|
d8acac2813
|
* Finish task #58575 #58602.
|
2022-06-28 00:49:54 +00:00 |
|
|
zhouxudong
|
6314aad2e3
|
* Finish task #58575 #58602.
|
2022-06-27 08:38:11 +00:00 |
|
|
孙广明
|
66ab8da1b2
|
Merge branch 'leiyong_adjust_feishu' into 'master'
* Fix bug#24192.
See merge request easycorp/zentaopms!4136
|
2022-06-27 02:49:22 +00:00 |
|
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|