 hufangzhou
|
e18b37128f
|
Merge branch 'master' into zentaopms_304
|
2023-04-20 13:03:30 +08:00 |
|
|
tianshujie
|
2059a74de0
|
* Fix bug #34461.
|
2023-04-20 11:32:34 +08:00 |
|
|
tianshujie
|
0f2a2b7bc3
|
* Fixed the interface details style problem.
|
2023-04-19 17:14:32 +08:00 |
|
|
caoyanyi
|
658b918897
|
* Modify api view page style.
|
2023-04-19 16:16:30 +08:00 |
|
|
liumengyi
|
7fe3662ea7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-19 14:09:20 +08:00 |
|
|
hufangzhou
|
577fc81216
|
* Move the holidayseason from biz to open edition.
|
2023-04-19 10:20:41 +08:00 |
|
|
朱金勇
|
72155fc3b8
|
* Fix bug for dmdb.
|
2023-04-19 01:41:34 +00: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
|
700c80534a
|
+ Init navGroup of report module.
|
2023-04-14 05:22:52 +00:00 |
|
|
朱金勇
|
e6b2ea4a04
|
Merge branch 'zenops_69'
|
2023-04-14 04:41:28 +00:00 |
|
|
liugang
|
16431eee37
|
+ Init bi common lang.
|
2023-04-14 02:19:24 +00:00 |
|
|
liugang
|
f3a6a26f67
|
* Rename report of mainNav to bi.
|
2023-04-14 02:18:36 +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 |
|
|
tianshujie
|
d2782dc46a
|
* Resolve issue #775.
|
2023-04-13 16:37:20 +08:00 |
|
|
tianshujie
|
e279e91070
|
* Resolve issue #775.
|
2023-04-13 16:22:45 +08:00 |
|
|
liumengyi
|
bd6ada9429
|
- Delete the privilege of project-manageRepo.
|
2023-04-13 14:47:06 +08:00 |
|
|
zhaoke
|
a64bc7d5ab
|
* Move xmind functions to lib.
|
2023-04-13 13:51:34 +08:00 |
|
|
zhaoke
|
eb833be4e5
|
Merge branch 'zenops_66' into zenops_69
|
2023-04-13 09:31:12 +08:00 |
|
|
zhaoke
|
70013fa98e
|
Merge remote-tracking branch 'origin/master' into zenops_66
|
2023-04-13 09:24:52 +08:00 |
|
|
zhaoke
|
d401a87812
|
Merge branch 'master' into zenops_69
|
2023-04-13 09:09:49 +08:00 |
|
|
zhaoke
|
2b1ee45b2b
|
Merge branch 'master' into zenops_66
|
2023-04-13 09:06:59 +08:00 |
|
|
liumengyi
|
df1a0f283d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-13 08:39:57 +08:00 |
|
|
朱金勇
|
cecf04b069
|
Fix bug: show tables and desc table.
|
2023-04-12 16:40:08 +00:00 |
|
|
hufangzhou
|
79a6ed9da4
|
* Revert the lang item.
|
2023-04-12 17:04:32 +08:00 |
|
|
liumengyi
|
ca9c565982
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-12 16:39:44 +08:00 |
|
|
wangyidong
|
a3715fa226
|
* fix bug.
|
2023-04-12 16:20:53 +08:00 |
|
|
hufangzhou
|
71898e32ae
|
* Handle conflict.
|
2023-04-12 14:05:29 +08:00 |
|
|
liumengyi
|
2397c644f5
|
* Finish task #91011.
|
2023-04-11 15:30:05 +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 |
|
|
wangyidong
|
7e3b1a1881
|
* fix bug for global create doc.
|
2023-04-10 13:52:08 +08:00 |
|
|
liugang
|
941bcc94aa
|
* Remove unused code.
|
2023-04-07 09:53:14 +00:00 |
|
|
zhaoke
|
290cd3f882
|
Merge branch 'zenops_66' into zenops_69
|
2023-04-07 11:19:27 +08:00 |
|
|
刘刚
|
aa9212c821
|
Merge branch 'sprint/biz37_task90074' into 'master'
Add chart module.
See merge request easycorp/zentaopms!7326
|
2023-04-07 02:34:33 +00:00 |
|
|
liumengyi
|
b32eda7548
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-07 08:59:14 +08:00 |
|
|
tianshujie
|
bb84c7a731
|
* Change the name of my spatial function.
|
2023-04-06 16:57:14 +08:00 |
|
|
liugang
|
95e217b661
|
+ Add chart menu.
|
2023-04-06 06:24:16 +00:00 |
|
|
tianshujie
|
0e813c1ea3
|
* Refactoring list page.
|
2023-04-06 13:07:36 +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 |
|
|
hufangzhou
|
3c83d94e09
|
* Merge code.
|
2023-04-06 09:01:30 +08: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 |
|
|
朱金勇
|
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
|
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
|
b87a68b349
|
* Code for task #89906.
|
2023-04-04 17:29:13 +08:00 |
|
|
liugang
|
9339533b7a
|
* Display the main navagator if user has permission to access any menu under it.
|
2023-04-04 08:13:08 +00:00 |
|