 王怡栋
|
52550f9bee
|
Merge branch 'sgm_upgrade' into 'master'
* Add upgrade sql to install.
See merge request easycorp/zentaopms!2000
|
2022-02-28 03:06:45 +00:00 |
|
|
孙广明
|
77c462d397
|
Merge branch 'sprint/186_liumengyi_19982' into 'master'
* Modify xuanxuan inlcude.
See merge request easycorp/zentaopms!2002
|
2022-02-28 03:05:52 +00:00 |
|
|
liumengyi
|
76c7fe894a
|
* Modify xuanxuan inlcude.
|
2022-02-28 11:03:59 +08:00 |
|
|
孙广明
|
725f4abbae
|
* Add upgrade sql to install.
|
2022-02-28 11:00:43 +08:00 |
|
|
孙广明
|
cca8c4eada
|
Merge branch 'sprint/186_tianshujie_include' into 'master'
* Modify the noise loading path.
See merge request easycorp/zentaopms!1999
|
2022-02-28 02:59:10 +00:00 |
|
|
tianshujie
|
1ca1c52bd3
|
* Modify the noise loading path.
|
2022-02-28 10:57:31 +08:00 |
|
|
王怡栋
|
e937ed6183
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade lang.
See merge request easycorp/zentaopms!1997
|
2022-02-28 02:35:22 +00:00 |
|
|
孙广明
|
6b1c882cac
|
* Fix upgrade lang.
|
2022-02-28 10:16:30 +08:00 |
|
|
王怡栋
|
f025447b5a
|
Merge branch 'sprint/master_tanghucheng_lang' into 'master'
* Add en lang.
See merge request easycorp/zentaopms!1996
|
2022-02-28 02:07:21 +00:00 |
|
|
tanghucheng
|
954c8335dc
|
* Fix lang.
|
2022-02-28 10:00:31 +08:00 |
|
|
tanghucheng
|
c6571a7b27
|
* Fix en lang.
|
2022-02-28 09:56:56 +08:00 |
|
|
tanghucheng
|
5fb33055bc
|
* Fix en lang.
|
2022-02-28 09:53:57 +08:00 |
|
|
孙广明
|
931d6ddc48
|
Merge branch 'sprint/186_tianshujie_lang' into 'master'
* Add English language item.
See merge request easycorp/zentaopms!1995
|
2022-02-28 01:52:59 +00:00 |
|
|
孙广明
|
a52e6774f8
|
Merge branch 'sprint/186_liumengyi_19982' into 'master'
* Fix bug #19982 and add English language items.
See merge request easycorp/zentaopms!1994
|
2022-02-28 01:52:24 +00:00 |
|
|
tianshujie
|
941bba2658
|
* Modify the repeated upgrade problem.
|
2022-02-28 09:51:53 +08:00 |
|
|
liumengyi
|
6f3585ea91
|
* Remove extra spaces.
|
2022-02-28 09:51:45 +08:00 |
|
|
tianshujie
|
d2ca0c89bc
|
* Add English language item.
|
2022-02-28 09:50:32 +08:00 |
|
|
王怡栋
|
c4e3559a95
|
Merge branch 'sgm_lang' into 'master'
* Add en lang.
See merge request easycorp/zentaopms!1993
|
2022-02-28 01:43:48 +00:00 |
|
|
孙广明
|
42869fb2ce
|
* Remove space.
|
2022-02-28 09:42:26 +08:00 |
|
|
liumengyi
|
d537b0f71c
|
* Fix bug #19982 and add English language items.
|
2022-02-28 09:40:30 +08:00 |
|
|
孙广明
|
fd83d9cf41
|
* Add en lang.
|
2022-02-28 09:39:33 +08:00 |
|
|
孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
|
王怡栋
|
f3f91716c6
|
Merge branch 'sgm_upgrade' into 'sprint/185'
* Fix upgrade bug.
See merge request easycorp/zentaopms!1992
|
2022-02-28 00:49:56 +00:00 |
|
|
孙广明
|
ec16236bb5
|
* Fix upgrade bug.
|
2022-02-28 08:45:04 +08:00 |
|
|
zhujinyong
|
3f7ff4ee25
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-25 17:37:29 +08:00 |
|
|
zhujinyong
|
08ea97263f
|
* Fix hook files of xuan.
|
2022-02-25 17:37:10 +08:00 |
|
|
王怡栋
|
115d80f557
|
Merge branch 'sgm_fixbug' into sprint/185
|
2022-02-25 17:22:04 +08:00 |
|
|
王怡栋
|
c7d26de7bf
|
Merge branch 'sprint/185' into 'sgm_fixbug'
# Conflicts:
# framework/base/router.class.php
|
2022-02-25 09:20:48 +00:00 |
|
|
王怡栋
|
22226d962f
|
Merge branch 'sprint/185_lanzongjun_49380' into 'sprint/185'
* fix task 49380
See merge request easycorp/zentaopms!1987
|
2022-02-25 09:18:53 +00:00 |
|
|
孙广明
|
5ff5699d91
|
* Fix bug.
|
2022-02-25 17:11:58 +08:00 |
|
|
朱金勇
|
6c6c819775
|
Merge branch 'sprint/186_hufangzhou_zentaoxx' into 'sprint/185'
* Need not move the web directory.
See merge request easycorp/zentaopms!1986
|
2022-02-25 08:29:38 +00:00 |
|
|
hufangzhou
|
55bff72996
|
* Adjust the makefile.
|
2022-02-25 16:28:18 +08:00 |
|
|
zhujinyong
|
d0a4e2af68
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-25 16:19:51 +08:00 |
|
|
zhujinyong
|
8eae5ebf65
|
* FIx import path.
|
2022-02-25 16:18:07 +08:00 |
|
|
Zongjun Lan
|
fee7b73ffe
|
* fix task 49380
|
2022-02-25 16:17:04 +08:00 |
|
|
hufangzhou
|
f26df2d7a9
|
* Need not move the web directory.
|
2022-02-25 16:16:03 +08:00 |
|
|
孙广明
|
6b644b8c26
|
Merge branch 'sprint/186_liumengyi_19924' into 'sprint/185'
* FIx bug #19924.
See merge request easycorp/zentaopms!1985
|
2022-02-25 08:10:43 +00:00 |
|
|
liumengyi
|
51ef04f29c
|
* FIx bug #19924.
|
2022-02-25 15:58:26 +08:00 |
|
|
王怡栋
|
549f3d20e1
|
Merge branch 'sgm_fixbug' into 'sprint/185'
* Fix bug.
See merge request easycorp/zentaopms!1984
|
2022-02-25 07:42:19 +00:00 |
|
|
孙广明
|
c1ebe28837
|
* Fix bug.
|
2022-02-25 15:39:08 +08:00 |
|
|
孙广明
|
09028b789e
|
Merge branch 'sprint/186_hufangzhou_makefile' into 'sprint/185'
* Can not use vision field of zt_action table when upgrade.
See merge request easycorp/zentaopms!1983
|
2022-02-25 07:30:41 +00:00 |
|
|
hufangzhou
|
9640120b43
|
* Can not use vision field of zt_action table when upgrade.
|
2022-02-25 15:28:15 +08:00 |
|
|
zhujinyong
|
762c60d0d0
|
* Fix extLangPath.
|
2022-02-25 15:17:53 +08:00 |
|
|
zhujinyong
|
a33ba80fb4
|
* Adjust language of router.
|
2022-02-25 14:58:58 +08:00 |
|
|
孙广明
|
3627387370
|
Merge branch 'sprint/185_mayue_49285' into 'sprint/185'
* Finish task#49285.
See merge request easycorp/zentaopms!1871
|
2022-02-25 06:32:20 +00:00 |
|
|
mayue
|
37a9564c95
|
* Optimize code.
|
2022-02-25 14:20:37 +08:00 |
|
|
mayue
|
c3ef97bf47
|
* Optimize code.
|
2022-02-25 14:15:25 +08:00 |
|
|
mayue
|
245542e972
|
* Optimize code.
|
2022-02-25 14:00:54 +08:00 |
|
|
王怡栋
|
4f4144b72f
|
Merge branch 'sprint/185_tanghucheng_fixbug' into 'sprint/185'
* Fix bug #19898,20028.
See merge request easycorp/zentaopms!1981
|
2022-02-25 05:45:43 +00:00 |
|
|
孙广明
|
8f89f4d64f
|
Merge branch '185_sunhuawei_story_30529' into 'sprint/185'
185 sunhuawei story 30529
See merge request easycorp/zentaopms!1958
|
2022-02-25 05:45:27 +00:00 |
|