liugang
|
d3dbbfe3e7
|
* Refactor: only process a chart object.
|
2023-04-07 02:31:28 +00:00 |
|
liugang
|
ffd815ff16
|
* Sort lang items.
|
2023-04-07 02:31:12 +00:00 |
|
liugang
|
2939620b18
|
- Remove unused variable.
|
2023-04-07 02:30:46 +00:00 |
|
liugang
|
492c01807f
|
+ Display chart in open source version.
|
2023-04-06 10:12:08 +00:00 |
|
liugang
|
adc8d2d267
|
+ Move the config of bi from biz version to open source version.
|
2023-04-06 10:11:42 +00:00 |
|
liugang
|
0a096cf93a
|
+ Drop unused field.
|
2023-04-06 10:11:17 +00:00 |
|
liugang
|
8908ac2250
|
+ Move the getGroupPairs from biz version to open source version.
|
2023-04-06 10:10:21 +00:00 |
|
liugang
|
95e217b661
|
+ Add chart menu.
|
2023-04-06 06:24:16 +00:00 |
|
liugang
|
2155f0894d
|
+ Add chart and dimension to openModules to prevent them from being moved to the extension/custom directory when upgrading.
|
2023-04-06 06:09:39 +00:00 |
|
liugang
|
5f54d5e5e4
|
* Fix error the global $dao variable is replaced with a new instance when call function loadModel.
|
2023-04-06 05:22:14 +00:00 |
|
王怡栋
|
a97505ff78
|
Merge branch 'release/zentaopms_18.3' into 'master'
* Fixed an error message when clicking level 1.5 and then clicking Level
See merge request easycorp/zentaopms!7318
|
2023-04-06 03:27:14 +00:00 |
|
wangyidong
|
4dfeb167cb
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 11:25:30 +08:00 |
|
wangyidong
|
85f5056b33
|
* code for task #89916.
|
2023-04-06 11:25:08 +08:00 |
|
guofeilong
|
fbae4bca3a
|
* Adjust code .
|
2023-04-06 11:04:47 +08:00 |
|
guofeilong
|
16e4454805
|
* Adjust code .
|
2023-04-06 11:00:03 +08:00 |
|
caoyanyi
|
698b868dcd
|
Merge branch 'mine_doc' into release/zentaopms_18.3
|
2023-04-06 10:49:31 +08:00 |
|
caoyanyi
|
30a90eb1f9
|
* Modify language.
|
2023-04-06 10:48:54 +08:00 |
|
tianshujie
|
16441a1893
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 10:48:53 +08:00 |
|
tianshujie
|
318c9ec581
|
* Add lang.
|
2023-04-06 10:48:42 +08:00 |
|
caoyanyi
|
8ff704aaea
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into mine_doc
|
2023-04-06 10:43:39 +08:00 |
|
caoyanyi
|
5fdaaf5778
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into mine_doc
|
2023-04-06 10:40:20 +08:00 |
|
caoyanyi
|
fcd76f31ce
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 10:39:36 +08:00 |
|
caoyanyi
|
7d976a5f1c
|
* Modify order for menu.
|
2023-04-06 10:38:44 +08:00 |
|
wangyidong
|
a5421e4940
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 10:30:52 +08:00 |
|
wangyidong
|
56791f12ef
|
* code for task #89916.
|
2023-04-06 10:29:23 +08:00 |
|
tianshujie
|
47780015f8
|
* Fixed the bottom paging style problem。
|
2023-04-06 10:27:21 +08:00 |
|
liugang
|
93e71f8861
|
* Call getDatabaseVersion instead of getMysqlVersion.
|
2023-04-06 02:05:02 +00:00 |
|
胡方舟
|
80442281d6
|
Merge branch 'sprint/fixbug#33382' into 'master'
* Fix bug #33382.
See merge request easycorp/zentaopms!7280
|
2023-04-06 01:52:47 +00:00 |
|
caoyanyi
|
c89efa5632
|
* Add version for api lib.
|
2023-04-06 09:31:31 +08:00 |
|
guofeilong
|
9484c73fba
|
* Adjust code .
|
2023-04-06 09:28:51 +08:00 |
|
tianshujie
|
f3897e5dc8
|
* Fixed an error message when clicking level 1.5 and then clicking Level
2.5.
|
2023-04-06 09:23:32 +08:00 |
|
tianshujie
|
75d07972ab
|
* Code for task #89915.
|
2023-04-06 09:14:00 +08:00 |
|
tianshujie
|
ce25a89da4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 09:01:44 +08:00 |
|
tianshujie
|
e6591f64d8
|
* Fix bug #33759.
|
2023-04-06 08:57:42 +08:00 |
|
王怡栋
|
2e98282d5a
|
Merge branch 'daitingting_task_#89956' into 'master'
* Finish task #89956.
See merge request easycorp/zentaopms!7315
|
2023-04-06 00:55:24 +00:00 |
|
王怡栋
|
79bc2f4d1f
|
Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3
See merge request easycorp/zentaopms!7314
|
2023-04-06 00:55:08 +00:00 |
|
王怡栋
|
e1933a9b50
|
Merge branch 'daitingting_task_#89954' into 'master'
* Finish task #89954.
See merge request easycorp/zentaopms!7313
|
2023-04-06 00:54:46 +00:00 |
|
王怡栋
|
eb1c1e2ee2
|
Merge branch 'tsj_docTree' into 'master'
* Code for task #89915.
See merge request easycorp/zentaopms!7316
|
2023-04-06 00:52:45 +00:00 |
|
tianshujie
|
b2d4be08f5
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 08:28:04 +08:00 |
|
liugang
|
2525123024
|
* Remove the BIZ text, fix bug #33760.
|
2023-04-06 00:11:21 +00:00 |
|
朱金勇
|
4cf70fdf7e
|
* Fix insert method of dao.
|
2023-04-05 15:58:43 +00:00 |
|
朱金勇
|
22f9f1d087
|
Merge branch 'db'
|
2023-04-05 14:30:11 +00:00 |
|
朱金勇
|
7f9d638d28
|
* Fix sql for dmdb.
|
2023-04-05 14:18:24 +00:00 |
|
tianshujie
|
c5d2bc5c17
|
* Code for task #89915.
|
2023-04-05 17:02:03 +08:00 |
|
tianshujie
|
1e77c10378
|
* Code for task #89915.
|
2023-04-05 15:54:25 +08:00 |
|
tianshujie
|
1a3ce097fd
|
* Code for task #89906.
|
2023-04-05 13:58:53 +08:00 |
|
朱金勇
|
0f6b78f264
|
Fix strict mode of MySQL.
|
2023-04-05 02:11:12 +00:00 |
|
tianshujie
|
e90d2c0d66
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 20:52:39 +08:00 |
|
tianshujie
|
6682974d6d
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 17:30:04 +08:00 |
|
tianshujie
|
b87a68b349
|
* Code for task #89906.
|
2023-04-04 17:29:13 +08:00 |
|