Commit Graph
1518 Commits
Author SHA1 Message Date
sunguangming 24d3d7fb0a Merge branch 'master' into story 2024-05-22 11:27:49 +08:00
wangyuting 96812a0fc7 * Adjust login timeout link. 2024-05-17 14:41:40 +08:00
wangyuting 45eca1b0ec * Adjust login timeout link. bug #49079. 2024-05-17 14:13:14 +08:00
dingguodong b93c055ec3 * Simplify the code, use the rawurlencode and rawurldecode. 2024-05-17 12:17:48 +08:00
dingguodong 760fe9fcff * Use the rawurlencode instead of urlencode. 2024-05-17 12:17:41 +08:00
liugang b5db281c03 * baseControl: refactor the method to set response header. 2024-05-17 11:15:01 +08:00
liugang e26b5c1d3e + baseControl: use client cache before render html. 2024-05-17 11:15:01 +08:00
liugang 2f434f9fc3 + baseRouter: fetch client cache time from http header. 2024-05-17 11:15:01 +08:00
liugang 359efe3016 + baseRouter: add variables of client cache. 2024-05-17 11:15:01 +08:00
liumengyi 2bc137839a + Fix bug #49142, get workflow module name. 2024-05-16 15:36:51 +08:00
sunguangming 1cfbf7d74b Merge branch 'master' into story 2024-05-15 15:04:13 +08:00
tianshujie 0094d12bae * Add $app non-null judgment. 2024-05-14 16:54:50 +08:00
宋辰轩 fb45b947b7 * Add explain and desc function for duckdb. 2024-05-14 14:56:29 +08:00
宋辰轩 f761143481 * Remove useless app and config for duckdb class. 2024-05-14 09:29:15 +08:00
liugang 7eb23e1dad * Fix the vulnerability that induces users to click on links with sessionID to bypass authentication. 2024-05-13 16:58:29 +08:00
liugang 4aabd1ac68 - router: remove code to reset product common lang by custom setting. 2024-05-10 16:33:02 +08:00
caoyanyi 08e7542ee7 * Merge code from branch 18.x. 2024-05-09 15:18:43 +08:00
sunguangming 28b2b78698 Merge branch 'master' into story 2024-05-09 15:04:07 +08:00
dingguodong bfc2f1cae2 * Optimize and fix the issue when zentaopms hides behind the proxy server. 2024-05-09 11:32:12 +08:00
caoyanyi dca8cfd4f1 * Adjust installed check logic. 2024-05-07 13:09:58 +08:00
caoyanyi acc26ba24d Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
#	db/update20.0.beta2.sql
#	lib/zin/func.php
#	lib/zin/wg/fileselector/v1.php
#	lib/zin/wg/upload/v1.php
#	module/action/model.php
#	module/backup/js/index.ui.js
#	module/block/lang/vi.php
#	module/block/ui/recentprojectblock.html.php
#	module/block/zen.php
#	module/common/lang/vi.php
#	module/custom/lang/vi.php
#	module/execution/js/kanban.ui.js
#	module/execution/ui/story.html.php
#	module/kanban/js/view.ui.js
#	module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
#	module/mr/control.php
#	module/mr/ui/browsebyexecution.html.php
#	module/product/zen.php
#	module/programplan/zen.php
#	module/project/model.php
#	module/repo/lang/de.php
#	module/repo/lang/en.php
#	module/repo/lang/fr.php
#	module/repo/lang/zh-cn.php
#	module/space/ui/createapplication.html.php
#	module/testcase/ui/view.html.php
#	module/upgrade/model.php
#	www/js/zui3/zen-editor/p-0aaccc7e.js
#	www/js/zui3/zen-editor/p-276dd30f.js
#	www/js/zui3/zen-editor/p-2b13cc9a.js
#	www/js/zui3/zen-editor/p-38d18c5d.js
#	www/js/zui3/zen-editor/p-3f6cad83.js
#	www/js/zui3/zen-editor/p-51e3a048.js
#	www/js/zui3/zen-editor/p-617d463f.js
#	www/js/zui3/zen-editor/p-62c0132e.js
#	www/js/zui3/zen-editor/p-6d22490c.js
#	www/js/zui3/zen-editor/p-a563f50b.js
#	www/js/zui3/zen-editor/p-bf31230c.js
#	www/js/zui3/zen-editor/p-c6c95773.js
#	www/js/zui3/zen-editor/p-d83dd3f0.js
#	www/js/zui3/zen-editor/p-d8bedd14.js
#	www/js/zui3/zen-editor/p-eaaa4129.js
#	www/js/zui3/zen-editor/zen-editor.esm.js
#	www/js/zui3/zui.zentao.css
#	www/js/zui3/zui.zentao.js
2024-05-06 09:17:49 +08:00
王怡栋 08d7aa945c * Fix bug #46895. 2024-04-28 13:08:35 +08:00
liugang 1ed615f0bd * router: sort code. 2024-04-26 17:24:45 +08:00
liugang d13ef4cf6b * router: use isset instead of in_array. 2024-04-26 17:24:03 +08:00
liugang a65ce41ef7 + framework: return if the module's config has been loaded. 2024-04-26 17:23:26 +08:00
liugang e7d4092c6a * baseRouter: use isset instead of in_array. 2024-04-26 17:19:07 +08:00
liugang b2e661bd43 * baseRouter: use loadedLangs instead of loadedModules. 2024-04-26 17:17:26 +08:00
liugang 3606e41798 * baseRouter: assign the $loadedTargets variable as global. 2024-04-26 17:13:41 +08:00
liugang 3ee5e65a62 * baseModel: load cache if it's enabled. 2024-04-26 16:35:40 +08:00
liugang b74bf1146d + baseModel: add cache variable. 2024-04-26 16:35:22 +08:00
liugang defd92abc3 + router: return if the moduleName exists in cache. 2024-04-26 16:30:56 +08:00
liugang a8bb4a2b8a - baseRouter: remove the code to judge if the directory is exist. 2024-04-26 16:19:27 +08:00
liugang e59a7f23ee * baseHelper: return true if the file exists in cache. 2024-04-26 16:17:38 +08:00
liugang 549cdd55c1 - baseHelper: remove unused empty line. 2024-04-26 16:14:05 +08:00
tianshujie 09734d6423 * Fix bug #48453. 2024-04-25 17:12:05 +08:00
tianshujie ff5be095b4 * Fix bug #48453. 2024-04-25 16:32:24 +08:00
tianshujie bced2b76b4 Merge remote-tracking branch 'origin/release-20.0' 2024-04-23 17:12:24 +08:00
wangyuting dcd8abcc1c * Optimize code. 2024-04-23 16:05:53 +08:00
liugang 298c687ea7 * router: compatible with baseRouter. 2024-04-23 14:08:40 +08:00
liugang 3489d42459 + baseRouter: cache loaded modules to improve effeciency. 2024-04-23 14:03:44 +08:00
liugang 7a5791fa62 + baseHelper: cache loaded directories to improve effeciency. 2024-04-23 14:02:57 +08:00
tianshujie 91270828ca * Fix can't get user account problem. 2024-04-23 13:28:38 +08:00
王怡栋 812aed678c * Adjust code for error. 2024-04-23 11:01:28 +08:00
hufangzhou 97ff39e9c8 * Fix error of get za and device in cookie. 2024-04-23 10:08:44 +08:00
王怡栋 1c6429d3ba * Adjust code for set openapp, because check tab use lang->mainNav. 2024-04-23 09:46:44 +08:00
caoyanyi 618cb5fa14 Merge remote-tracking branch 'origin/release-20.0' 2024-04-18 10:41:42 +08:00
宋辰轩 89500432d3 * Fix router setParam type bug. 2024-04-17 17:31:35 +08:00
dingguodong e97a3b9b90 + Add the method to get the display name of the ZenTaoPMS version in different language. 2024-04-17 17:27:20 +08:00
tianshujie 0ceba1a465 * Fix bug #47911. 2024-04-17 17:01:29 +08:00
wangyuting f430986ecd * Remove buildActionList function. 2024-04-17 11:01:46 +08:00