王怡栋
|
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
|
098e89233d
|
* fix bug.
|
2022-08-26 11:29:21 +08:00 |
|
wangyidong
|
b27b2c08fa
|
* adjust for change estimate.
|
2022-08-26 09:14:49 +08:00 |
|
wangyidong
|
d53b19e3a9
|
* adjust for delete estimate for multi task.
|
2022-08-25 22:34:39 +08:00 |
|
wangyidong
|
d59db04332
|
* fix bug.
|
2022-08-25 20:36:29 +08:00 |
|
wangyidong
|
232c669a4e
|
* adjust for check remove item.
|
2022-08-25 12:01:52 +08:00 |
|
tianshujie
|
c6220519b1
|
* Modify the required fields on the page for creating a task are incorrect.
|
2022-08-25 10:40:26 +08:00 |
|
sunguangming
|
f49d83f024
|
Merge branch '230' into sprint/zentaopms230
|
2022-08-25 09:59:07 +08:00 |
|
wangyidong
|
1ac7743874
|
* fix for change task mode.
|
2022-08-24 23:19:19 +08: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 |
|
wangyidong
|
313a594232
|
* code for task #65286.
|
2022-08-23 17:47:30 +08:00 |
|
wangyidong
|
fcc537bacc
|
* code for task #65286.
|
2022-08-23 17:26:04 +08:00 |
|
wangyidong
|
05d5d0054d
|
* code for task #65274.
|
2022-08-23 15:19:35 +08:00 |
|
wangyidong
|
19a2ef4ac8
|
* fix bug #26741.
|
2022-08-22 16:58:47 +08:00 |
|
zhouxudong
|
183e45ec05
|
* Optimization task #64884.
|
2022-08-22 05:12:58 +00:00 |
|
wangyidong
|
c8211237af
|
* code for task #65272.
|
2022-08-22 11:29:07 +08:00 |
|
wangyidong
|
4769b92f0c
|
* adjust for task #65271.
|
2022-08-22 11:13:42 +08:00 |
|
wangyidong
|
8ac2f02a8e
|
* code for task #65270.
|
2022-08-22 10:11:17 +08:00 |
|
wangyidong
|
5a61f56960
|
* adjust for start and finish linear task.
|
2022-08-19 15:47:24 +08:00 |
|
zhouxudong
|
c42f97c564
|
* Optimization task #64884.
|
2022-08-19 06:04:44 +00:00 |
|
wangyidong
|
426423881e
|
* code for task #65270.
|
2022-08-18 12:33:18 +08:00 |
|
wangyidong
|
ae326809cc
|
* adjust for start, assignto, finish task in linear task.
|
2022-08-17 21:15:36 +08:00 |
|
sunguangming
|
7f69b62231
|
* Code for task #65278.
|
2022-08-17 16:51:28 +08:00 |
|
sunguangming
|
6a1bb3f756
|
* Code for task #65278.
|
2022-08-17 16:13:26 +08:00 |
|
wangyidong
|
6d987182a8
|
* change for multi task teams.
|
2022-08-17 16:01:41 +08:00 |
|
王怡栋
|
dd1761b300
|
Merge branch 'sprint/229_zhouxudong_64884' into 'sprint/229'
* Finish task #64884.
See merge request easycorp/zentaopms!4992
|
2022-08-17 07:29:08 +00:00 |
|
wangyidong
|
aa4fd1de10
|
* adjust for linear task.
|
2022-08-17 13:07:33 +08:00 |
|
zhouxudong
|
ab7e863b62
|
* Finish task #64884.
|
2022-08-17 01:03:45 +00:00 |
|
wangyidong
|
95ef309921
|
* code for task #65279.
|
2022-08-16 13:39:25 +08:00 |
|
zhouxudong
|
c322d1cea5
|
* Finish task #64877.
|
2022-08-15 12:59:27 +00:00 |
|
tianshujie
|
93d0a62707
|
* Finish task #63692.
|
2022-08-09 11:47:27 +08:00 |
|
王怡栋
|
378fb33899
|
Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112
See merge request easycorp/zentaopms!4687
|
2022-07-27 08:59:23 +00:00 |
|
zenggang
|
56b4e30328
|
* Code for task#61964
|
2022-07-27 06:45:26 +00:00 |
|
tianshujie
|
e73517cfc0
|
* Modify the style of the task view page return button.
|
2022-07-26 09:16:28 +08:00 |
|
chaideqing
|
3fc3cf64e0
|
* remove zentao card's top-right button
|
2022-07-26 09:12:42 +08:00 |
|
liumengyi
|
96c59fdf52
|
* Fix bug #24337.
|
2022-07-21 10:22:00 +08:00 |
|
liumengyi
|
72ed2599d1
|
* Fix bug #25230.
|
2022-07-21 09:22:20 +08:00 |
|
王怡栋
|
393a7466a1
|
Merge branch 'master_xieqiyu_25038' into 'master'
* Fix bug#25038.
See merge request easycorp/zentaopms!4580
|
2022-07-15 07:10:20 +00:00 |
|
孙广明
|
900e2342a2
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4582
|
2022-07-15 06:16:50 +00:00 |
|
tianshujie
|
656cc5f060
|
* Fix bug #25321.
|
2022-07-15 14:07:32 +08:00 |
|
xieqiyu
|
12d9c215ee
|
* Fix bug#25038.
|
2022-07-15 13:58:53 +08:00 |
|
王怡栋
|
7e682c99c2
|
Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110
See merge request easycorp/zentaopms!4563
|
2022-07-15 03:17:39 +00:00 |
|
liumengyi
|
5fe08a5c14
|
* Fix bug #25336.
|
2022-07-15 10:10:45 +08:00 |
|
孙广明
|
4617c3a040
|
Merge branch 'fixbug_25202' into 'master'
fixbug_25202
See merge request easycorp/zentaopms!4564
|
2022-07-15 01:22:47 +00:00 |
|