Commit Graph
1207 Commits
Author SHA1 Message Date
chaideqing 525f11f198 * Finish task#99344. 2023-08-04 03:10:02 +00:00
hufangzhou 0d56902dd8 * Fix bug #36569, bug #36641. 2023-07-18 16:15:10 +08:00
tanghucheng 6b0db86d24 Merge branch '18.x' into zentaoipd 2023-07-13 17:26:49 +08:00
chaideqing 883e2a68d7 * Add story type to check story duplicate. 2023-07-12 01:10:24 +00:00
songchenxuan 29282fbd78 * Return true if RUN_MODE = api. 2023-07-04 16:53:43 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
songchenxuan a0269173fd * Add screen-ajaxgetchart to checkIframe whiteList. 2023-06-27 08:45:19 +08:00
宋辰轩 fbb85f7eca revert 19af0e32bd
revert * Fix bug for checkIframe, update or to and.
2023-06-26 17:40:24 +08:00
songchenxuan 19af0e32bd * Fix bug for checkIframe, update or to and. 2023-06-26 17:24:47 +08:00
chaideqing 3c0ac39132 * Fix bug#95108. 2023-06-13 14:05:46 +08:00
tanghucheng d992b8c3fd * Fix full text search feedback no permission. 2023-06-06 09:25:57 +00:00
赵珂 2574ad39b3 Merge branch '18.4' into sprint/zk_fixbug 2023-06-06 16:51:01 +08:00
zhaoke d40c1f49cc Merge branch '18.4' into sprint/zk_fixbug 2023-06-06 16:49:09 +08:00
zhaoke f79758ecc8 + Add zanode-create for checkIframe. 2023-06-06 16:43:43 +08:00
Lufei 0648689d24 * Optimize convert2Pinyin, and cache executions for bug browse. 2023-06-06 16:28:39 +08:00
Lufei 7f3d60a430 + Add screen-view for checkIframe. 2023-06-06 14:10:00 +08:00
lanzongjun a41b1310ca * Fix the custom private library could not create a document. 2023-06-06 13:19:26 +08:00
lanzongjun e690ba62b5 * Fix attackers create document in private product, project, execution and custom. 2023-06-05 11:27:12 +08:00
songchenxuan 3a2d17ec37 * Fix bug #35578 and revert code for bug #35097. 2023-05-24 09:00:16 +08:00
Lufei 2bd9e84341 * Finish story #45157, Optimize checkIframe method. 2023-05-22 10:15:42 +08:00
Yagami 434aed0830 Merge branch '18.4' into zentaoipd 2023-05-19 14:47:42 +08:00
Yagami a75976fa94 * Fix bug #35363. 2023-05-18 16:38:14 +08:00
Lufei a3fbeba6ba * Fix undefined array key "views". 2023-05-18 10:57:23 +08:00
songchenxuan 47e07bda6b * Fix bug #35097, check user acl views at first. 2023-05-17 13:26:48 +08:00
Yagami 3d80c2e547 * Fix bug #35240. 2023-05-17 09:57:41 +08:00
Yagami ffd2b525c8 * Change judgment condition. 2023-05-04 17:05:52 +08:00
tanghucheng 45321653ca Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-28 13:10:24 +08:00
caoyanyi d02b3f1946 * Modify qrcode imgae. 2023-04-27 10:48:11 +08:00
caoyanyi a83cb3fc39 * Modify download qrcode. 2023-04-27 09:16:36 +08:00
caoyanyi 365e76bbe3 * Adjust code. 2023-04-26 19:00:29 +08:00
caoyanyi 5d4ce7e138 * Modify app download qrcode. 2023-04-26 17:43:01 +08:00
wangyidong 75e4b26c52 * fix bug #34717. 2023-04-24 19:07:05 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
tianshujie 2059a74de0 * Fix bug #34461. 2023-04-20 11:32:34 +08:00
tanghucheng 8bf4bbccf0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-20 09:50:22 +08:00
caoyanyi 658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
朱金勇 72155fc3b8 * Fix bug for dmdb. 2023-04-19 01:41:34 +00:00
tanghucheng 5667eeab9d * Adjust for common::buildIconButton. 2023-04-18 09:46:46 +08:00
tanghucheng 93ffc06caa * Code for task #91093. 2023-04-17 17:13:30 +08:00
tanghucheng 0a944b7e11 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-14 16:38:09 +08:00
tianshujie d2782dc46a * Resolve issue #775. 2023-04-13 16:37:20 +08:00
tanghucheng 0af9b86b70 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-13 10:23:19 +08:00
朱金勇 cecf04b069 Fix bug: show tables and desc table. 2023-04-12 16:40:08 +00:00
wangyidong a3715fa226 * fix bug. 2023-04-12 16:20:53 +08:00
wangyidong 7e3b1a1881 * fix bug for global create doc. 2023-04-10 13:52:08 +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
朱金勇 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
liugang 9339533b7a * Display the main navagator if user has permission to access any menu under it. 2023-04-04 08:13:08 +00:00