Commit Graph
4073 Commits
Author SHA1 Message Date
caoyanyi 0955e2ae7b * Adjust task list use zui3. 2023-08-25 10:23:36 +08:00
caoyanyi 66f08158e1 * Remove table switch for task list. 2023-08-23 14:53:39 +08:00
caoyanyi 87802d4384 + Add onlybody element attribute. 2023-08-23 14:51:55 +08:00
liwenrui 2d22b2603c Merge remote-tracking branch 'origin/18.x' into ai 2023-08-23 09:49:21 +08:00
liumengyi b562b0ac59 * Fix bug #37439. 2023-08-18 17:24:23 +08:00
liwenrui 40ce355da1 * fix main nav not set properly on client. 2023-08-18 09:27:24 +08:00
hufangzhou c1a0757189 * Fix an error in php log. 2023-08-17 13:06:52 +08:00
liwenrui 4dd127c4a0 * merge current 18.x into ai. 2023-08-16 10:28:06 +08:00
sunhao 25d733c1ef * optimize dtable style. 2023-08-16 09:10:31 +08:00
sunhao f0e07abf50 * fix DTable undefined. 2023-08-16 09:06:52 +08:00
sunhao 56d6008dd4 * refactor execution-all with the new zui3 dtable component. 2023-08-16 08:52:00 +08:00
chaideqing 525f11f198 * Finish task#99344. 2023-08-04 03:10:02 +00:00
tanghucheng 10acc6b909 * Fix merge zentaoipd code error. 2023-08-01 09:33:07 +08:00
hufangzhou 0d56902dd8 * Fix bug #36569, bug #36641. 2023-07-18 16:15:10 +08:00
Chenjianyu 1073d65c89 * add basic prompt audit view. 2023-07-14 14:07:02 +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 46aa8c30fd * Fix bug #36443. 2023-07-11 14:46:50 +08: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
hufangzhou 69e86f1d3f * Fix bug #35906. 2023-06-16 16:06:30 +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
hufangzhou cfa4f2130a * Finish task #93811. 2023-05-23 17:13:26 +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
Yagami 1f00f62914 * Change ipd to or. 2023-05-04 15:23:33 +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
liumengyi 8d6cc429af * Fix bug #34711. 2023-04-24 16:43:00 +08:00