wangyidong
|
47a855e35f
|
Merge branch 'sprint/wangyidong_bug'
|
2022-09-19 13:48:27 +08:00 |
|
wangyidong
|
d6f395cc1b
|
* fix bug #27012.
|
2022-09-16 15:00:21 +08:00 |
|
wangyidong
|
bb9aa91422
|
* adjust for finish page style.
|
2022-09-14 17:34:28 +08:00 |
|
wangyidong
|
8db145922d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-09-14 13:40:05 +08:00 |
|
wangyidong
|
2b75baa004
|
* fix bug #27472.
|
2022-09-14 13:39:40 +08:00 |
|
sunguangming
|
3b8b7d2681
|
* Add lang 'my' to task.
|
2022-09-14 08:57:53 +08:00 |
|
wangyidong
|
383bee843a
|
* adjust for delete effort logic.
|
2022-09-13 17:22:13 +08:00 |
|
wangyidong
|
2ba29dd574
|
* adjust for effort when restart task.
|
2022-09-13 13:04:01 +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 |
|
wangyidong
|
0881e39c54
|
* adjust for multi task.
|
2022-09-09 16:14:08 +08:00 |
|
sunguangming
|
abffa486a1
|
* Fix bug #27442.
|
2022-09-09 14:51:41 +08:00 |
|
wangyidong
|
1bb552b34d
|
* fix bug for linear task.
|
2022-09-09 09:23:12 +08:00 |
|
wangyidong
|
ce91c9945e
|
* adjust for show linear effort.
|
2022-09-08 17:30:50 +08:00 |
|
wangyidong
|
00b0aa0ba0
|
* adjust for create effort.
|
2022-09-08 09:47:56 +08:00 |
|
王怡栋
|
84da5dced1
|
Merge branch 'master' into 'master_xieqiyu_67691'
# Conflicts:
# db/update17.6.sql
|
2022-09-08 01:38:22 +00:00 |
|
wangyidong
|
438c2b2524
|
* fix bug #27310.
|
2022-09-07 17:21:01 +08:00 |
|
wangyidong
|
a370daf00f
|
* fix bug #27307.
|
2022-09-07 17:16:30 +08:00 |
|
xieqiyu
|
80ff723165
|
* Code for task#67691.
|
2022-09-07 16:58:54 +08:00 |
|
wangyidong
|
aa9e733921
|
* fix bug #27286.
|
2022-09-07 09:20:26 +08:00 |
|
sunguangming
|
6e6f1b0800
|
* Alter recordestimate view to 5 lines.
|
2022-09-06 11:08:28 +08:00 |
|
wangyidong
|
19a69c8cae
|
* code for task #67405.
|
2022-09-06 09:30:22 +08:00 |
|
孙广明
|
a321b87f1c
|
Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.
See merge request easycorp/zentaopms!5262
|
2022-09-06 00:42:27 +00:00 |
|
liumengyi
|
b0a7a8bfd7
|
* Modify css for task #67925.
|
2022-09-05 14:07:51 +08:00 |
|
wangyidong
|
c8c544c6d0
|
* adjust for record estimate.
|
2022-09-05 13:55:22 +08:00 |
|
sunguangming
|
2f3e8d91ae
|
* Adjust recordestimate style.
|
2022-09-05 13:20:19 +08:00 |
|
wangyidong
|
86ebfc0480
|
* fix bug #27262.
|
2022-09-05 11:30:25 +08:00 |
|
wangyidong
|
574fd06e71
|
* adjust for task #67404.
|
2022-09-05 08:36:17 +08:00 |
|
wangyidong
|
4635256fb9
|
* adjust for record estimate for linear task.
|
2022-09-02 17:51:04 +08:00 |
|
wangyidong
|
c94a577c96
|
* adjust for task #67404.
|
2022-09-02 16:20:15 +08:00 |
|
wangyidong
|
e7d65e1dce
|
Merge branch 'sprint/zentaopms230'
|
2022-09-01 13:28:26 +08:00 |
|
孙广明
|
7473080790
|
Merge branch '230' into 'sprint/zentaopms230'
* Finish taks #67403
See merge request easycorp/zentaopms!5234
|
2022-09-01 05:12:58 +00:00 |
|
liuyongkai
|
29c53164b3
|
* Finish task #67403.
|
2022-09-01 05:11:55 +00:00 |
|
wangyidong
|
2b237ea8e3
|
* fix bug for assignTo for linea task.
|
2022-09-01 11:23:12 +08:00 |
|
王怡栋
|
e4b0527659
|
Merge branch 'master_liuhong_66217' into 'master'
*Finish task #66217,66218,66210 Fix bug 26687,26632,26622,26619.
See merge request easycorp/zentaopms!5193
|
2022-09-01 01:59:33 +00:00 |
|
liuyongkai
|
fbd3f09a3d
|
* Finish task 65047.
|
2022-09-01 01:38:38 +00:00 |
|
liuhong
|
2a93c8cff5
|
*Fix bug #66217.
|
2022-09-01 01:11:22 +00:00 |
|
孙广明
|
c97f2057ed
|
Merge branch '230' into 'sprint/zentaopms230'
* Fix bug #27023.
See merge request easycorp/zentaopms!5221
|
2022-09-01 00:42:23 +00:00 |
|
liuyongkai
|
161f19e15a
|
* Finish task #67403.
|
2022-09-01 00:40:48 +00:00 |
|
sunguangming
|
ed3dec4d5f
|
* Fix bug #27023.
|
2022-09-01 08:40:23 +08:00 |
|
wangyidong
|
0095192c32
|
* fix bug for record estimate.
|
2022-08-31 16:49:21 +08:00 |
|
wangyidong
|
39ce15c672
|
* fix bug #27092.
|
2022-08-31 16:11:54 +08:00 |
|
wangyidong
|
1471e7fbb9
|
* fix bug #27011.
|
2022-08-31 15:38:22 +08:00 |
|
liuhong
|
83639aaa07
|
*Fix bug 66217
|
2022-08-31 06:58:11 +00:00 |
|
liuhong
|
b0c1f7c868
|
*Fix bug #66217.
|
2022-08-31 06:16:09 +00:00 |
|
liuhong
|
18d6ed7f2d
|
*Fix bug #66217.
|
2022-08-31 06:13:31 +00:00 |
|
sunguangming
|
5463a7e62c
|
* merge code.
|
2022-08-31 14:06:04 +08:00 |
|
wangyidong
|
49700f4923
|
* fix bug #27016.
|
2022-08-31 11:20:31 +08:00 |
|
wangyidong
|
82fa2a5ddb
|
* fix bug #27067.
|
2022-08-31 10:18:27 +08:00 |
|
liuhong
|
3dfd3ecfca
|
*Finish task #66217,66218,66210 Fix bug 26687,26632,26622,26619.
|
2022-08-30 04:08:38 +00:00 |
|