 王怡栋
|
84b130e617
|
Merge branch 'master_xieqiyu_27445' into 'master'
* Fix bug#27445.
See merge request easycorp/zentaopms!5306
|
2022-09-13 05:48:16 +00:00 |
|
|
王怡栋
|
9b8f83adaf
|
Merge branch 'sprint/daitingting_bug_27272' into 'master'
* Fix bug #27272.
See merge request easycorp/zentaopms!5310
|
2022-09-13 05:45:50 +00:00 |
|
|
wangyidong
|
09694f3751
|
* adjust for edit effort.
|
2022-09-13 13:37:13 +08:00 |
|
|
daitingting
|
164eaacf30
|
* Fix bug #27272.
|
2022-09-13 05:34:48 +00:00 |
|
|
wangyidong
|
0142653d2b
|
* adjust lang.
|
2022-09-13 13:21:14 +08:00 |
|
|
wangyidong
|
2ba29dd574
|
* adjust for effort when restart task.
|
2022-09-13 13:04:01 +08:00 |
|
|
孙广明
|
11a2cee3ed
|
Merge branch 'revert-32119ec2' into 'master'
Revert "* Add task effort report."
See merge request easycorp/zentaopms!5308
|
2022-09-13 03:29:36 +00:00 |
|
|
孙广明
|
648efad24f
|
Revert "* Add task effort report."
This reverts commit 32119ec28d
|
2022-09-13 03:29:20 +00:00 |
|
|
孙广明
|
32119ec28d
|
* Add task effort report.
|
2022-09-13 11:25:31 +08:00 |
|
|
wangyidong
|
070d0404b6
|
* fix bug for activate multi mode task.
|
2022-09-13 11:21:22 +08:00 |
|
|
wangyidong
|
f743da3ddc
|
* fix bug.
|
2022-09-13 11:04:04 +08:00 |
|
|
孙广明
|
65b1d28408
|
* Code for recordestimate view.
|
2022-09-13 10:55:29 +08:00 |
|
|
wangyidong
|
d88700a2e7
|
* adjust for notice manage task team.
|
2022-09-13 10:35:56 +08:00 |
|
|
xieqiyu
|
638586bea2
|
* Fix bug#27445.
|
2022-09-09 16:44:09 +08:00 |
|
|
王怡栋
|
f89811bc86
|
Merge branch 'sprint/237_liumengyi_27450' into 'master'
* Fix bug #27450.
See merge request easycorp/zentaopms!5304
|
2022-09-09 08:37:28 +00:00 |
|
|
王怡栋
|
f78fdce043
|
Merge branch 'sprint/tianshujie_bug' into 'master'
Sprint/tianshujie bug
See merge request easycorp/zentaopms!5305
|
2022-09-09 08:37:15 +00:00 |
|
|
tianshujie
|
226029f1e5
|
* Fix bug #27451.
|
2022-09-09 16:34:08 +08:00 |
|
|
李玉春
|
a18ef37303
|
Merge branch 'testta_ly' into 'master'
Testta ly
See merge request easycorp/zentaopms!5303
|
2022-09-09 08:25:42 +00:00 |
|
|
liyang
|
cbfe513c5b
|
* Add methods comment.
|
2022-09-09 16:23:28 +08:00 |
|
|
李玉春
|
8e69bd23d7
|
Merge branch 'cyy_api' into 'master'
* Fix bug #27158.
See merge request easycorp/zentaopms!5297
|
2022-09-09 08:15:19 +00:00 |
|
|
liumengyi
|
46a7c7f409
|
* Fix bug #27450.
|
2022-09-09 16:14:16 +08:00 |
|
|
wangyidong
|
0881e39c54
|
* adjust for multi task.
|
2022-09-09 16:14:08 +08:00 |
|
|
liyang
|
3251d92f47
|
* Fix config of unittest.
|
2022-09-09 16:10:46 +08:00 |
|
|
tianshujie
|
b5630098eb
|
* Fix bug #27449.
|
2022-09-09 16:10:34 +08:00 |
|
|
liyang
|
4e10ea8fe6
|
* Fix code format.
|
2022-09-09 16:05:02 +08:00 |
|
|
tianshujie
|
03f858361d
|
* Fix bug #27448.
|
2022-09-09 15:57:58 +08:00 |
|
|
liyang
|
d1fe734dc6
|
+ Add create api test.
|
2022-09-09 15:54:59 +08:00 |
|
|
liyang
|
e59f8d97e4
|
* Fix api test.
|
2022-09-09 15:53:45 +08:00 |
|
|
wangyidong
|
4bd3d07e34
|
Merge branch 'sprint/237_liumengyi_fixbug'
|
2022-09-09 15:19:04 +08:00 |
|
|
王怡栋
|
b1c87862f2
|
Merge branch 'master' into 'sprint/237_liumengyi_fixbug'
# Conflicts:
# module/doc/css/createbasicinfo.css
|
2022-09-09 07:18:21 +00:00 |
|
|
王怡栋
|
b9564e50a1
|
Merge branch 'master_xieqiyu_27124' into 'master'
Master xieqiyu 27124
See merge request easycorp/zentaopms!5300
|
2022-09-09 07:17:43 +00:00 |
|
|
xieqiyu
|
f7883bf7b7
|
* Fix bug#26350.
|
2022-09-09 15:08:06 +08:00 |
|
|
sunguangming
|
abffa486a1
|
* Fix bug #27442.
|
2022-09-09 14:51:41 +08:00 |
|
|
xieqiyu
|
4d439f7337
|
* Fix bug#26180.
|
2022-09-09 14:33:29 +08:00 |
|
|
xieqiyu
|
9f28ebf56b
|
* Fix bug#26180.
|
2022-09-09 14:27:18 +08:00 |
|
|
xieqiyu
|
dfe4de62a5
|
* Fix bug#26179.
|
2022-09-09 14:14:53 +08:00 |
|
|
xieqiyu
|
a258b7b9db
|
* Fix bug#26156.
|
2022-09-09 14:11:36 +08:00 |
|
|
xieqiyu
|
8fe84e651f
|
* Modify submit review icon.
|
2022-09-09 13:23:09 +08:00 |
|
|
liumengyi
|
52bdcfb8d1
|
* Fix bug.
|
2022-09-09 13:07:54 +08:00 |
|
|
liumengyi
|
d2deaca78e
|
* Fix bug.
|
2022-09-09 13:07:25 +08:00 |
|
|
王怡栋
|
eeaad02185
|
Merge branch 'sprint/tianshujie_bug' into 'master'
Sprint/tianshujie bug
See merge request easycorp/zentaopms!5299
|
2022-09-09 03:24:09 +00:00 |
|
|
xieqiyu
|
981aaf5755
|
* Fix bug#26874.
|
2022-09-09 11:24:04 +08:00 |
|
|
xieqiyu
|
40bc0e7966
|
* Fix bug#26942.
|
2022-09-09 11:17:37 +08:00 |
|
|
曹延义
|
f8fdeafb3a
|
* Fix bug #27150.
|
2022-09-09 11:06:56 +08:00 |
|
|
tianshujie
|
e9efb56769
|
* Fix bug #27437.
|
2022-09-09 10:37:28 +08:00 |
|
|
曹延义
|
82a9315027
|
* Fix bug #27158.
|
2022-09-09 10:13:56 +08:00 |
|
|
tianshujie
|
490c0f8791
|
* Fix bug #27281.
|
2022-09-09 10:10:17 +08:00 |
|
|
tianshujie
|
adb25f92b3
|
* Fix bug #27296.
|
2022-09-09 09:55:42 +08:00 |
|
|
liumengyi
|
2500ad1fb7
|
* Fix bug #27428.
|
2022-09-09 09:45:33 +08:00 |
|
|
wangyidong
|
1bb552b34d
|
* fix bug for linear task.
|
2022-09-09 09:23:12 +08:00 |
|