王怡栋
|
660f0d0d85
|
Merge branch 'sprint/master_zhouxudong_61441' into 'master'
Sprint/master zhouxudong 61441
See merge request easycorp/zentaopms!4606
|
2022-07-21 02:03:20 +00:00 |
|
zhouxudong
|
1c4c282aee
|
* Finish task #61441.
|
2022-07-21 01:29:57 +00:00 |
|
tianshujie
|
5b0ada601f
|
* Reformat code.
|
2022-07-20 17:05:59 +08:00 |
|
tianshujie
|
bdab39e7f7
|
* Fixed an issue where advanced tables cannot be selected entirely.
|
2022-07-20 16:54:43 +08:00 |
|
xieqiyu
|
311436573a
|
* Fix bug#25365.
|
2022-07-15 11:12:04 +08:00 |
|
xieqiyu
|
f9e7b52cca
|
* Fix bug#25084.
|
2022-07-15 09:28:00 +08:00 |
|
tianshujie
|
f9e6fe5de4
|
* Fix bug #25329.
|
2022-07-14 17:14:54 +08:00 |
|
xieqiyu
|
efe88fea99
|
* Adjust comment.
|
2022-07-14 15:28:30 +08:00 |
|
xieqiyu
|
a44ba79b1d
|
* Fix bug#25027.
|
2022-07-14 13:35:17 +08:00 |
|
王怡栋
|
196ee9ff18
|
Merge branch 'master_xieqiyu_25094' into 'master'
* Fix bug#25094.
See merge request easycorp/zentaopms!4530
|
2022-07-14 05:03:50 +00:00 |
|
zenggang
|
fd9b0b1053
|
* Fix bug#25241
|
2022-07-14 02:20:00 +00:00 |
|
xieqiyu
|
bbab93d08d
|
* Fix bug#25094.
|
2022-07-14 09:59:06 +08:00 |
|
zenggang
|
38e996bd18
|
* Fix bug#25222,25232
|
2022-07-14 01:38:00 +00:00 |
|
liumengyi
|
a743cf4b3f
|
* Optimize code.
|
2022-07-13 13:41:48 +08: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 |
|
liumengyi
|
d748d207fb
|
* Optimize code.
|
2022-07-12 17:18:07 +08:00 |
|
王怡栋
|
d0c15d321f
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
Sprint/master zhouxudong fixbug
See merge request easycorp/zentaopms!4472
|
2022-07-12 07:41:56 +00:00 |
|
zenggang
|
6a84cd7469
|
* Code for task#60640
|
2022-07-12 07:15:13 +00:00 |
|
zhouxudong
|
69101c8409
|
* Fix bug about taskkanban.
|
2022-07-12 06:06:02 +00:00 |
|
xieqiyu
|
658a187e47
|
* Fix bug of story and bug action in execution.
|
2022-07-12 14:05:40 +08:00 |
|
王怡栋
|
d47cde97d2
|
Merge branch 'master_xieqiyu_25030' into 'master'
* Fix bug#25030.
See merge request easycorp/zentaopms!4464
|
2022-07-12 05:31:04 +00:00 |
|
liumengyi
|
154c18ee43
|
* Finish task #60476.
|
2022-07-12 11:07:16 +08:00 |
|
zenggang
|
f3dd489f61
|
* Adjust code
|
2022-07-12 02:32:01 +00:00 |
|
zenggang
|
5d116c16c9
|
* Finish task#60640
|
2022-07-12 02:29:20 +00:00 |
|
xieqiyu
|
bd596ac686
|
* Fix bug#25030.
|
2022-07-12 09:32:31 +08:00 |
|
xieqiyu
|
e7d7930b5b
|
* Fix bug#25062.
|
2022-07-12 08:13:36 +08:00 |
|
zhouxudong
|
fd2b8ec129
|
* Fix bug.
|
2022-07-11 12:56:31 +00:00 |
|
mayue
|
ea0500a20c
|
* Finish task #60641.
|
2022-07-11 15:26:14 +08:00 |
|
王怡栋
|
e9809af13a
|
Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
# www/js/my.full.js
|
2022-07-11 07:10:23 +00:00 |
|
hufangzhou
|
3f2b98e71c
|
* Move the functions to my.full.js file.
|
2022-07-11 15:03:40 +08:00 |
|
hufangzhou
|
21dbff52ca
|
* Rename method names.
|
2022-07-11 14:57:43 +08:00 |
|
hufangzhou
|
2993ba53f8
|
* Finish task #59535.
|
2022-07-11 14:41:09 +08:00 |
|
mayue
|
88a580898d
|
* Optimize code.
|
2022-07-11 10:06:43 +08:00 |
|
mayue
|
5bedd02491
|
* Fix bug #25031.
|
2022-07-11 09:54:58 +08:00 |
|
mayue
|
1df55e32a7
|
* Fix bug #24848#24817.
|
2022-07-08 09:18:53 +08:00 |
|
mayue
|
f6d94ad4cb
|
* Fix bug #24848#24817.
|
2022-07-08 09:06:39 +08:00 |
|
liumengyi
|
e709c4bbda
|
* Finish task #59480, #59481.
|
2022-07-07 14:12:45 +08:00 |
|
mayue
|
8192f8b185
|
* Fix bug #24811.
|
2022-07-07 10:52:45 +08:00 |
|
xieqiyu
|
e10272248b
|
* Code for task#59546. Update create story and copy bug.
|
2022-07-07 09:06:33 +08:00 |
|
hufangzhou
|
db2112c9f3
|
* Code for task #59535.
|
2022-07-06 16:07:03 +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
|
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
|
d34e8f8638
|
sprint_59473
|
2022-07-06 00:29:14 +00:00 |
|
sunjun
|
84e078c1b2
|
sprint_59473
|
2022-07-05 14:35:33 +00: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
|
2a28c13c7e
|
sprint_59473
|
2022-07-05 07:39:55 +00:00 |
|
xieqiyu
|
2148419cb2
|
* Code for task#59543.
|
2022-07-05 14:43:37 +08:00 |
|