Commit Graph
55488 Commits
Author SHA1 Message Date
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
Wangyuting 3022a8391f * Optimize block model function. 2023-04-25 09:53:11 +08:00
dingguodong bb7bae58bb + Return empty array if value is null. 2023-04-25 09:37:47 +08:00
dingguodong 8298fd9d55 + Call native PHP functions if function exists. 2023-04-25 09:25:53 +08:00
Hao Sun 5cea6b0e52 * zin: fix event binding code 2023-04-24 19:20:16 +08:00
Hao Sun ad14ae05be * zin: refactor render func 2023-04-24 19:20:16 +08:00
Hao Sun 4704851a8c * zin: refactor inputGroup, support custom input control type 2023-04-24 19:20:16 +08:00
Hao Sun edf1c06147 + zin: add new wg "pageForm" 2023-04-24 19:20:16 +08:00
Wangyuting ab1be6a922 * Optimize block getList function and getLastKey function. 2023-04-24 17:11:22 +08:00
管西迎 bdffadde69 Merge pull request 'unit_test' (#7) from unit_test into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/7
2023-04-24 16:48:51 +08:00
Wangyuting 1c4f2bce96 * Optimize block getByID function. 2023-04-24 16:11:54 +08:00
Hao Sun 8f349a2723 * zin: rename historyRecord to history 2023-04-24 15:40:40 +08:00
Hao Sun 935f60abfc * zin: highlight code generated by zin tool 2023-04-24 15:39:33 +08:00
Hao Sun 0096b1c907 * zin: remove unused wgs 2023-04-24 15:39:33 +08:00
Hao Sun cc6745d823 * zin: optimize zin-tool 2023-04-24 15:39:33 +08:00
zhouxin edef1633dc * Adjust ztest and utils.php. 2023-04-24 07:19:45 +00:00
陈涛 47327e6f68 * fix bug. 2023-04-24 14:51:42 +08:00
liyang e3e34c7a98 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-24 13:43:14 +08:00
liyang 697f46f8e5 + Add parse the script function. 2023-04-24 13:42:16 +08:00
wangyidong a2d12a01b5 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-24 13:19:07 +08:00
wangyidong 9bf494d4ce * fix bug. 2023-04-24 13:18:57 +08:00
Hao Sun ad6295d942 * zin: move event binding code to default js scope 2023-04-24 13:17:13 +08:00
Hao Sun 4abc9e9ae9 * zin: refactor 2023-04-24 13:17:13 +08:00
孙广明 86a4b79199 * Add project.mm. 2023-04-24 13:04:53 +08:00
wangyidong c13bd84432 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-24 13:01:03 +08:00
Lufei d2951d0c5c * Fix formatTime type error. 2023-04-24 12:39:40 +08:00
wangyidong 041ebc6a71 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-24 11:01:03 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
Lufei 8b32e6592a * Fix type error. 2023-04-24 10:01:12 +08:00
wangyidong 75a007b3fb Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-24 10:01:03 +08:00
Lufei 713f4d6262 * Fix install error. 2023-04-24 09:49:31 +08:00
孙广明 4e41688eb8 * Remove 2.md. 2023-04-24 09:40:09 +08:00
孙广明 45781a4b62 * Remove project.md, add 2.md. 2023-04-24 09:24:36 +08:00
liyang 81dccead8d * Add group. 2023-04-24 09:12:45 +08:00
wangyidong b52f1da1bf * fix for php8.1 2023-04-24 09:05:04 +08:00
Hao Sun 8545188e70 * fix inlink not work in namespace zin 2023-04-24 09:02:48 +08:00
孙广明 4b8bafa370 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-24 08:51:40 +08:00
宋辰轩 e567ab2713 Merge pull request '* Fix bug for api.' (#3) from sprint/scx_testcaseapi into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/3
2023-04-24 08:51:37 +08:00
孙广明 3f9958a620 * Add project.md. 2023-04-24 08:51:28 +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
朱金勇 f7829c8ebc Merge branch 'feature/php81' into 'master'
* Support PHP8.1.

See merge request easycorp/zentaopms!7559
2023-04-23 11:21:09 +00: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
宋辰轩 bd7b43a1a5 * Fix bug for api. 2023-04-23 18:44:51 +08:00
朱金勇 2ed6472bc8 Merge branch 'fix_safe_notice' into 'master'
* Fix notice switch error in admin safe page.

See merge request easycorp/zentaopms!7557
2023-04-23 08:00:43 +00:00
Lufei 99f7f62456 * Fix notice switch error in admin safe page. 2023-04-23 15:51:35 +08:00
Hao Sun 3abba7398a * zin: fix formPanel actions not work 2023-04-23 11:34:07 +08:00
刘刚 8792d9217e Merge branch 'daitingting_bug_#34576' into 'master'
* Fix bug #34576.

See merge request easycorp/zentaopms!7555
2023-04-23 03:27:29 +00:00