曹延义
|
0afdc68654
|
Merge branch 'master' into zenops_46
|
2022-09-30 15:07:37 +08:00 |
|
liyuchun
|
6bed7509e7
|
Merge branch 'master' into zenops_46
|
2022-09-29 09:25:12 +08:00 |
|
曹延义
|
feb98f882c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug
|
2022-09-29 09:16:40 +08:00 |
|
曹延义
|
480f5db2d0
|
* Modify multi task estimate order.
|
2022-09-29 09:08:19 +08:00 |
|
曹延义
|
5a652d9ef6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244
|
2022-09-28 15:57:00 +08:00 |
|
liuhong
|
a7980a4852
|
*Update code logic.
|
2022-09-27 02:15:22 +00:00 |
|
曹延义
|
0911d16112
|
* Code for task #70495.
|
2022-09-27 09:59:14 +08:00 |
|
liuhong
|
3501b84719
|
*Adjust code.
|
2022-09-27 00:59:14 +00:00 |
|
liuhong
|
fd0b159b62
|
*Fix bug #26245.
|
2022-09-26 06:08:46 +00:00 |
|
hufangzhou
|
2b85f8cd1a
|
* Use the php to operate cookie for safe.
|
2022-09-22 09:41:53 +08:00 |
|
hufangzhou
|
0dad4d834f
|
* Handle feedback #863.
|
2022-09-21 09:46:38 +08:00 |
|
liyuchun
|
bf10b415df
|
Merge branch 'zenops_44' into zenops_46
|
2022-09-20 08:33:44 +08:00 |
|
wangyidong
|
47a855e35f
|
Merge branch 'sprint/wangyidong_bug'
|
2022-09-19 13:48:27 +08:00 |
|
wangyidong
|
bb9aa91422
|
* adjust for finish page style.
|
2022-09-14 17:34:28 +08:00 |
|
wangyidong
|
09694f3751
|
* adjust for edit effort.
|
2022-09-13 13:37:13 +08:00 |
|
wangyidong
|
6c04f3fee3
|
* ajax reload for effort.
|
2022-09-13 08:41:50 +08:00 |
|
wangyidong
|
0881e39c54
|
* adjust for multi task.
|
2022-09-09 16:14:08 +08:00 |
|
曹延义
|
d5fa809755
|
Merge branch 'master' into zenops_44
|
2022-09-09 10:59:26 +08:00 |
|
xieqiyu
|
ea1b08905c
|
* Fix bug#27124.
|
2022-09-09 08:19:44 +08:00 |
|
xieqiyu
|
80ff723165
|
* Code for task#67691.
|
2022-09-07 16:58:54 +08:00 |
|
曹延义
|
2014a4b0ba
|
Merge branch 'master' into zenops_44
|
2022-09-07 06:51:46 +00:00 |
|
wangyidong
|
6972110d54
|
* adjust for delete estimate.
|
2022-09-05 20:21:18 +08:00 |
|
wangyidong
|
86ebfc0480
|
* fix bug #27262.
|
2022-09-05 11:30:25 +08:00 |
|
liyuchun
|
5f04a8d798
|
Merge branch 'master' into zenops_44
|
2022-09-05 09:29:53 +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 |
|
sunguangming
|
d5ee1ab4f3
|
* Merge task estimate to effort.
|
2022-09-02 13:52:56 +08:00 |
|
wangyidong
|
d1cb72d4a2
|
* code for task #67405.
|
2022-09-02 10:49:29 +08:00 |
|
wangyidong
|
e7d65e1dce
|
Merge branch 'sprint/zentaopms230'
|
2022-09-01 13:28:26 +08:00 |
|
wangyidong
|
39ce15c672
|
* fix bug #27092.
|
2022-08-31 16:11:54 +08:00 |
|
sunguangming
|
5463a7e62c
|
* merge code.
|
2022-08-31 14:06:04 +08:00 |
|
caoyanyi
|
20d6ee9e10
|
Merge branch 'master' into zenops_44
|
2022-08-30 16:39:58 +08:00 |
|
wangyidong
|
11c3ef03cc
|
* adjust for delete estimate.
|
2022-08-26 22:14:53 +08:00 |
|
tianshujie
|
eb6b6b061f
|
* Fix bug #26950.
|
2022-08-26 15:34:18 +08:00 |
|
tianshujie
|
ae8f299b55
|
* Fix bug #26950.
|
2022-08-26 15:25:17 +08:00 |
|
王怡栋
|
3eaf146f25
|
Merge branch 'sprint/zentaopms230' into '230'
# Conflicts:
# module/task/model.php
|
2022-08-26 06:52:24 +00:00 |
|
wangyidong
|
3a5f4201ed
|
* adjust for multi task.
|
2022-08-26 14:50:48 +08:00 |
|
王怡栋
|
662f428288
|
Merge branch 'sprint/zentaopms230' into '230'
# Conflicts:
# module/task/control.php
|
2022-08-26 06:39:53 +00:00 |
|
sunguangming
|
a27dc9a3f2
|
* Code for mulit task.
|
2022-08-26 14:33:50 +08:00 |
|
liyuchun
|
33e0de2cdc
|
Merge branch 'zenops_44' into liyuchun_65983
|
2022-08-26 14:28:47 +08:00 |
|
liyuchun
|
61c88f627c
|
* Finish task #65979,65978,65977.
|
2022-08-26 14:06:01 +08:00 |
|
wangyidong
|
d9b1aa5e8d
|
* adjust for finish.
|
2022-08-25 13:25:58 +08:00 |
|
sunguangming
|
f49d83f024
|
Merge branch '230' into sprint/zentaopms230
|
2022-08-25 09:59:07 +08:00 |
|
王怡栋
|
1092812a40
|
Merge branch 'master_liuhong_26725' into 'master'
*Fix bug #26725.
See merge request easycorp/zentaopms!5049
|
2022-08-25 01:05:32 +00:00 |
|
wangyidong
|
c0467f2b7d
|
* adjust for activate task.
|
2022-08-24 22:20:54 +08:00 |
|
sunguangming
|
01172dd284
|
* Code for muliple task.
|
2022-08-24 16:05:21 +08:00 |
|
liuhong
|
d9c174f921
|
*Fix bug #26725.
|
2022-08-24 01:09:11 +00:00 |
|
liuhong
|
8b12d60a3b
|
*Fix bug #26275.
|
2022-08-23 20:29:32 +00:00 |
|
wangyidong
|
fcc537bacc
|
* code for task #65286.
|
2022-08-23 17:26:04 +08:00 |
|
liuhong
|
4d20bd7bf4
|
*Fix bug #26725.
|
2022-08-22 06:31:23 +00:00 |
|