Commit Graph
887 Commits
Author SHA1 Message Date
朱金勇 030da6729d * Fix bug#34112. 2023-04-13 05:28:37 +00:00
zhaoke 70013fa98e Merge remote-tracking branch 'origin/master' into zenops_66 2023-04-13 09:24:52 +08:00
zhaoke 2b1ee45b2b Merge branch 'master' into zenops_66 2023-04-13 09:06:59 +08:00
朱金勇 cecf04b069 Fix bug: show tables and desc table. 2023-04-12 16:40:08 +00:00
朱金勇 58f458f6d0 * Fix bugs of program action. 2023-04-11 05:28:42 +00:00
朱金勇 d20df48faf * Fix primary key of dmdb. 2023-04-11 03:05:50 +00:00
朱金勇 eaf7d976c1 * Fix sql function: count(if(...)). 2023-04-10 13:42:45 +00:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
朱金勇 75a3485f47 * Fix order in dmdb. 2023-04-10 03:13:24 +00:00
朱金勇 13374f3230 * Fix default value of field. 2023-04-07 02:37:07 +00:00
胡方舟 80442281d6 Merge branch 'sprint/fixbug#33382' into 'master'
* Fix bug #33382.

See merge request easycorp/zentaopms!7280
2023-04-06 01:52:47 +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
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
朱金勇 0f6b78f264 Fix strict mode of MySQL. 2023-04-05 02:11:12 +00:00
caoyanyi 8e6fe16197 * Modify back url cookie set. 2023-04-04 09:53:28 +08:00
zhaoke e7119d4217 Merge remote-tracking branch 'origin/master' into zenops_66 2023-04-03 09:36:20 +08:00
caoyanyi d477203aa7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 08:30:03 +08:00
朱金勇 f65d3aa417 * Install for dmdb. 2023-04-01 14:22:24 +00:00
chaideqing 3ad35562c4 * Fix bug #33382. 2023-03-31 13:16:27 +08:00
tianshujie fcf2687316 * Modify the selection box drop-down display. 2023-03-29 17:23:10 +08:00
zenggang f88c705e6a * Fix bug#33135 2023-03-23 02:09:38 +00:00
qixinzhi 511240d0fa Merge branch 'master' into sprint/biz17 2023-03-22 17:15:46 +08:00
caoyanyi 4ee37b3d63 * Modify input section id value. 2023-03-13 10:24:15 +08:00
guofeilong 855b1a4d76 * Adjust code for bug #32811 . 2023-03-13 09:53:13 +08:00
曾刚 2da060b171 Gitlab optimize 2023-03-09 08:05:10 +00:00
zhujinyong 3d07bde510 Support dameng database. 2023-03-07 08:49:48 +08:00
qixinzhi b4e8de97e5 Merge branch 'master' into sprint/biz17 2023-03-06 09:04:52 +08:00
wangyidong 1064bef3a7 * adjust code for editor. 2023-03-03 14:19:31 +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
caoyanyi 7d81da6fa0 * Remove unused code. 2023-02-27 13:40:47 +08:00
liuyongkai 03163f1818 * Resolve ticket #419. 2023-02-27 12:55:13 +08:00
鲁飞 c93d138a83 + Support Apcu and Yac cache driver. 2023-02-22 06:20:00 +00:00
qixinzhi 4580fb13ed Merge branch 'master' into sprint/biz17 2023-02-17 15:24:51 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +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
zenggang 317ddd5fbc * Fix bug #32024 2023-02-13 02:02:32 +00:00
qixinzhi 6e252030b0 * Fix sqlparser php check. 2023-02-10 13:10:00 +08:00
qixinzhi 7c122a0b29 * Support php 5.3 for sql parser lib. 2023-02-10 11:24:24 +08:00
liuhong da18b4b7f0 * Adjust code for bug #30537. 2023-01-03 02:33:48 +00:00
liuhong 9bd8f21ac6 * Fix bug #30537. 2023-01-03 02:22:37 +00: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
孔令茂 610e22f948 * Optimize code. 2022-12-27 08:45:32 +00:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
chaideqing b72e6e2d0c * Fix feedback 1799. 2022-12-22 12:13:52 +08:00
chaideqing 435852fd14 * Fix feedback 1799 . 2022-12-22 11:53:20 +08:00
caoyanyi 59801bf729 * Modify blame get error. 2022-12-16 13:36:23 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00