 tianshujie
|
86929e218d
|
* Finish task #72348.
|
2022-10-18 09:21:07 +08:00 |
|
|
wangzemei
|
7075426106
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72349
|
2022-10-18 08:56:26 +08:00 |
|
|
李玉春
|
bb90adf795
|
Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug
See merge request easycorp/zentaopms!5759
|
2022-10-17 09:24:39 +00:00 |
|
|
wangzemei
|
5064fc3669
|
* update createTaskTeam style
|
2022-10-17 16:45:59 +08:00 |
|
|
wangzemei
|
72c1b4819e
|
* finish task #72349
|
2022-10-17 16:24:14 +08:00 |
|
|
tianshujie
|
f9b2fd0aff
|
* Fix bug #28531.
|
2022-10-17 15:46:56 +08:00 |
|
|
tianshujie
|
bafc9a6020
|
* Fix bug #28528.
|
2022-10-17 13:54:11 +08:00 |
|
|
liuhong
|
0e77b9f5e9
|
*Fix bug #28532.
|
2022-10-17 01:10:49 +00:00 |
|
|
李玉春
|
81ca878b03
|
Merge branch 'sprint/244_tianshujie_70498' into 'master'
Sprint/244 tianshujie 70498
See merge request easycorp/zentaopms!5730
|
2022-10-13 03:09:37 +00:00 |
|
|
曹延义
|
e29deea929
|
* Modify line width.
|
2022-10-11 17:03:40 +08:00 |
|
|
tianshujie
|
92692a6e9b
|
* Finish task #70498.
|
2022-10-11 16:07:34 +08:00 |
|
|
guofeilong
|
7716314f4a
|
* fix bug in trigger event finish
|
2022-10-11 08:00:24 +00:00 |
|
|
tianshujie
|
715aa2e4a4
|
* Finish task #70498.
|
2022-10-11 10:47:14 +08:00 |
|
|
tianshujie
|
9c05622f2f
|
* Finish task #70498.
|
2022-10-11 10:05:22 +08:00 |
|
|
wangyidong
|
91ae21caec
|
Merge branch 'master' into sprint/feedback_module
|
2022-10-11 09:33:25 +08:00 |
|
|
tianshujie
|
77a912f3d9
|
* Finish task #70498.
|
2022-10-11 09:22:32 +08:00 |
|
|
tianshujie
|
42fbc75fc3
|
* Finish task #70498.
|
2022-10-11 09:16:19 +08:00 |
|
|
tianshujie
|
294cbe7edc
|
* Finish task #70498.
|
2022-10-11 09:13:31 +08:00 |
|
|
tianshujie
|
7cbb6b9505
|
Merge branch 'sprint/244_tianshujie_70498' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498
|
2022-10-11 09:11:37 +08:00 |
|
|
tianshujie
|
6e1ebabb80
|
* Finish task #70498.
|
2022-10-11 09:11:21 +08:00 |
|
|
曹延义
|
29f8aad222
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498
|
2022-10-10 16:56:50 +08:00 |
|
|
田淑杰
|
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
|
42cc38b87d
|
Merge branch 'sprint/244_tianshujie_70498' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498
|
2022-10-10 16:20:25 +08:00 |
|
|
tianshujie
|
ff6c9221cb
|
* Finish task #71904.
|
2022-10-10 16:14:45 +08:00 |
|
|
wangyuting2
|
aa9bc2b8ec
|
* Fix systemMode bug.
|
2022-10-10 07:32:11 +00:00 |
|
|
wangzemei
|
f7a8569d2e
|
* modify team style
|
2022-10-10 13:30:35 +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 |
|
|
王怡栋
|
16ca720a08
|
Merge branch 'zentaopms_239_task#71576' into 'zentaopms_239'
* Finish task #71576,#71577,#71578,#71579.
See merge request easycorp/zentaopms!5684
|
2022-10-10 02:59:07 +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 |
|
|
wangyidong
|
a51f42e7b8
|
* code for task #71609.
|
2022-10-10 09:08:28 +08:00 |
|
|
daitingting
|
c800b4101b
|
* Finish task #71576,#71577,#71578,#71579.
|
2022-10-09 05:20:29 +00: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 |
|
|
wangyidong
|
9b403e8b64
|
* fix bug #28075.
|
2022-09-30 14:20:53 +08:00 |
|
|
tianshujie
|
1b6949c8fb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498
|
2022-09-30 10:52:47 +08:00 |
|
|
wangyidong
|
d300ee00da
|
Merge branch 'master' into zentaopms_239
|
2022-09-30 09:07:53 +08:00 |
|
|
tianshujie
|
e8757d4692
|
* Finish task #70498.
|
2022-09-29 14:51:52 +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 |
|