 胡方舟
|
ca8f702765
|
Merge branch 'zenops_69' into 'master'
* getXmindImport,showXmindImport,saveXmindImport use importXmind permission.
See merge request easycorp/zentaopms!7458
|
2023-04-18 07:44:26 +00:00 |
|
|
zhaoke
|
186d901af7
|
* getXmindImport,showXmindImport,saveXmindImport use importXmind permission.
|
2023-04-18 15:41:38 +08:00 |
|
|
tianshujie
|
04a8604aa6
|
* Fix bug #34295.
|
2023-04-18 08:22:38 +08:00 |
|
|
tianshujie
|
21f7143919
|
* Code for task #91391.
|
2023-04-17 11:12:09 +08:00 |
|
|
朱金勇
|
e6b2ea4a04
|
Merge branch 'zenops_69'
|
2023-04-14 04:41:28 +00:00 |
|
|
liugang
|
2137062ead
|
+ Init report privilege lang.
|
2023-04-14 01:50:49 +00:00 |
|
|
tianshujie
|
e279e91070
|
* Resolve issue #775.
|
2023-04-13 16:22:45 +08:00 |
|
|
tianshujie
|
ee0f443ee4
|
* Resolve issue #763.
|
2023-04-13 15:51:36 +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 |
|
|
朱金勇
|
cecf04b069
|
Fix bug: show tables and desc table.
|
2023-04-12 16:40:08 +00:00 |
|
|
liugang
|
edede2a0df
|
+ Add privilege of chart module.
|
2023-04-10 07:24:25 +00:00 |
|
|
zhaoke
|
290cd3f882
|
Merge branch 'zenops_66' into zenops_69
|
2023-04-07 11:19:27 +08:00 |
|
|
zhaoke
|
1cd8eda1a1
|
* Fix bug #33845.
|
2023-04-07 09:59:55 +08:00 |
|
|
caoyanyi
|
ea55ca8c33
|
* Add api priv and switch api doc release locate.
|
2023-04-07 09:30:02 +08:00 |
|
|
tianshujie
|
bb84c7a731
|
* Change the name of my spatial function.
|
2023-04-06 16:57:14 +08: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 |
|
|
tianshujie
|
1e77c10378
|
* Code for task #89915.
|
2023-04-05 15:54:25 +08:00 |
|
|
daitingting
|
6c331dc642
|
* Finish task #89954.
|
2023-04-04 16:19:43 +08:00 |
|
|
zhaoke
|
91af62ac48
|
Merge remote-tracking branch 'origin/master' into zenops_69
|
2023-04-04 13:46:52 +08:00 |
|
|
liugang
|
56dc716e6e
|
+ Add privilege of annualData.
|
2023-04-04 02:57:45 +00:00 |
|
|
liugang
|
07a3a4c3da
|
* Remove annualData privilege.
|
2023-04-04 01:12:11 +00:00 |
|
|
liugang
|
7d919baf3c
|
* Sort the privileges of pivot module, finish task #90073.
|
2023-04-03 09:27:29 +00:00 |
|
|
zhaoke
|
49d18cf72c
|
Merge remote-tracking branch 'origin/master' into zenops_69
|
2023-04-03 16:46:41 +08:00 |
|
|
王怡栋
|
6147360f3b
|
Merge branch 'daitingting_task_#89952' into 'master'
* Finish task #89952.
See merge request easycorp/zentaopms!7292
|
2023-04-03 06:35:38 +00:00 |
|
|
王怡栋
|
511a5fb0bd
|
Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3
See merge request easycorp/zentaopms!7293
|
2023-04-03 06:29:21 +00:00 |
|
|
daitingting
|
26161924c6
|
* Finish task #89952.
|
2023-04-03 14:19:49 +08:00 |
|
|
tianshujie
|
baf5aeba2a
|
* Code for task #89927.
|
2023-04-03 13:34:21 +08:00 |
|
|
liugang
|
2336997c39
|
* Sort the privileges of screen, finish task #90070,90071, cost 1h, left 0h.
|
2023-04-03 05:33:36 +00:00 |
|
|
zhaoke
|
3337ad0cd1
|
+ Add privilege menu.
|
2023-04-03 13:15:52 +08:00 |
|
|
tianshujie
|
3f9f9fbc5b
|
* Code for task #89927.
|
2023-04-03 11:26:01 +08:00 |
|
|
zhaoke
|
e7119d4217
|
Merge remote-tracking branch 'origin/master' into zenops_66
|
2023-04-03 09:36:20 +08:00 |
|
|
qixinzhi
|
284a4ccfae
|
* Finish task#88964.
|
2023-03-30 14:19:26 +08:00 |
|
|
zenggang
|
c6efd71426
|
* Finish task#86376,86375
|
2023-03-17 08:33:40 +00:00 |
|
|
孙广明
|
d235b8e924
|
Merge branch 'feature/38477' into 'master'
* Finish task #87013, #87014, and fix bug #32881.
See merge request easycorp/zentaopms!7184
|
2023-03-14 09:15:08 +00:00 |
|
|
liumengyi
|
637b0912a7
|
* Finish task #87013.
|
2023-03-13 07:07:13 +00:00 |
|
|
tianshujie
|
80bea78979
|
* Add skip stash pager and method.
|
2023-03-13 14:39:37 +08:00 |
|
|
caoyanyi
|
234347cede
|
* Update project common language.
|
2023-03-07 15:58:38 +08: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 |
|
|
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
|
c82f1a02a7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui
|
2023-02-28 13:13:13 +08:00 |
|
|
tianshujie
|
8898dd6f9c
|
* Code for fix bug #32447.
|
2023-02-27 16:38:18 +08:00 |
|
|
wangyidong
|
11507ffff2
|
* fix bug #32277.
|
2023-02-27 16:16:04 +08:00 |
|
|
liumengyi
|
4912b2004e
|
* Finish task #85630.
|
2023-02-27 06:54:39 +00:00 |
|
|
liugang
|
c9115f7a21
|
* Revert menus, privileges and pages of report.
|
2023-02-27 06:39:37 +00:00 |
|
|
liumengyi
|
bcae665178
|
* Fix bug #32337.
|
2023-02-22 08:56:31 +00:00 |
|