 tanghucheng
|
10acc6b909
|
* Fix merge zentaoipd code error.
|
2023-08-01 09:33:07 +08:00 |
|
|
Yagami
|
1f00f62914
|
* Change ipd to or.
|
2023-05-04 15:23:33 +08:00 |
|
|
tanghucheng
|
c8a626480d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-04-21 13:49:46 +08:00 |
|
|
hufangzhou
|
577fc81216
|
* Move the holidayseason from biz to open edition.
|
2023-04-19 10:20:41 +08:00 |
|
|
tanghucheng
|
0a944b7e11
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-04-14 16:38:09 +08:00 |
|
|
liumengyi
|
648dc288ca
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-14 15:15:03 +08:00 |
|
|
tianshujie
|
f954e7935c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_issue
|
2023-04-14 13:31:12 +08:00 |
|
|
liugang
|
16431eee37
|
+ Init bi common lang.
|
2023-04-14 02:19:24 +00:00 |
|
|
liugang
|
55fb03a3ee
|
* Change report common lang from bi to report.
|
2023-04-14 01:49:18 +00:00 |
|
|
tianshujie
|
313949280d
|
* Resolve issue #771.
|
2023-04-14 09:00:42 +08:00 |
|
|
tanghucheng
|
0af9b86b70
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-04-13 10:23:19 +08:00 |
|
|
liumengyi
|
9fadd45264
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-11 14:19:00 +08:00 |
|
|
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 |
|
|
孙广明
|
b674dfe3a8
|
Merge branch 'master' into zentaoipd
|
2023-04-04 15:54:44 +08:00 |
|
|
liumengyi
|
25bb508e77
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-03 17:10:36 +08:00 |
|
|
hufangzhou
|
932a524e8d
|
* Init data for priv package.
|
2023-04-03 16:39:19 +08:00 |
|
|
liugang
|
63d41661b8
|
* Add dimension module, finish task #90072.
|
2023-04-03 08:14:46 +00:00 |
|
|
tanghucheng
|
035a68b78c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-04-03 10:37:42 +08: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 |
|
|
tanghucheng
|
c89ecac12b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd
|
2023-03-31 09:19:02 +08:00 |
|
|
liugang
|
54876704c6
|
* Add pivot module.
|
2023-03-28 07:25:50 +00:00 |
|
|
tanghucheng
|
0d1a22ad71
|
* Finish task #87224.
|
2023-03-27 15:25:00 +08: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 |
|
|
tanghucheng
|
108ca86dfd
|
* Add lang.
|
2023-03-15 09:06:51 +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 |
|