 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 |
|
|
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 |
|
|
tianshujie
|
061e25fd51
|
* Finish task #57095.
|
2022-06-16 08:53:15 +08:00 |
|
|
tianshujie
|
cdc590c16b
|
* Finish task #57095.
|
2022-06-16 08:27:34 +08:00 |
|
|
王怡栋
|
4985d76009
|
Merge branch 'sprint/hufangzhou_56361' into 'master'
* Finish task #56361.
See merge request easycorp/zentaopms!3945
|
2022-06-15 09:28:14 +00:00 |
|
|
孙广明
|
1f13b14799
|
Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
# module/execution/css/all.css
|
2022-06-15 09:03:47 +00:00 |
|
|
tianshujie
|
1f0f1ff36e
|
* Finish task #57095.
|
2022-06-15 16:52:26 +08:00 |
|
|
tianshujie
|
7f000fd968
|
* Finish task #57095.
|
2022-06-15 16:41:12 +08:00 |
|
|
tianshujie
|
520ab92338
|
* Finish task #57095.
|
2022-06-15 16:17:16 +08:00 |
|
|
hufangzhou
|
9b32199272
|
* Finish task #56361.
|
2022-06-15 15:11:41 +08:00 |
|
|
tianshujie
|
2c176439d3
|
* Finish task #57095.
|
2022-06-15 15:09:34 +08:00 |
|
|
孙广明
|
d568e34896
|
* Code for sprint code width.
|
2022-06-15 13:53:06 +08:00 |
|
|
王怡栋
|
043aed24ec
|
Merge branch 'sprint/204_liumengyi_57089' into 'master'
* Finish task #57089, #57099.
See merge request easycorp/zentaopms!3927
|
2022-06-15 02:21:35 +00:00 |
|
|
liumengyi
|
9a74ea6d5d
|
* Fix bug of task #57089.
|
2022-06-15 10:05:52 +08:00 |
|
|
caoyanyi
|
8c5d59f15d
|
* Fix bug #23633.
|
2022-06-15 08:41:06 +08:00 |
|
|
王怡栋
|
a9981b0a33
|
Merge branch 'master' into 'sprint/201_tianshujie_56469'
# Conflicts:
# module/execution/control.php
# module/execution/js/kanban.js
# module/kanban/control.php
# module/kanban/model.php
|
2022-06-10 01:05:39 +00:00 |
|
|
王怡栋
|
7d3ea4b91e
|
Merge branch 'sprint200_fix_bug_23486' into 'master'
* Fix bug#23494,bug#23486.
See merge request easycorp/zentaopms!3839
|
2022-06-09 09:17:19 +00:00 |
|
|
leiyong
|
4d5ccc180e
|
* Fix bug#23494,bug#23486.
|
2022-06-09 08:58:05 +00:00 |
|
|
liumengyi
|
f3ce4377a8
|
* Fix bug #23506, #23439.
|
2022-06-09 16:22:58 +08:00 |
|
|
tianshujie
|
74f80b8d71
|
* Finish task #56469.
|
2022-06-09 13:24:58 +08:00 |
|
|
王怡栋
|
df6d8bcb0e
|
Merge branch 'sprint/201' into 'master'
Sprint/201
See merge request easycorp/zentaopms!3793
|
2022-06-08 06:45:01 +00:00 |
|
|
liumengyi
|
2a9f945c77
|
* Fix bug #23407.
|
2022-06-08 13:25:06 +08:00 |
|
|
liumengyi
|
5e74d3bd9f
|
* Finish task #56454.
|
2022-06-08 10:32:01 +08:00 |
|
|
tianshujie
|
020528cdbb
|
* Fix bug #23335.
|
2022-06-07 08:59:51 +08:00 |
|