Commit Graph
685 Commits
Author SHA1 Message Date
Lufei c4a5d8a525 + Support debug trace. 2023-04-27 18:48:56 +08:00
sunhao 28dbe2cf08 * set trace data to page data. 2023-04-27 15:16:49 +08:00
Lufei 049643d481 * Optimize trace class. 2023-04-27 09:33:19 +08:00
Lufei 430a4e00cb + Support xhprof. 2023-04-27 09:32:50 +08:00
Lufei 62b1e1ad5b * Fix removePHPTAG error. 2023-04-27 08:46:07 +08:00
sunhao 4d7f5e886c * zin: support to fetch content only commands. 2023-04-26 18:48:05 +08:00
liugang 4981fcb9dd * Fix error cann't use the fetch function to call an encrypted extended control method - fix bug #34614, 34615, 34627. 2023-04-26 00:39:07 +00:00
WenruiLI ea5e9c2b8a + expose mysql performance data with server timing headers. 2023-04-25 16:01:30 +08:00
Lufei 4175224c89 * Support zinErrors. 2023-04-25 10:30:07 +08:00
Lufei 6dc32b44c2 + Support debug trace. 2023-04-25 10:10:53 +08:00
Lufei 8b32e6592a * Fix type error. 2023-04-24 10:01:12 +08:00
Hao Sun ed31bffa6c Merge branch 'zin_merge'
# Conflicts:
#	framework/base/control.class.php
#	framework/control.class.php
2023-04-23 19:44:40 +08:00
鲁飞 045289d4c7 * Support PHP8.1. 2023-04-23 11:21:09 +00:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +08:00
朱金勇 ca30397678 * Reset commit. 2023-04-20 02:18:40 +00:00
朱金勇 93aa3e307b * Format zentao.sql. 2023-04-20 02:17:53 +00:00
Hao Sun 6acbd4e04c * zin: fix getalllheaders not work in all php environments 2023-04-18 13:34:31 +08:00
Hao Sun fc987134f4 * zin: fix setOpenApp not work 2023-04-18 13:17:16 +08:00
Hao Sun 1d5642a2fe * zin: refactor setOpenApp method with header x-zin-app 2023-04-16 15:02:26 +08:00
鲁飞 5e5c93fbd8 Revert "Merge branch 'session' into 'master'"
This reverts merge request !7395
2023-04-13 08:55:06 +00:00
Lufei 6c1ea3dca9 * Fix typo. 2023-04-13 10:51:26 +08:00
Hao Sun f4061b2533 * zin: record page errors to zin data 2023-04-12 11:35:56 +08:00
朱金勇 d20df48faf * Fix primary key of dmdb. 2023-04-11 03:05:50 +00:00
liugang 5f54d5e5e4 * Fix error the global $dao variable is replaced with a new instance when call function loadModel. 2023-04-06 05:22:14 +00:00
朱金勇 4cf70fdf7e * Fix insert method of dao. 2023-04-05 15:58:43 +00:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 0f6b78f264 Fix strict mode of MySQL. 2023-04-05 02:11:12 +00:00
Hao Sun 12aa970435 * zin: auto load zin view file if exists 2023-03-29 14:09:49 +08:00
qixinzhi 511240d0fa Merge branch 'master' into sprint/biz17 2023-03-22 17:15:46 +08:00
Hao Sun e6ea048e7c * zin: refactor in review 2023-03-22 17:07:26 +08:00
Hao Sun f5daa020c1 * zin: support for loading page css and js from file 2023-03-15 17:23:53 +08:00
陈涛 0df2e0f890 * zin: add QueryString 'o' for rendering original view. 2023-03-14 15:33:56 +08:00
wangyuting2 d14143c340 * Add new goview css. 2023-03-07 10:47:28 +08:00
zhujinyong 3d07bde510 Support dameng database. 2023-03-07 08:49:48 +08:00
Hao Sun 90ea7f4d3a + zin: add data helpers. 2023-03-03 14:41:25 +08:00
caoyanyi f53617aa6d * Modify language get. 2023-02-15 17:11:48 +08:00
caoyanyi 3bf16c880e * Optimize main and ext files get, and add get default lang function. 2023-02-15 11:22:42 +08:00
zhaoke 591fd06346 * Fix array_column not support object array. 2023-02-10 01:14:03 +00:00
zhaoke 55c9922a49 * Fix error for php5.3. 2023-02-09 09:14:17 +00:00
Hao Sun 2560eb459a + zin: add core files. 2023-01-16 15:42:07 +08:00
tianshujie 15b9176f8d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2023-01-03 16:52:49 +08:00
孔令茂 5de767bed3 * Optimize word. 2022-12-17 14:06:27 +00:00
鲁飞 2f4ad5c556 * Format code and fix return value. 2022-12-06 06:05:18 +00:00
dingguodong 5fc4eeb5dd * Adjust extension loading priority for saas. 2022-12-05 10:00:37 +08:00
wangyidong e460772fc4 * code for task #77129. 2022-11-29 10:52:01 +08:00
liugang 08748eb7d4 Merge branch 'guanxiying/zentaopms-master' 2022-11-23 10:09:31 +08:00
tianshujie 718817d9fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-11 14:48:03 +08:00
王怡栋 66b9e6b116 Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
#   framework/base/router.class.php
2022-11-11 02:49:32 +00:00
wangyidong 8a178c72fe * adjust for project release link story and bug. 2022-11-11 10:47:01 +08:00
tianshujie 7500c5a61d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zin 2022-11-11 08:45:55 +08:00