liumengyi
|
dd2c92fb9d
|
* Finish task #62935.
|
2022-08-01 15:41:14 +08:00 |
|
liumengyi
|
e13315a151
|
* Finish task #62494.
|
2022-07-28 09:57:02 +08:00 |
|
liumengyi
|
60b32e04da
|
* Fix bug #25797.
|
2022-07-28 09:54:42 +08:00 |
|
liumengyi
|
5551773576
|
* Finish story #35409, #35408, #35407.
|
2022-07-27 14:50:07 +08:00 |
|
zhouxudong
|
38ae663640
|
* Fix bug #25703.
|
2022-07-27 01:52:04 +00:00 |
|
liumengyi
|
865986c216
|
* Finish task #61973.
|
2022-07-26 09:36:30 +08:00 |
|
王怡栋
|
7e682c99c2
|
Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110
See merge request easycorp/zentaopms!4563
|
2022-07-15 03:17:39 +00:00 |
|
王怡栋
|
11f2eb8a0f
|
Merge branch 'sprint/215_liumengyi_60476' into 'master'
Sprint/215 liumengyi 60476
See merge request easycorp/zentaopms!4485
|
2022-07-12 09:20:31 +00:00 |
|
mayue
|
a21626979e
|
* Fix bug #25081.
|
2022-07-12 14:25:58 +08:00 |
|
liumengyi
|
154c18ee43
|
* Finish task #60476.
|
2022-07-12 11:07:16 +08:00 |
|
zenggang
|
5d116c16c9
|
* Finish task#60640
|
2022-07-12 02:29:20 +00:00 |
|
孙广明
|
107060744e
|
Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.
See merge request easycorp/zentaopms!4463
|
2022-07-12 00:54:34 +00:00 |
|
mayue
|
9248adc1af
|
* Finish task #60639.
|
2022-07-11 18:10:09 +08:00 |
|
chaideqing
|
3532e82841
|
* fix card show blank above header
|
2022-07-11 15:29:26 +08:00 |
|
liumengyi
|
b8642a3350
|
* Finish task #60395.
|
2022-07-11 14:49:36 +08:00 |
|
zenggang
|
a01d530a0a
|
* Hide cfd stat
|
2022-07-08 01:38:33 +00:00 |
|
mayue
|
8192f8b185
|
* Fix bug #24811.
|
2022-07-07 10:52:45 +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 |
|
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 |
|
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 |
|
孙广明
|
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
|
8773257051
|
* Finish task#59703,59711
|
2022-07-06 06:42:19 +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 |
|
sunjun
|
84e078c1b2
|
sprint_59473
|
2022-07-05 14:35:33 +00:00 |
|
孙广明
|
781259ee6f
|
* Code for CFD.
|
2022-07-05 21:11:03 +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
|
2a28c13c7e
|
sprint_59473
|
2022-07-05 07:39:55 +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 |
|
孙广明
|
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 |
|
zhouxudong
|
5af55d653b
|
* Finish task #59542 #59541.
|
2022-07-04 07:46:30 +00:00 |
|
zhouxudong
|
6b960dc038
|
* Finish task #59542 #59541.
|
2022-07-04 05:57:34 +00:00 |
|
leiyong
|
f888f66bf5
|
* Finish task#58578.
|
2022-06-28 09:59:34 +00:00 |
|
leiyong
|
0e0d3be73c
|
* Finish task#58570.
|
2022-06-28 03:21:23 +00:00 |
|
hufangzhou
|
eebcfaad58
|
* Adjust the spacing of dynamic block and dynamic page.
|
2022-06-24 13:33:11 +08:00 |
|
王怡栋
|
f2603f143d
|
Merge branch 'spint/master_zhouxudong_57879' into 'master'
* Finish task #57879.
See merge request easycorp/zentaopms!4125
|
2022-06-24 01:30:35 +00:00 |
|
zhouxudong
|
7db6039f4b
|
* Finish task #57879.
|
2022-06-24 00:50:19 +00:00 |
|
王怡栋
|
ac21bc6527
|
Merge branch 'spint/master_zhouxudong_57879' into 'master'
* Finish task #57879.
See merge request easycorp/zentaopms!4115
|
2022-06-23 08:16:31 +00:00 |
|
zhouxudong
|
ef1a72a9b1
|
* Finish task #57879.
|
2022-06-23 07:20:52 +00:00 |
|
王怡栋
|
77d1ab4daf
|
Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
# db/update17.1.sql
|
2022-06-23 01:46:35 +00:00 |
|
liumengyi
|
4c5ff19a61
|
* Finish task #58288.
|
2022-06-22 17:01:39 +08:00 |
|
hufangzhou
|
ac69cd1afb
|
* Finish task #57883.
|
2022-06-22 10:39:55 +08:00 |
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|
tianshujie
|
d95a2fee68
|
* Fix bug #23918.
|
2022-06-17 14:59:22 +08:00 |
|
tianshujie
|
6848485eb4
|
* Finish task #57095.
|
2022-06-16 11:05:01 +08:00 |
|