 王怡栋
|
fe8d365582
|
Merge branch 'master_27982' into 'master'
Master 27982
See merge request easycorp/zentaopms!5602
|
2022-09-29 05:50:26 +00:00 |
|
|
曹延义
|
480f5db2d0
|
* Modify multi task estimate order.
|
2022-09-29 09:08:19 +08:00 |
|
|
liuhong
|
419e054101
|
*Fix bug #27982 and Adjust code.
|
2022-09-28 07:38:07 +00:00 |
|
|
李玉春
|
af0256eecb
|
Merge branch 'sprint/cyy_task' into 'sprint/244'
* Modify language.
See merge request easycorp/zentaopms!5554
|
2022-09-27 05:25:12 +00:00 |
|
|
曹延义
|
f74af95c5e
|
* Adjust code.
|
2022-09-27 10:04:34 +08:00 |
|
|
曹延义
|
0911d16112
|
* Code for task #70495.
|
2022-09-27 09:59:14 +08:00 |
|
|
tianshujie
|
fa4fee7fbb
|
* Fix bug #27949.
|
2022-09-26 16:54:36 +08:00 |
|
|
朱金勇
|
d3911c77e6
|
Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug
See merge request easycorp/zentaopms!5518
|
2022-09-23 16:05:19 +00:00 |
|
|
王怡栋
|
bb5b178c49
|
Merge branch 'master_liuhong_27190' into 'master'
*Fix bug #27190.
See merge request easycorp/zentaopms!5516
|
2022-09-23 05:52:56 +00:00 |
|
|
tianshujie
|
a20a8b6cdf
|
* Fix bug #27871.
|
2022-09-23 13:49:57 +08:00 |
|
|
liuhong
|
047cd27da8
|
*Fix bug #27190 for adjust code.
|
2022-09-23 05:43:34 +00:00 |
|
|
liuhong
|
9f309bdeab
|
*Fix bug #27190.
|
2022-09-23 05:39:06 +00:00 |
|
|
曹延义
|
8ce8855258
|
* Modify edit multi task.
|
2022-09-23 11:52:00 +08:00 |
|
|
王怡栋
|
16d1f76ca0
|
Merge branch 'sprint/cyy_optimize' into 'master'
* Optimize record estimate style.
See merge request easycorp/zentaopms!5499
|
2022-09-23 02:04:15 +00:00 |
|
|
曹延义
|
a02d6c751e
|
* Optimize record style.
|
2022-09-23 09:46:31 +08:00 |
|
|
tianshujie
|
3d210a3666
|
* Finish task #70098.
|
2022-09-23 09:15:01 +08:00 |
|
|
tianshujie
|
6fd346708e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_task
|
2022-09-23 08:08:42 +08:00 |
|
|
tianshujie
|
a6cd4e549c
|
* Finish task #70094.
|
2022-09-22 18:13:50 +08:00 |
|
|
tianshujie
|
4908ead6e8
|
* Finish task #70098.
|
2022-09-22 18:03:03 +08:00 |
|
|
tianshujie
|
52fb3e71f7
|
* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.
|
2022-09-22 16:58:27 +08:00 |
|
|
曹延义
|
e500e05598
|
* Finish task #70093.
|
2022-09-22 16:21:56 +08:00 |
|
|
曹延义
|
b82fe4e667
|
* Finish task #70099.
|
2022-09-22 16:00:42 +08:00 |
|
|
曹延义
|
0ece96c860
|
* Finish task #70100.
|
2022-09-22 15:23:18 +08:00 |
|
|
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 |
|