 王怡栋
|
d4eee84a04
|
Merge branch 'master' into 'tsj_issue'
# Conflicts:
# module/doc/css/common.css
|
2023-04-14 06:29:28 +00:00 |
|
|
王怡栋
|
65e15bbf25
|
Merge branch 'tsj_task' into 'master'
Tsj task
See merge request easycorp/zentaopms!7419
|
2023-04-14 06:27:52 +00:00 |
|
|
朱金勇
|
9e4ba356c6
|
* Fix install for dmdb.
|
2023-04-14 05:48:49 +00:00 |
|
|
tianshujie
|
9cb069b33a
|
* Optimized Level 2.5 dropdown interaction.
|
2023-04-14 13:47:27 +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 |
|
|
刘刚
|
e4801f1e73
|
Merge branch 'daitingting_adaptation_parameters' into 'master'
* Add parameters.
See merge request easycorp/zentaopms!7418
|
2023-04-14 05:26:38 +00:00 |
|
|
liugang
|
700c80534a
|
+ Init navGroup of report module.
|
2023-04-14 05:22:52 +00:00 |
|
|
daitingting
|
a47cb05c8e
|
* Add parameters.
|
2023-04-14 13:15:54 +08:00 |
|
|
朱金勇
|
e6b2ea4a04
|
Merge branch 'zenops_69'
|
2023-04-14 04:41:28 +00:00 |
|
|
tianshujie
|
99c8caffaf
|
* Fix bug #34184.
|
2023-04-14 11:30:25 +08:00 |
|
|
tianshujie
|
2088b588b1
|
* Modify the interaction of the Create document button.
|
2023-04-14 11:17:56 +08:00 |
|
|
刘刚
|
91897a2245
|
Merge branch 'zentaobiz38_bi_wangyuting' into 'master'
* Fix waterpolo chart bug.
See merge request easycorp/zentaopms!7413
|
2023-04-14 03:03:37 +00:00 |
|
|
刘刚
|
dedce62d79
|
Merge branch 'fix_bug_qxz' into 'master'
* Fix bug #34124.
See merge request easycorp/zentaopms!7412
|
2023-04-14 03:03:23 +00:00 |
|
|
tianshujie
|
8208c02908
|
* Fix bug #34161.
|
2023-04-14 10:52:36 +08:00 |
|
|
王怡栋
|
2c4f45ffcc
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for bug #34164 .
See merge request easycorp/zentaopms!7417
|
2023-04-14 02:48:57 +00:00 |
|
|
guofeilong
|
c8b6a19080
|
* Adjust code for bug #34164 .
|
2023-04-14 10:39:33 +08:00 |
|
|
王怡栋
|
2edd5bc5e8
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Code for task #34163 .
See merge request easycorp/zentaopms!7416
|
2023-04-14 02:36:08 +00:00 |
|
|
guofeilong
|
8171ec17d0
|
* Code for task #34163 .
|
2023-04-14 10:34:27 +08:00 |
|
|
tianshujie
|
f14efad6ac
|
* Optimized jump link.
|
2023-04-14 10:32:08 +08:00 |
|
|
王怡栋
|
f58a67cfc3
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
Dev/gfl zentaopms 305
See merge request easycorp/zentaopms!7415
|
2023-04-14 02:29:23 +00:00 |
|
|
wangyidong
|
bcd61687c6
|
* fix bug for style.
|
2023-04-14 10:25:56 +08:00 |
|
|
guofeilong
|
4602f6ff08
|
* Adjust code for bug #31459.
|
2023-04-14 10:23:06 +08:00 |
|
|
guofeilong
|
c82c461261
|
* Adjust code for class h-full-adjust .
|
2023-04-14 10:23:06 +08:00 |
|
|
guofeilong
|
6051582370
|
* Adjust code for bug #34159 .
|
2023-04-14 10:23:06 +08:00 |
|
|
liugang
|
09329ee0ea
|
* Remove the mainNav lang extension.
|
2023-04-14 02:20:01 +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 |
|
|
tianshujie
|
9180c13a89
|
* Optimized jump logic.
|
2023-04-14 10:16:42 +08:00 |
|
|
孙广明
|
ccb8c7f763
|
Merge branch 'sprint/scx_chartbug' into 'master'
* Fix bug for chart.
See merge request easycorp/zentaopms!7414
|
2023-04-14 02:15:33 +00:00 |
|
|
tianshujie
|
90ad82c742
|
* Fix bug #34176.
|
2023-04-14 10:08:55 +08:00 |
|
|
王怡栋
|
739a26440c
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for css in docDetail .
See merge request easycorp/zentaopms!7407
|
2023-04-14 02:07:49 +00:00 |
|
|
guofeilong
|
5e230d603c
|
* Adjust code for bug #34159 .
|
2023-04-14 10:07:26 +08:00 |
|
|
宋辰轩
|
5e1ecfe9bc
|
* Fix bug for chart.
|
2023-04-14 10:07:04 +08:00 |
|
|
wangyuting2
|
d9e5061c30
|
* Add new goview.
|
2023-04-14 10:05:54 +08:00 |
|
|
guofeilong
|
938bb13c6c
|
* Adjust code in doc block .
|
2023-04-14 10:04:44 +08:00 |
|
|
tianshujie
|
4f80045c48
|
* Modify method name.
|
2023-04-14 10:02:08 +08:00 |
|
|
tianshujie
|
4e07580434
|
* Fix bug #34176.
|
2023-04-14 10:01:52 +08:00 |
|
|
wangyuting2
|
b8c8bb9418
|
* Fix waterpolo chart bug.
|
2023-04-14 09:57:45 +08:00 |
|
|
wangyidong
|
2380df4a49
|
* remove default save path.
|
2023-04-14 09:52:51 +08:00 |
|
|
liugang
|
2137062ead
|
+ Init report privilege lang.
|
2023-04-14 01:50:49 +00:00 |
|
|
qixinzhi
|
5b93d9c057
|
* Fix bug #34124.
|
2023-04-14 01:50:07 +00:00 |
|
|
wangyidong
|
3ee191bd66
|
* remove save path when create doc.
|
2023-04-14 09:49:57 +08:00 |
|
|
liugang
|
55fb03a3ee
|
* Change report common lang from bi to report.
|
2023-04-14 01:49:18 +00:00 |
|
|
wangyidong
|
44db4dd94f
|
* code for doc sidebarHeader.
|
2023-04-14 09:35:20 +08:00 |
|
|
wangyidong
|
ed0f4c3d0e
|
* fix bug #32088.
|
2023-04-14 09:27:16 +08:00 |
|
|
朱金勇
|
fa1d7ff56b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-14 01:26:04 +00:00 |
|
|
朱金勇
|
1aa6861445
|
* Fix bug #34095.
|
2023-04-14 01:24:17 +00:00 |
|
|
刘刚
|
097cfddb3a
|
Merge branch 'zentaobiz38_bi_wangyuting' into 'master'
* Finish task #90970.
See merge request easycorp/zentaopms!7411
|
2023-04-14 01:23:36 +00:00 |
|
|
朱金勇
|
85f42ed822
|
Merge branch 'fix/gh-112' into 'master'
* Fix security vulnerability in ping function.
See merge request easycorp/zentaopms!7409
|
2023-04-14 01:21:02 +00:00 |
|
|
wangyuting2
|
f0484ee266
|
* Finish task #90970.
|
2023-04-14 09:18:48 +08:00 |
|