Commit Graph
1267 Commits
Author SHA1 Message Date
liugang edede2a0df + Add privilege of chart module. 2023-04-10 07:24:25 +00: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
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
王怡栋 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
tianshujie 3f9f9fbc5b * Code for task #89927. 2023-04-03 11:26:01 +08:00
qixinzhi 284a4ccfae * Finish task#88964. 2023-03-30 14:19:26 +08: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
孔令茂 3e7b0daf91 * Resove feedback f2188, change privilege by modulue error. 2023-02-22 10:08:22 +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
liumengyi 95e3978fb0 * Finish task #85038, #85039. 2023-02-21 01:05:24 +00:00
tianshujie d6266bc607 * Code for finish task #85047. 2023-02-20 14:47:10 +08:00
hufangzhou 75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
tianshujie 13be8ec1a7 * Modify the language entry of the execution permission. 2023-02-17 14:04:54 +08:00
tianshujie e6fa9625d5 * Fix bug #32224. 2023-02-16 15:59:03 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie bd95b1eb84 * Code for finish task #83733. 2023-02-09 11:54:01 +08:00
caoyanyi 03ed75a2d3 * Code for task #83742. 2023-02-08 12:44:50 +08:00
tianshujie c29df55df8 * Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 10:39:45 +08:00
tianshujie 52568a67be * Code for finish task #83722. 2023-02-07 16:29:02 +08:00
zhaoke a31485ec89 Merge branch 'master' into zenops_61 2023-02-07 02:04:56 +00:00
tianshujie 1a1f8d3a07 * Put holiday permissions in the open source edition. 2023-02-06 17:05:37 +08:00
tianshujie 5b6978ed8b * Finish task #83744. 2023-02-06 12:02:31 +08:00
tianshujie a1aa671bb2 * Finish task #83745. 2023-02-06 10:35:12 +08:00
zenggang 97fcb6263e * Delete snapshot 2023-02-03 05:19:53 +00:00
zenggang 597b77af82 * Edit snapshot 2023-02-02 08:31:06 +00:00
songpeiyan bdd962fe94 * Fix bug #30856 2023-02-02 08:43:27 +08:00