 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 |
|
|
朱金勇
|
ca30397678
|
* Reset commit.
|
2023-04-20 02:18:40 +00:00 |
|
|
朱金勇
|
93aa3e307b
|
* Format zentao.sql.
|
2023-04-20 02:17:53 +00: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 |
|
|
朱金勇
|
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 |
|
|
qixinzhi
|
511240d0fa
|
Merge branch 'master' into sprint/biz17
|
2023-03-22 17:15:46 +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 |
|
|
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 |
|
|
孔令茂
|
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 |
|
|
王怡栋
|
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 |
|
|
wangyidong
|
a5b9f374d1
|
* merge git stash.
|
2022-11-10 15:50:17 +08:00 |
|
|
wangyidong
|
6eae8345f7
|
* merge ztSessionHandler.
|
2022-11-10 15:47:05 +08:00 |
|
|
wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
|
Lufei
|
35ef023439
|
* Fix die error for xuanxuan.
|
2022-11-04 17:17:49 +08:00 |
|
|
朱金勇
|
8fff18a3ea
|
Merge branch 'sprint/fix-api' into 'master'
* Fix call api error.
See merge request easycorp/zentaopms!6025
|
2022-11-04 02:51:21 +00:00 |
|
|
鲁飞
|
95d10ea6d3
|
* Fix call api error.
|
2022-11-04 02:51:20 +00:00 |
|
|
tianshujie
|
787ba2ad2d
|
* Fix bug #29247.
|
2022-11-04 10:17:00 +08:00 |
|
|
wangyidong
|
59f0cc09d9
|
* adjust for account.
|
2022-11-03 15:58:08 +08:00 |
|
|
zhujinyong
|
e5aa646144
|
* Fix session for api.
|
2022-11-03 10:03:19 +08:00 |
|
|
鲁飞
|
e0cd779954
|
* Remove use exit for api.
|
2022-11-03 00:32:42 +00:00 |
|
|
wangyidong
|
fd56b11e41
|
* code for task #74779.
|
2022-11-02 10:18:26 +08:00 |
|
|
Lufei
|
3970bc226d
|
* Fix install and upgrade locate error.
|
2022-11-01 19:22:40 +08:00 |
|
|
Lufei
|
ac363b3df7
|
* Fix install error.
|
2022-11-01 15:44:49 +08:00 |
|
|
wangyidong
|
4f824f9410
|
* code for task #73994.
|
2022-11-01 15:02:20 +08:00 |
|
|
Yagami
|
68665d5ed0
|
* Finish task #74207.
|
2022-11-01 14:57:52 +08:00 |
|
|
liugang
|
540cd0e3c5
|
* Rename model to target.
|
2022-11-01 09:59:32 +08:00 |
|
|
liugang
|
8220ce7025
|
* Load tao class in the model class and its subclasses.
|
2022-11-01 09:47:09 +08:00 |
|
|
liugang
|
9b6e282725
|
* Load zen class in the control class and its subclasses.
|
2022-11-01 09:45:25 +08:00 |
|
|
Lufei
|
031838a6ce
|
* Fix loadModel for entry.
|
2022-10-31 16:36:52 +08:00 |
|
|
鲁飞
|
b1cb5a798e
|
* Fix bug of unauthorized users.
|
2022-10-28 08:16:50 +00:00 |
|
|
wangyidong
|
11e0ad5c0b
|
* adjust for ztsession.
|
2022-10-28 09:38:40 +08:00 |
|
|
Guan Xiying
|
c2e9f3dab2
|
* Add function to load target file.
|
2022-10-27 15:48:48 +08:00 |
|
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
|
Guan Xiying
|
3848e7312d
|
* Use $this->moduleName instead of $moduleName for it might be empty
sometimes.
|
2022-10-26 14:00:12 +08:00 |
|
|
Guan Xiying
|
3c46850e0e
|
* Return false when the target object is empty to avoid assigning
property to a null object.
|
2022-10-26 13:58:18 +08:00 |
|
|
Guan Xiying
|
a3da6393be
|
* Don't need load config and lang when load the zen object.
|
2022-10-26 13:57:38 +08:00 |
|