 王怡栋
|
38f31bc4d9
|
Merge branch 'zentaopms_289_gfl' into 'zentaopms_289'
* Code for add lang to langItem .
See merge request easycorp/zentaopms!6979
|
2023-02-17 00:37:35 +00:00 |
|
|
guofeilong
|
17c3ddbd21
|
* Code for add lang to langItem .
|
2023-02-17 08:33:51 +08:00 |
|
|
王怡栋
|
7f06ecb40c
|
Merge branch 'zentaopms_289_gfl' into 'zentaopms_289'
Zentaopms 289 gfl
See merge request easycorp/zentaopms!6978
|
2023-02-17 00:26:07 +00:00 |
|
|
guofeilong
|
0e840ae40f
|
* Code for change arr to navTypes
|
2023-02-16 16:48:15 +08:00 |
|
|
guofeilong
|
f66dadec57
|
* Code for fix conflict .
|
2023-02-16 16:42:52 +08:00 |
|
|
wangyidong
|
7c927412cc
|
* adjust code for langitem page.
|
2023-02-16 16:25:22 +08:00 |
|
|
wangyidong
|
9e1cfb2b25
|
* code for task #84532.
|
2023-02-16 14:53:30 +08:00 |
|
|
wangyidong
|
1b70d6e8a4
|
* code for task #84532.
|
2023-02-16 13:55:23 +08:00 |
|
|
guofeilong
|
5fee6b383b
|
* Code for handle Conflict.
|
2023-02-16 13:46:18 +08:00 |
|
|
guofeilong
|
ca3508d1df
|
* Code for add menuTree to langItem
|
2023-02-16 13:40:16 +08:00 |
|
|
wangyidong
|
bb1cc9d480
|
* code for task #84532.
|
2023-02-16 11:14:58 +08:00 |
|
|
caoyanyi
|
872950ac31
|
* Modify feature bar list.
|
2023-02-16 10:31:17 +08:00 |
|
|
王怡栋
|
0da5eb91f5
|
Merge branch 'cyy_defaultLang' into 'zentaopms_289'
* Modify default lang get.
See merge request easycorp/zentaopms!6969
|
2023-02-16 01:53:10 +00:00 |
|
|
caoyanyi
|
d46ea686b7
|
* Modify default lang get.
|
2023-02-16 09:49:45 +08:00 |
|
|
tianshujie
|
4d2a846c9e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-02-16 08:59:34 +08:00 |
|
|
王怡栋
|
4d89358546
|
Merge branch 'zentaopms_289_gfl' into 'zentaopms_289'
Zentaopms 289 gfl
See merge request easycorp/zentaopms!6968
|
2023-02-16 00:45:02 +00:00 |
|
|
guofeilong
|
b2a664edf2
|
* Code for langitems js refactors.
|
2023-02-16 08:41:08 +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 |
|
|
guofeilong
|
8d3084c957
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_gfl
|
2023-02-16 08:11:33 +08:00 |
|
|
guofeilong
|
8afb07632a
|
* Code for langItem refactors.
|
2023-02-16 08:11:21 +08: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 |
|
|
caoyanyi
|
f53617aa6d
|
* Modify language get.
|
2023-02-15 17:11:48 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
guofeilong
|
97f3cc45f1
|
Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289_gfl
|
2023-02-15 15:55:36 +08:00 |
|
|
wangyidong
|
dfb7a22c12
|
* adjust code.
|
2023-02-15 15:54:02 +08:00 |
|
|
wangyidong
|
734a64958c
|
* code for custom menu lang.
|
2023-02-15 15:51:02 +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 |
|
|
王怡栋
|
488482863e
|
Merge branch 'cyy_lang' into 'zentaopms_289'
* Optimize main and ext files get, and add get default lang function.
See merge request easycorp/zentaopms!6958
|
2023-02-15 03:26:39 +00:00 |
|
|
mayue
|
a681b0d23b
|
* Fix bug #32147.
|
2023-02-15 11:24:38 +08: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 |
|
|
caoyanyi
|
3bf16c880e
|
* Optimize main and ext files get, and add get default lang function.
|
2023-02-15 11:22:42 +08: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 |
|
|
guofeilong
|
ff9c2419b2
|
* Code for task#84531
|
2023-02-15 11:08:42 +08:00 |
|
|
陈涛
|
8574f461f7
|
* Change CI configuration.
|
2023-02-15 11:08:37 +08:00 |
|
|
caoyanyi
|
0d5f437607
|
* Adjust code.
|
2023-02-15 10:23:54 +08:00 |
|
|
tianshujie
|
2b82314b52
|
* Fix bug #32145.
|
2023-02-15 10:08:15 +08:00 |
|