王怡栋
|
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 |
|
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 |
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
caoyanyi
|
1a68e5ac28
|
* Modify session error.
|
2022-10-26 09:56:45 +08:00 |
|
wangyidong
|
460c3d9fb1
|
* adjust for ztSessionHandler.
|
2022-10-09 10:41:14 +08:00 |
|
wangyidong
|
1e928ed625
|
* code for task #70541.
|
2022-09-29 09:50:11 +08:00 |
|
wangyidong
|
a4ae767404
|
* adjust for ztSessionHandler.
|
2022-09-29 09:38:22 +08:00 |
|
wangyidong
|
fd623cb0c4
|
* adjust for code ajax send.
|
2022-09-27 15:18:51 +08:00 |
|
wangyidong
|
d859327126
|
* fix bug #26951.
|
2022-08-29 09:17:51 +08:00 |
|
wangyidong
|
f18bba53af
|
* adjust for ioncube php8.1.
|
2022-08-25 16:18:53 +08:00 |
|
liumengyi
|
e1a022ba7f
|
* Fix bug #26768.
|
2022-08-24 10:54:29 +08:00 |
|
wangyidong
|
1897a831dd
|
* fix for php8.1
|
2022-08-22 17:00:23 +08:00 |
|
tianshujie
|
98694da2ae
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-18 16:47:14 +08:00 |
|
tianshujie
|
24e39026cc
|
* Finish task #64967.
|
2022-08-16 17:07:27 +08:00 |
|
liyuchun
|
6c2cacf02c
|
Merge branch 'master' into zenops_41
|
2022-08-10 08:26:42 +00:00 |
|
wangyidong
|
aaee558b83
|
* code for task #62742.
|
2022-08-04 17:30:27 +08:00 |
|
wangyidong
|
f5b6edef01
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:13:53 +08:00 |
|
caoyanyi
|
06abe97624
|
* Modify branch check error.
|
2022-08-02 15:19:08 +08:00 |
|
hufangzhou
|
8883ac8e77
|
* Finish task #62132, #62133, #62134, #62135, #62136.
|
2022-07-26 18:14:09 +08:00 |
|
wangyidong
|
7542c26998
|
* code for task #61483.
|
2022-07-20 10:58:57 +08:00 |
|
wangyidong
|
35c8543a74
|
* adjust for check account in set vision.
|
2022-07-11 10:08:40 +08:00 |
|
wangyidong
|
072945f180
|
* fix for tid.
|
2022-07-07 10:09:19 +08:00 |
|
zhujinyong
|
467b958ba0
|
* If run in container, no need check ok.txt.
|
2022-06-29 16:35:39 +08:00 |
|
wangyidong
|
549bd70626
|
* code for bug #24381.
|
2022-06-28 15:29:11 +08:00 |
|
lanzongjun
|
61234b500f
|
* fix bug workflowdatasource
|
2022-05-31 16:07:58 +08:00 |
|
wangyidong
|
a899fad671
|
* check $_SERVER['REQUEST_URI'] var.
|
2022-05-30 17:06:18 +08:00 |
|
liyuchun
|
8a008bc17a
|
* Fix bug for cli.
|
2022-05-26 02:48:59 +00:00 |
|
wangyidong
|
2bbae04ded
|
* adjust for tid.
|
2022-05-24 16:57:56 +08:00 |
|
wangyidong
|
b072234b4d
|
* adjust for tid.
|
2022-05-24 15:53:57 +08:00 |
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
wangyidong
|
a8531b8e58
|
* fix bug.
|
2022-05-20 10:40:45 +08:00 |
|
wangyidong
|
e94adb7e51
|
* adjust for get installed version.
|
2022-05-20 08:33:01 +08:00 |
|