Commit Graph
306 Commits
Author SHA1 Message Date
liugang 6442713ef2 * Declare $lang->bizVersion instead of $lang->pivot->proVersion.
* Declare $lang->bizVersionINT instead of $lang->pivot->proVersionEn.
2023-04-10 07:11:11 +00:00
liugang 941bcc94aa * Remove unused code. 2023-04-07 09:53:14 +00:00
liugang 95e217b661 + Add chart menu. 2023-04-06 06:24:16 +00:00
liugang 63d41661b8 * Add dimension module, finish task #90072. 2023-04-03 08:14:46 +00:00
caoyanyi d477203aa7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 08:30:03 +08:00
liugang 54876704c6 * Add pivot module. 2023-03-28 07:25:50 +00:00
tianshujie ec33fc9c86 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-17 08:28:02 +08:00
caoyanyi 8d16faa47d * Code for bug #33021. 2023-03-16 15:11:00 +08:00
tianshujie fd209a3167 * Finish task 87399. 2023-03-14 15:53:03 +08:00
tianshujie cd7195892c * Fix bug 32831. 2023-03-13 10:37:30 +08:00
孙广明 806e3a4742 Merge branch 'sprint/295_liumengyi_86258' into 'master'
* Finish task #86281 86258.

See merge request easycorp/zentaopms!7166
2023-03-09 08:07:59 +00:00
tianshujie ac3cf573b7 * Modify language items for execution common. 2023-03-09 14:00:31 +08:00
caoyanyi 2e35bcb624 * Update project common lang. 2023-03-08 09:58:33 +08:00
liumengyi 3f63404953 * Finish task #86258. 2023-03-06 06:09:13 +00:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
guofeilong 40015657cc * Code for task #85502 2023-03-02 10:16:48 +08:00
wangyidong 01bb8130dd Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:50:31 +08:00
wangyidong 1a352410a6 * code for task #85503. 2023-03-01 08:49:44 +08:00
tianshujie 2a003865f4 * Code for finish task #84526. 2023-02-28 09:09:16 +08:00
caoyanyi f2441f7197 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-27 15:28:14 +08:00
liumengyi 4912b2004e * Finish task #85630. 2023-02-27 06:54:39 +00:00
liumengyi a23d205435 * Modify menu name. 2023-02-27 06:24:08 +00:00
caoyanyi 6caaf4c316 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 08:32:25 +08:00
tianshujie 12cdb2f6d7 * Modify menu param. 2023-02-22 16:11:21 +08:00
caoyanyi 7c257b5e1e * Code for issue #762. 2023-02-22 15:16:48 +08:00
tianshujie 5b2cafa380 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 14:13:51 +08:00
孙广明 6c1ed365ab Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.

See merge request easycorp/zentaopms!7010
2023-02-21 05:50:04 +00:00
tianshujie 517fb3c796 * Code for finish task #85046. 2023-02-21 13:13:13 +08:00
liumengyi 95e3978fb0 * Finish task #85038, #85039. 2023-02-21 01:05:24 +00:00
caoyanyi c8374b1e14 Merge branch 'master' into zentaopms_289 2023-02-17 10:11:16 +08:00
tianshujie 792f1c5a98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-17 08:33:25 +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
tianshujie 4d2a846c9e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-16 08:59:34 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
guofeilong b9d288fd23 * Code for add langitem.html.php 2023-02-13 16:56:34 +08:00
tianshujie adc0616341 * Code for finish task #83721,83722. 2023-02-06 15:41:55 +08:00
wangyidong 8ec471f950 * code for task #83439. 2023-02-01 11:20:57 +08:00
liumengyi df9883b126 * Finish task #83216. 2023-01-31 09:27:01 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
liugang d04fc1fe4a * Move the screen module to open source. 2022-12-23 14:39:01 +08:00
wangjianhua 429a1d37fa * Modify lang items about devops. 2022-12-12 18:39:23 +08:00
孙广明 d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
2022-11-28 06:58:42 +00:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
Yagami 2f98f46365 * Finish task #77275. 2022-11-23 09:25:48 +08:00
zhaoke 45e1c4dc20 * Add view zahost. 2022-11-18 01:43:33 +00:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00