Commit Graph
223 Commits
Author SHA1 Message Date
tanghucheng c7b7e23870 Merge branch 'release-18.10' into 18.x 2024-01-02 08:40:58 +08:00
孔令茂 cd298d3b91 + Add allowed attr for purifier. 2023-12-27 10:47:03 +08:00
孔令茂 5f3d180e65 Revert "+ Add allowed attr for purifier."
This reverts commit b5f81a7a2a.
2023-12-27 10:22:07 +08:00
孔令茂 b5f81a7a2a + Add allowed attr for purifier. 2023-12-26 17:07:17 +08:00
朱金勇 586fb4fbc1 * Fix dmdb count(). 2023-12-21 09:31:57 +08:00
朱金勇 70038e8719 * Fix dmdb query(). 2023-12-21 09:12:58 +08:00
wangyidong 416a649c52 * Adjust for upgrade consistency. 2023-12-06 09:26:32 +08:00
zhujinyong 9f629fbd1d * Compatible with 'NULL' in sql. 2023-11-29 14:20:39 +08:00
wangyidong 3b678ab54c * Adjust for save upgrade log. 2023-11-25 14:57:22 +08:00
wangyidong c59d02e73b * Prune save log in upgrade and add real-time save sql. 2023-11-25 14:57:22 +08:00
wangyidong 3608679b9d * Convert process into configuration for upgrade. 2023-11-25 14:57:22 +08:00
zhujinyong 4bfbf17845 * Clear cron queue. 2023-11-16 10:03:11 +08:00
qixinzhi b4ebe635e1 * Add en comment. 2023-11-14 16:55:38 +08:00
qixinzhi 4cf9067fa6 * Add comment for throwError. 2023-11-14 15:45:19 +08:00
qixinzhi ae917db86b * Add throwError flag for throw exception with sql error. 2023-11-14 14:37:45 +08:00
tanghucheng 71babf2920 Merge branch '18.8.1' into 18.x 2023-10-27 04:39:19 -04:00
孔令茂 2ae1d4732c * Filter referer xss characters. 2023-10-26 11:01:07 +08:00
hufangzhou 9edba1433d * Fix bug #104588, resolved the issue where multi-level nesting of 'beginIF' in DAO was not effective. 2023-10-17 17:30:40 +08:00
zhujinyong 1376e7667c - Reset commit. 2023-09-11 14:10:27 +08:00
zhujinyong fdc9ffa298 * Fix HTTP_REFERER. 2023-09-11 13:59:51 +08:00
zhujinyong 1e8616c812 + Add slave dbs and bi db. 2023-08-30 18:06:32 +08:00
zenggang 29f2f5187b * Merge 18.x 2023-08-28 10:27:22 +00:00
wangyidong 5789c25d12 * Fix bug #37592. 2023-08-25 15:25:39 +08:00
wangyidong 8f2bbbaba4 * Fix bug #37561. 2023-08-25 10:20:40 +08:00
zhaoke 3ff255f290 * Fix bug #37164. 2023-08-10 15:25:44 +08:00
sunhao 3bd745233d * zin: support for using zin module. 2023-07-26 16:31:14 +08:00
sunhao e97ab9686b + add zin and zui3 files. 2023-07-25 17:42:27 +08:00
Lufei 4921d93d3e * Fix end(): Calling end() on an object is deprecated. 2023-06-07 13:24:21 +08:00
caoyanyi 5af27aa338 * Fix bug #34893, Modify back button link. 2023-04-27 13:25:35 +08:00
hufangzhou bccd7f677e * Fix bug #34868. 2023-04-26 15:17:11 +08:00
caoyanyi 4be7f200dd * Fix bug #34574. 2023-04-21 14:43:36 +08:00
朱金勇 e7cc2b2e5e * Fix sync repo. 2023-04-19 02:10:10 +00:00
朱金勇 2ca80b1aa3 * Fix bug#34346. 2023-04-19 00:53:12 +00:00
朱金勇 3e887438ef * Fix bug#34221. 2023-04-17 09:00:33 +00:00
朱金勇 9fe8e0393c * Fix keywords. 2023-04-17 07:16:46 +00:00
朱金勇 619077d036 * Fix replace method. 2023-04-17 07:04:03 +00:00
朱金勇 7969effc29 * Fix bug#34139, 34238, 34075. 2023-04-16 13:54:16 +00:00
朱金勇 cecf04b069 Fix bug: show tables and desc table. 2023-04-12 16:40:08 +00:00
朱金勇 d20df48faf * Fix primary key of dmdb. 2023-04-11 03:05:50 +00:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +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
caoyanyi 8e6fe16197 * Modify back url cookie set. 2023-04-04 09:53:28 +08:00
朱金勇 f65d3aa417 * Install for dmdb. 2023-04-01 14:22:24 +00:00
caoyanyi 4ee37b3d63 * Modify input section id value. 2023-03-13 10:24:15 +08:00
guofeilong 40015657cc * Code for task #85502 2023-03-02 10:16:48 +08:00
guofeilong 68e10e515e * Code for task #85502 2023-03-01 13:54:45 +08:00
Wenrui LI f03bf51121 * use static:: instead of self:: to enable extending static functions, and inject script to make js alert work on zentao client. 2023-02-13 14:00:55 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
王怡栋 4af7ffbfa9 Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6640
2022-12-27 08:48:41 +00:00