 wangyuting
|
bb49320ee7
|
* Fix bug.
|
2022-11-11 07:07:17 +00:00 |
|
|
王怡栋
|
f758694397
|
Merge branch 'zentaopms_258_optimize_code' into 'master'
* Rename config->custom->feature.
See merge request easycorp/zentaopms!6119
|
2022-11-11 03:31:24 +00:00 |
|
|
王怡栋
|
ea0f94ca47
|
Merge branch 'sprint/wangzemei/theme' into 'master'
* fix bug 29464 29473
See merge request easycorp/zentaopms!6117
|
2022-11-11 02:54:43 +00:00 |
|
|
王怡栋
|
88253aa6d5
|
Merge branch 'zentaopms_258_bug#29562' into 'master'
* Finish task #29562.
See merge request easycorp/zentaopms!6116
|
2022-11-11 02:53:47 +00:00 |
|
|
daitingting
|
be40637a66
|
* Rename config->custom->feature.
|
2022-11-11 02:52:58 +00:00 |
|
|
wangyidong
|
8c3c3bc660
|
Merge branch 'zentaopms258_wyd'
|
2022-11-11 10:51:20 +08:00 |
|
|
王怡栋
|
66b9e6b116
|
Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
# framework/base/router.class.php
|
2022-11-11 02:49:32 +00:00 |
|
|
wangyidong
|
8a178c72fe
|
* adjust for project release link story and bug.
|
2022-11-11 10:47:01 +08:00 |
|
|
wangzemei
|
44f35e9827
|
* fix green
|
2022-11-11 10:45:12 +08:00 |
|
|
wangzemei
|
bd32b35659
|
* fix bug 29464 29473
|
2022-11-11 10:24:45 +08:00 |
|
|
wangyuting
|
152364d338
|
* Finish task #29562.
|
2022-11-11 02:12:03 +00:00 |
|
|
王怡栋
|
3c83b8dbcb
|
Merge branch 'fixbug' into 'master'
* Add gantt icon.
See merge request easycorp/zentaopms!6109
|
2022-11-11 01:57:19 +00:00 |
|
|
王怡栋
|
fe22184cd4
|
Merge branch 'zentaopms_258_bug#29593' into 'master'
* Fix bug #29593.
See merge request easycorp/zentaopms!6115
|
2022-11-11 01:57:04 +00:00 |
|
|
王怡栋
|
ca6c5eeb68
|
Merge branch 'zentaopms_258_task#75239' into 'master'
* Finish task #75239.
See merge request easycorp/zentaopms!6112
|
2022-11-11 01:56:45 +00:00 |
|
|
孙广明
|
1a65c652fc
|
Merge branch 'master_xieqiyu_29483' into 'master'
* Fix bug#29483.
See merge request easycorp/zentaopms!6114
|
2022-11-11 01:41:38 +00:00 |
|
|
孙广明
|
3b5f93bd66
|
Merge branch 'sprint/tianshujie_issue' into 'master'
Sprint/tianshujie issue
See merge request easycorp/zentaopms!6113
|
2022-11-11 01:40:09 +00:00 |
|
|
wangyuting
|
3c36bfbb70
|
* Fix bug #29593.
|
2022-11-11 01:38:47 +00:00 |
|
|
tianshujie
|
ea99f50a0a
|
* Fix bug #29361.
|
2022-11-11 09:36:10 +08:00 |
|
|
xieqiyu
|
318f8b7b31
|
* Fix bug#29483.
|
2022-11-11 01:32:38 +00:00 |
|
|
tianshujie
|
caaf32b57a
|
* Fix bug #29508.
|
2022-11-11 09:23:39 +08:00 |
|
|
tianshujie
|
0544c75976
|
* Modify the project list name display question.
|
2022-11-11 09:20:55 +08:00 |
|
|
tianshujie
|
2c75eaf8f6
|
* Modify the statistics of the plan list.
|
2022-11-11 09:04:31 +08:00 |
|
|
wangyuting
|
2f5e0ac70d
|
* Finish task #75239.
|
2022-11-11 00:46:54 +00:00 |
|
|
孙广明
|
3cc1a5f1ef
|
Merge branch 'mayue_fix_bug#29466' into 'master'
* Fix bug #29466.
See merge request easycorp/zentaopms!6103
|
2022-11-11 00:28:22 +00:00 |
|
|
孙广明
|
b21f84513b
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug
See merge request easycorp/zentaopms!6104
|
2022-11-11 00:28:11 +00:00 |
|
|
王怡栋
|
bca89293fb
|
Merge branch 'zentaopms_258_task_#75243' into 'master'
* Finish task #75243.
See merge request easycorp/zentaopms!6111
|
2022-11-10 08:31:57 +00:00 |
|
|
王怡栋
|
77280a9aad
|
Merge branch 'zentaopms_258_task#75237' into 'master'
Zentaopms 258 task#75237
See merge request easycorp/zentaopms!6110
|
2022-11-10 08:31:34 +00:00 |
|
|
daitingting
|
f3b21a7076
|
* Finish task #75243.
|
2022-11-10 08:27:04 +00:00 |
|
|
wangyuting
|
8559d77319
|
* Optimize code.
|
2022-11-10 08:09:17 +00:00 |
|
|
wangyuting
|
53dbe65eb8
|
* Fix noSprint project bug.
|
2022-11-10 07:52:58 +00:00 |
|
|
wangyidong
|
a5b9f374d1
|
* merge git stash.
|
2022-11-10 15:50:17 +08:00 |
|
|
wangyidong
|
6eae8345f7
|
* merge ztSessionHandler.
|
2022-11-10 15:47:05 +08:00 |
|
|
wangyuting
|
29bb8e22b6
|
* Add project build priv.
|
2022-11-10 07:40:52 +00:00 |
|
|
tanghucheng
|
f017fddb67
|
* Add gantt icon.
|
2022-11-10 15:37:08 +08:00 |
|
|
wangyuting
|
59fe4826ca
|
* Finish task #75237.
|
2022-11-10 07:36:35 +00: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 |
|
|
mayue
|
fc2ebb5b61
|
* Fix bug #29466.
|
2022-11-10 13:53:32 +08:00 |
|