 caoyanyi
|
63ff47ead8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 14:12:30 +08:00 |
|
|
caoyanyi
|
617cc3767e
|
* Fix bug #32197.
|
2023-02-16 13:46:31 +08:00 |
|
|
王怡栋
|
3b777eeb4e
|
Merge branch 'sprint/feedback2203' into 'master'
* Fix feedback feedback2204.
See merge request easycorp/zentaopms!6970
|
2023-02-16 05:08:28 +00:00 |
|
|
chaideqing
|
b3eeb70b26
|
* Fix feedback feedback2204.
|
2023-02-16 11:59:17 +08:00 |
|
|
caoyanyi
|
b478779676
|
* Fix bug #32184,32192,32193.
|
2023-02-16 11:09:18 +08:00 |
|
|
tianshujie
|
2a388d06a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-16 09:00:16 +08:00 |
|
|
胡方舟
|
d2de5abe26
|
Merge branch 'zenops_61' into 'master'
* Fix delete node fail.
See merge request easycorp/zentaopms!6967
zentaopms_18.1
|
2023-02-16 00:20:13 +00:00 |
|
|
zhaoke
|
eee007f88f
|
* Fix delete node fail.
|
2023-02-15 17:43:14 +08:00 |
|
|
王怡栋
|
3a6bca8dc2
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix project extend priv bug.
See merge request easycorp/zentaopms!6966
|
2023-02-15 09:22:38 +00:00 |
|
|
朱金勇
|
004ab38be6
|
Merge branch 'sprint/hufangzhou_changeCompanyName' into 'master'
* Change the Easy Soft to ZenTao Software.
See merge request easycorp/zentaopms!6965
|
2023-02-15 09:20:48 +00:00 |
|
|
wangyuting2
|
a86eb599d9
|
* Fix project extend priv bug.
|
2023-02-15 17:20:35 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
王怡栋
|
9393ee5558
|
Merge branch 'ticket_bug_366' into 'master'
* Resolved feedback 2191.
See merge request easycorp/zentaopms!6963
|
2023-02-15 07:26:56 +00:00 |
|
|
王怡栋
|
051a5b4bd9
|
Merge branch 'master_xieqiyu_32169' into 'master'
* Code for bug#32169.
See merge request easycorp/zentaopms!6962
|
2023-02-15 07:26:24 +00:00 |
|
|
xieqiyu
|
8de570fedf
|
* Code for bug#32169.
|
2023-02-15 14:51:58 +08:00 |
|
|
liuhong
|
a767115e92
|
* Resolved feedback 2191.
|
2023-02-15 06:16:55 +00:00 |
|
|
王怡栋
|
1d8546b946
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Adjust edit story plan css
See merge request easycorp/zentaopms!6961
|
2023-02-15 06:10:41 +00:00 |
|
|
刘刚
|
8b57ace39a
|
Merge branch 'lyk_bug_32163' into 'master'
* Fix bug #32163. feedback #2170.
See merge request easycorp/zentaopms!6960
|
2023-02-15 06:02:04 +00:00 |
|
|
liuyongkai
|
088962b4f3
|
* Fix bug #32163. feedback #2170.
|
2023-02-15 13:54:01 +08:00 |
|
|
lanzongjun
|
3038649d34
|
* Adjust edit story plan css
|
2023-02-15 13:49:28 +08:00 |
|
|
Yagami
|
b903cd3828
|
* Fix bug #32160.
|
2023-02-15 13:27:42 +08:00 |
|
|
王怡栋
|
255472632b
|
Merge branch 'mayue_fix_bug#32147' into 'master'
* Fix bug #32147.
See merge request easycorp/zentaopms!6959
|
2023-02-15 05:03:23 +00:00 |
|
|
Yagami
|
874710e7c4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-15 11:31:55 +08:00 |
|
|
Yagami
|
a9d56a3f77
|
* Fix bug #32159.
|
2023-02-15 11:31:42 +08:00 |
|
|
mayue
|
a681b0d23b
|
* Fix bug #32147.
|
2023-02-15 11:24:38 +08:00 |
|
|
王怡栋
|
7fd253551a
|
Merge branch 'sprint/tsj_fixbug' into 'sprint/285'
Sprint/tsj fixbug
See merge request easycorp/zentaopms!6956
|
2023-02-15 03:23:57 +00:00 |
|
|
王怡栋
|
3c9f973aef
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug #32145.
See merge request easycorp/zentaopms!6955
|
2023-02-15 03:23:18 +00:00 |
|
|
胡方舟
|
6455f4847f
|
Merge branch 'feature/master/sonar_migrate' into 'master'
* Change CI configuration.
See merge request easycorp/zentaopms!6957
|
2023-02-15 03:16:37 +00:00 |
|
|
陈涛
|
8574f461f7
|
* Change CI configuration.
|
2023-02-15 11:08:37 +08:00 |
|
|
tianshujie
|
a4b92cc43b
|
* Modify the plug-in description.
|
2023-02-15 10:20:39 +08:00 |
|
|
tianshujie
|
2b82314b52
|
* Fix bug #32145.
|
2023-02-15 10:08:15 +08:00 |
|
|
孙广明
|
3ee59db92c
|
Merge branch 'zhouxin_feedback_2213' into 'master'
* Resolve feedback #2213.
See merge request easycorp/zentaopms!6953
|
2023-02-15 02:01:16 +00:00 |
|
|
tianshujie
|
f7805a0d47
|
* Fix bug #32143.
|
2023-02-15 09:52:22 +08:00 |
|
|
zhouxin
|
576c422a96
|
* Resolve feedback #2213.
|
2023-02-15 09:43:56 +08:00 |
|
|
王怡栋
|
1f87384b9b
|
Merge branch 'cyy_repo_bug' into 'master'
* Modify commit link object error.
See merge request easycorp/zentaopms!6952
|
2023-02-15 01:13:05 +00:00 |
|
|
caoyanyi
|
15f9047883
|
* Modify commit link object error.
|
2023-02-15 09:10:26 +08:00 |
|
|
孙广明
|
bd7084c8b5
|
Merge branch 'zenops_61' into 'master'
Zenops 61
See merge request easycorp/zentaopms!6951
|
2023-02-15 00:35:50 +00:00 |
|
|
zhaoke
|
807971cb91
|
* Renmove console.
|
2023-02-15 00:33:15 +00:00 |
|
|
tianshujie
|
b2fef4f696
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-15 08:19:27 +08:00 |
|
|
zhaoke
|
a2c3fee694
|
* Fix bug #32141.
|
2023-02-14 10:33:32 +00:00 |
|
|
hufangzhou
|
2aec80f62c
|
* Fix bug #32140.
|
2023-02-14 17:36:21 +08:00 |
|
|
王怡栋
|
e7991dcc5f
|
Merge branch 'ticket_369' into 'master'
* Adjust code for feedback #2187.
See merge request easycorp/zentaopms!6946
|
2023-02-14 08:09:40 +00:00 |
|
|
王怡栋
|
39388b32f7
|
Merge branch 'sprint/hufangzhou_fixlang' into 'master'
* Adjust the lang.
See merge request easycorp/zentaopms!6948
|
2023-02-14 08:03:56 +00:00 |
|
|
王怡栋
|
2c1a4b6113
|
Merge branch 'sprint/hufangzhou_bug_32104' into 'master'
* Fix bug #32104.
See merge request easycorp/zentaopms!6947
|
2023-02-14 08:03:39 +00:00 |
|
|
hufangzhou
|
30a251154e
|
* Fix bug #31933.
|
2023-02-14 15:59:09 +08:00 |
|
|
wangyidong
|
f90041ca48
|
* code for task #83736.
|
2023-02-14 15:55:20 +08:00 |
|
|
王怡栋
|
48a2dc05bb
|
Merge branch 'dev/gfl_bug#32126' into 'master'
* Code for bug #32126.
See merge request easycorp/zentaopms!6949
|
2023-02-14 07:52:05 +00:00 |
|
|
guofeilong
|
dfa0267045
|
* Code for bug #32126.
|
2023-02-14 15:45:28 +08:00 |
|
|
hufangzhou
|
cc4b6d5310
|
* Adjust the lang.
|
2023-02-14 15:35:45 +08:00 |
|
|
caoyanyi
|
53a597e301
|
* Hide holiday import style.
|
2023-02-14 15:26:59 +08:00 |
|