Commit Graph
288 Commits
Author SHA1 Message Date
朱金勇 050e2e0861 * Performance for stats. 2023-11-21 03:14:50 +00:00
朱金勇 6948740e1d * Migrate changes from 18.x to master. 2023-10-12 08:42:59 +00:00
朱金勇 ad288b3f1d * Use isServing() instead of IN_USE. 2023-07-10 05:56:05 +00:00
朱金勇 ccb6a094f9 * Change constant to variable. 2023-07-10 04:31:47 +00:00
朱金勇 3a215d708a * Refactor framework for roadrunner. 2023-07-09 14:30:31 +00:00
wangyuting 49f6b16c95 * Fix rawParams bug. 2023-06-29 15:55:39 +08:00
dingguodong 0279c225a4 * Refactor the function 'exportConfig()'. 2023-05-31 13:26:04 +08:00
dingguodong 5a50b0c2cf * Rename this local variable "$URI" to match the regular expression ^[a-z][a-zA-Z0-9]*$. 2023-05-31 10:36:01 +08:00
dingguodong b03b41760e * Replace the "die()" call. 2023-05-31 10:36:00 +08:00
dingguodong b2ca9689e0 * Rename $this->URI to $this->uri. 2023-05-29 08:55:57 +08:00
朱金勇 894118767e - Remove unused local variable. 2023-05-28 22:42:30 +00:00
sunhao d5ca9ef356 * zin: improve UI for reporting errors in zin page. 2023-05-11 13:46:21 +08:00
hufangzhou dc8fcc9484 * Merge 18.4 into master. 2023-05-05 09:26:04 +08:00
Lufei 026fdb0cee * Fix can't load the config directory. 2023-04-26 19:34:44 +08:00
wangyidong 901fc68f3c * adjust for change bizVersion to edition. 2023-04-24 17:00:52 +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
caoyanyi 59e5ce1d2f * Modify table name escape. 2023-04-20 17:22:13 +08: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
tianshujie 31518d5758 * Fixed projectCommon language item errors. 2023-03-27 11:18:27 +08:00
wangyidong 7329558777 * fix sonar error. 2023-03-16 14:46:48 +08:00
wangyidong 1fbb0b4c5f * fix for upgrade. 2023-03-16 14:06:55 +08:00
wangyidong 4bcac4593a * fix bug #32988. 2023-03-16 10:05:37 +08:00
tianshujie 4d400723ce * Modify more select display method. 2023-03-03 15:54:33 +08:00
wangyidong 331d38825b * code for feature bar. 2023-02-23 16:09:59 +08:00
wangyidong 734a64958c * code for custom menu lang. 2023-02-15 15:51:02 +08:00
wangyidong ff5bc056bd * code for replace menu lang. 2023-02-14 13:35:12 +08:00
鲁飞 2f4ad5c556 * Format code and fix return value. 2022-12-06 06:05:18 +00:00
daitingting 40ff070bc9 * Fix bug #29652. 2022-11-16 09:15:15 +00:00
daitingting bb4a0945fd * Finish task #74859. 2022-11-04 09:20:53 +00:00
wangyuting2 a1df161747 * Finish task #73818. 2022-10-27 06:45:09 +00:00
wangyuting2 5467991e67 * Finish task #73814. 2022-10-27 06:10:54 +00:00
wangyuting2 f8f329ec94 * Finish task #73470. 2022-10-26 07:01:57 +00:00
wangyuting2 d33cc87da9 * Fix bug in review code. 2022-09-29 05:50:16 +00:00
daitingting 63f84968b7 * Finish task #70546. 2022-09-28 07:17:52 +00:00
wangyuting2 ef6a569f2e * Add disabledFeatures config. 2022-09-27 07:38:49 +00:00
daitingting f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
daitingting fe13c4de38 * Doing task #69253. 2022-09-16 01:02:13 +00:00
daitingting e06b64e997 * Add fetchModule to distinguish rawModule. 2022-07-06 08:42:21 +00:00
zenggang ea2280da59 * Adjust code 2022-06-14 06:56:01 +00:00
zenggang cc49cbe439 * Finish task#57156 2022-06-14 06:03:55 +00:00
wangyidong f9a14f40d4 * adjust for task #56614. 2022-06-09 13:50:18 +08:00
wangyidong 5147feb289 * adjust for set flow uri. 2022-06-09 11:32:47 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
dingguodong 39b77f36b6 * Add codes for saas extension. 2022-05-10 13:24:06 +08:00
daitingting 59b1e62590 * Update setFlowURI and mergeParams function according to zdoo. 2022-05-06 07:36:11 +00:00
wangyidong 2d82ad3e79 * fix bug. 2022-04-27 10:33:03 +08:00
wangyidong 899c123dac * code for bug #19303. 2022-04-27 09:37:01 +08:00
liyuchun cd9b896e71 * Fix bug #18316. 2022-03-29 17:30:47 +08:00