 tanghucheng
|
f017fddb67
|
* Add gantt icon.
|
2022-11-10 15:37:08 +08:00 |
|
|
王怡栋
|
e8f50c14c6
|
Merge branch 'sprint/chaideqing/feedback#893' into 'master'
* Fix feedback #893.
See merge request easycorp/zentaopms!6107
|
2022-11-10 07:26:02 +00:00 |
|
|
Yagami
|
03fc112e9f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-10 15:25:51 +08:00 |
|
|
Yagami
|
a97b9ea972
|
* Finish task #75355.
|
2022-11-10 15:25:40 +08:00 |
|
|
王怡栋
|
c9291ba5f9
|
Merge branch 'zentaopms_258_task_#75242' into 'master'
* Finish task #75242.
See merge request easycorp/zentaopms!6108
|
2022-11-10 07:25:30 +00:00 |
|
|
wangyidong
|
126d55f807
|
* code task #74929.
|
2022-11-10 15:19:57 +08:00 |
|
|
daitingting
|
1f949f1b3f
|
* Finish task #75242.
|
2022-11-10 07:15:23 +00:00 |
|
|
chaideqing
|
50eea5b6be
|
* Fix feedback #893.
|
2022-11-10 14:30:02 +08:00 |
|
|
王怡栋
|
3beb994fe8
|
Merge branch 'master_bug_29451' into 'master'
* Fix bug #29451
See merge request easycorp/zentaopms!6095
|
2022-11-10 06:24:33 +00:00 |
|
|
王怡栋
|
fc2d6509a5
|
Merge branch 'zentaopms_258_fix_bug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!6099
|
2022-11-10 06:24:15 +00:00 |
|
|
王怡栋
|
759d18bf43
|
Merge branch 'sprint/ZUI_guofeilong_updateIcon_gantt-alt' into 'master'
+ ZUI: add icon gantt-alt
See merge request easycorp/zentaopms!6105
|
2022-11-10 06:24:01 +00:00 |
|
|
王怡栋
|
e66d842cf9
|
Merge branch 'zentaopms258_wyd' into 'master'
Zentaopms258 wyd
See merge request easycorp/zentaopms!6106
|
2022-11-10 06:23:42 +00:00 |
|
|
wangyidong
|
ca0d6b9c36
|
* code for task #75247.
|
2022-11-10 14:18:38 +08:00 |
|
|
wangyidong
|
b8c4c2bb9d
|
* code for task #75426,75427.
|
2022-11-10 14:13:29 +08:00 |
|
|
guofeilong
|
f6bd7c11dc
|
+ ZUI: add icon gantt-alt
|
2022-11-10 06:01:07 +00:00 |
|
|
朱金勇
|
8d45e689af
|
Merge branch 'ta_liyang' into 'master'
* Add custom test data.
See merge request easycorp/zentaopms!6101
|
2022-11-10 05:29:12 +00:00 |
|
|
wangyidong
|
8ca97ef86e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-10 12:10:37 +08:00 |
|
|
wangyidong
|
e2cf4aa1be
|
* fix bug #29534.
|
2022-11-10 12:09:14 +08:00 |
|
|
wangyidong
|
2e6e289f1a
|
* fix bug #29528.
|
2022-11-10 12:08:21 +08:00 |
|
|
liyang
|
9682ec1923
|
* Add custom test data.
|
2022-11-10 11:16:34 +08:00 |
|
|
孙广明
|
50614c2640
|
Merge branch 'mayue_fix_bug#27324' into 'master'
* Fix bug #27324.
See merge request easycorp/zentaopms!6100
|
2022-11-10 03:15:09 +00:00 |
|
|
mayue
|
a9e282e760
|
* Fix bug #27324.
|
2022-11-10 11:09:27 +08:00 |
|
|
孙广明
|
3ea6ada0b5
|
Merge branch 'master_xieqiyu_fixTips' into 'master'
* Modify tips of batch change plan.
See merge request easycorp/zentaopms!6096
|
2022-11-10 02:49:34 +00:00 |
|
|
daitingting
|
6868b09d1a
|
* Fix bug.
|
2022-11-10 02:20:59 +00:00 |
|
|
Yagami
|
7ec0c9581f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-10 09:46:35 +08:00 |
|
|
Yagami
|
7bd15c19ce
|
* Fix bug #75356.
|
2022-11-10 09:46:25 +08:00 |
|
|
王怡栋
|
97d2ccf52d
|
Merge branch 'bug_29460' into 'master'
* Fix bug #29460
See merge request easycorp/zentaopms!6090
|
2022-11-10 01:24:19 +00:00 |
|
|
王怡栋
|
9e45c0494f
|
Merge branch 'zentaopms258_wyd' into 'master'
* code for task #75244,75245.
See merge request easycorp/zentaopms!6097
|
2022-11-10 01:23:40 +00:00 |
|
|
wangyidong
|
bf822c7283
|
* code for task #75244,75245.
|
2022-11-10 09:22:08 +08:00 |
|
|
xieqiyu
|
bf01ea3844
|
* Modify tips of batch change plan.
|
2022-11-10 01:08:52 +00:00 |
|
|
孙广明
|
d91a599f1f
|
Merge branch 'sprint/tianshujie_css' into 'master'
* Modified the way text overruns are displayed in flowcart.
See merge request easycorp/zentaopms!6094
|
2022-11-10 00:24:37 +00:00 |
|
|
tianshujie
|
e3ea28a384
|
* Modified the way text overruns are displayed in flowcart.
|
2022-11-10 08:20:05 +08:00 |
|
|
wangyidong
|
d60d0cbb6d
|
Merge branch 'zentaopms_258_task_#75241'
|
2022-11-09 16:21:08 +08:00 |
|
|
代婷婷
|
f20193b36c
|
Merge branch 'master' into 'zentaopms_258_task_#75241'
# Conflicts:
# module/release/control.php
|
2022-11-09 08:07:44 +00:00 |
|
|
王怡栋
|
a902aad93e
|
Merge branch 'zentaopms_258_task#74157' into 'master'
* Finish task #74157.
See merge request easycorp/zentaopms!6088
|
2022-11-09 08:03:49 +00:00 |
|
|
王怡栋
|
bc5762d8a7
|
Merge branch 'zentaopms_258_task_#75240' into 'master'
* Finish task #75240.
See merge request easycorp/zentaopms!6087
|
2022-11-09 08:02:53 +00:00 |
|
|
王怡栋
|
cc1f2d36d1
|
Merge branch 'transfer' into 'master'
* Change port to transfer.
See merge request easycorp/zentaopms!6091
|
2022-11-09 08:01:00 +00:00 |
|
|
王怡栋
|
d8b1b0ba39
|
Merge branch 'zentaopms_258_task#75248' into 'master'
* Finish task #75248.
See merge request easycorp/zentaopms!6082
|
2022-11-09 08:00:04 +00:00 |
|
|
daitingting
|
4632027f9c
|
* Finish task #75241.
|
2022-11-09 07:58:34 +00:00 |
|
|
liugang
|
ce1458946e
|
* Fix bug of generate the view link of user story in search-index page.
|
2022-11-09 15:49:01 +08:00 |
|
|
zenggang
|
fd5682fbdc
|
* Fix bug #29460
|
2022-11-09 07:48:08 +00:00 |
|
|
tanghucheng
|
e09a070318
|
* Merge branch 'master' into transfer.
|
2022-11-09 15:44:42 +08:00 |
|
|
孙广明
|
253f9bb83a
|
Merge branch 'sprint/scx_deptapi' into 'master'
*Fix api cannot use bug.
See merge request easycorp/zentaopms!6079
|
2022-11-09 07:39:55 +00:00 |
|
|
孙广明
|
13e66e8175
|
Merge branch 'sprint/scx_testresutapi' into 'master'
Sprint/scx testresutapi
See merge request easycorp/zentaopms!6089
|
2022-11-09 07:32:27 +00:00 |
|
|
孙广明
|
c49e9f3017
|
Merge branch 'master_xieqiyu_75321' into 'master'
* Finish task#75321.
See merge request easycorp/zentaopms!6086
|
2022-11-09 07:32:07 +00:00 |
|
|
宋辰轩
|
1e4e66b590
|
* Modify function name.
|
2022-11-09 14:23:49 +08:00 |
|
|
宋辰轩
|
9d25f1af1c
|
* Modify return .
|
2022-11-09 14:21:15 +08:00 |
|
|
宋辰轩
|
25fec30f8b
|
* Fix bug for testresult api.
|
2022-11-09 14:19:37 +08:00 |
|
|
daitingting
|
8125b5bf8b
|
* Finish task #75240.
|
2022-11-09 06:13:07 +00:00 |
|
|
wangyuting
|
2c336ec7dd
|
* Finish task #74157.
|
2022-11-09 06:02:58 +00:00 |
|