 田淑杰
|
f6d750c01a
|
Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
# module/my/view/task.html.php
# www/theme/default/style.css
|
2022-10-10 08:43:18 +00:00 |
|
|
tianshujie
|
ff6c9221cb
|
* Finish task #71904.
|
2022-10-10 16:14:45 +08:00 |
|
|
tianshujie
|
e9ebed5a6e
|
* Finish task #71904.
|
2022-10-10 11:28:31 +08:00 |
|
|
王怡栋
|
0b569126ea
|
Merge branch 'master_26245' into 'master'
* The execution logic to which the update task belongs when it is newly created.
See merge request easycorp/zentaopms!5680
|
2022-10-10 03:13:59 +00:00 |
|
|
liuhong
|
7571484ba7
|
*Adjust code for bug #26245.
|
2022-10-10 03:11:30 +00:00 |
|
|
tianshujie
|
9eac41d7e3
|
* Finish task #71895.
|
2022-10-10 10:36:39 +08:00 |
|
|
tianshujie
|
6c39ac6ba5
|
* Finish task #71899.
|
2022-10-10 09:49:54 +08:00 |
|
|
liuhong
|
1d1ae03b95
|
* The execution logic to which the update task belongs when it is newly created.
|
2022-10-09 03:20:04 +00:00 |
|
|
liuyongkai
|
6422b24d96
|
* Resolve feedback #938.
|
2022-10-08 01:40:04 +00:00 |
|
|
wangyidong
|
fd1c722af1
|
* fix bug #28075.
|
2022-09-30 14:58:57 +08:00 |
|
|
孙广明
|
9c5e3353e6
|
Merge branch 'lyk_27556' into 'master'
* Fix bug #27556.
See merge request easycorp/zentaopms!5615
|
2022-09-29 06:43:24 +00:00 |
|
|
liuyongkai
|
11448f3cee
|
* Fix bug #27556.
|
2022-09-29 06:39:47 +00:00 |
|
|
liuyongkai
|
2b815f88c1
|
* Fix bug #27556.
|
2022-09-29 06:09:50 +00:00 |
|
|
王怡栋
|
fe8d365582
|
Merge branch 'master_27982' into 'master'
Master 27982
See merge request easycorp/zentaopms!5602
|
2022-09-29 05:50:26 +00: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 |
|
|
liuhong
|
46fb56826d
|
*adjust code.
|
2022-09-28 14:00:58 +00:00 |
|
|
liuhong
|
66e1043907
|
*adjust code.
|
2022-09-28 13:59:11 +00:00 |
|
|
liuhong
|
491227bfaa
|
*Adjust code for ditto format.
|
2022-09-28 13:53:45 +00:00 |
|
|
liuhong
|
419e054101
|
*Fix bug #27982 and Adjust code.
|
2022-09-28 07:38:07 +00:00 |
|
|
tianshujie
|
4778db197d
|
* Finish task #70017.
|
2022-09-28 13:39:06 +08:00 |
|
|
tianshujie
|
7b2980726e
|
Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244
|
2022-09-28 11:59:37 +08:00 |
|
|
李玉春
|
d401ef9626
|
Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015
See merge request easycorp/zentaopms!5577
|
2022-09-28 03:25:16 +00:00 |
|
|
tianshujie
|
90946ab3d0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244
|
2022-09-28 09:23:23 +08:00 |
|
|
胡方舟
|
a95042508e
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!5564
|
2022-09-27 05:51:26 +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 |
|
|
tianshujie
|
061d5050f7
|
* Adjust the record effort style.
|
2022-09-27 13:24:14 +08:00 |
|
|
王怡栋
|
272838612f
|
Merge branch 'master_26245' into 'master'
*Fix bug #26245.
See merge request easycorp/zentaopms!5543
|
2022-09-27 02:24:11 +00:00 |
|
|
liuhong
|
a7980a4852
|
*Update code logic.
|
2022-09-27 02:15:22 +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 |
|
|
liuhong
|
3501b84719
|
*Adjust code.
|
2022-09-27 00:59:14 +00:00 |
|
|
tianshujie
|
36744c5175
|
* Adjust the record effort style.
|
2022-09-27 08:32:17 +08:00 |
|
|
tianshujie
|
fa4fee7fbb
|
* Fix bug #27949.
|
2022-09-26 16:54:36 +08:00 |
|
|
tianshujie
|
e479767a69
|
* Adjust the record effort style.
|
2022-09-26 15:28:05 +08:00 |
|
|
sunguangming
|
ac8f6c9413
|
* Code for task effort bug.
|
2022-09-26 14:50:04 +08:00 |
|
|
liuhong
|
fd0b159b62
|
*Fix bug #26245.
|
2022-09-26 06:08:46 +00:00 |
|
|
tianshujie
|
e82f1f6d6a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_bug
|
2022-09-26 08:12:31 +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 |
|
|
tianshujie
|
dfe1c9dc39
|
* Fix bug #27875.
|
2022-09-23 15:54:04 +08: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 |
|
|
王怡栋
|
423dfcd7e9
|
Merge branch 'cyy_bug' into 'master'
* Modify edit multi task.
See merge request easycorp/zentaopms!5512
|
2022-09-23 05:50:19 +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 |
|
|
dingyongliang
|
09e50c54e8
|
* task #70014, rm zebra bg.
|
2022-09-23 05:35:11 +00:00 |
|
|
曹延义
|
8ce8855258
|
* Modify edit multi task.
|
2022-09-23 11:52:00 +08:00 |
|
|
曹延义
|
5667c2cade
|
* Fix bug #27854.
|
2022-09-23 11:22:36 +08:00 |
|
|
tianshujie
|
6f599fad75
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008
|
2022-09-23 10:26:29 +08:00 |
|
|
tianshujie
|
6a7c69e14e
|
* Finish task #70008.
|
2022-09-23 10:22:32 +08:00 |
|