Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
18,617 Commits 2 Branches 292 Tags
d6d4aa3b551f212a8be9b23fde26e94880dfd2ed
Commit Graph
18617 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
qiyu-xie d6d4aa3b55 * Fix bug#3692. 2020-12-17 14:00:43 +08:00
wangyidong 9e1e418e5a * code task #8701 2020-12-17 11:28:33 +08:00
qiyu-xie 64a728eb6f * Fix bug#3692. 2020-12-17 10:02:42 +08:00
tianshujie98 aaf3c65aec * Fix bug. 2020-12-17 10:00:11 +08:00
wangyidong 5866f61a86 * Merge from master. 2020-12-16 17:36:51 +08:00
wangyidong 67aea6d89e * finish task #8653. 2020-12-16 17:36:51 +08:00
tianshujie98 d8fb7654be * Finish task #8683. 2020-12-16 15:42:20 +08:00
tianshujie98 9f62bf3273 * Finish task #8669. 2020-12-16 15:39:22 +08:00
wangyidong eac61b8182 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-12-16 14:40:29 +08:00
wangyidong 371ab04e09 * fix for error when not isset canBeChanged var. 2020-12-16 14:39:02 +08:00
wangyidong 8a65594587 * change for compatible openssl and mcrypt. 2020-12-16 14:37:03 +08:00
leiyong 3cc73fba99 * Fix bug. 2020-12-15 10:04:06 +08:00
qiyu-xie da9abb3688 * Fix bug. 2020-12-15 08:10:05 +08:00
holan20180123 94202fdd89 * Fix bug #3708. 2020-12-14 16:21:45 +08:00
Catouse 84a13edd5e * update $.gotoObject method. 2020-12-14 14:14:20 +08:00
hufangzhou 6a00a09817 * Fix bug#3740. 2020-12-14 11:19:43 +08:00
wangyidong 5dbd8270bb * fix bug #3744. 2020-12-11 17:22:40 +08:00
wangyidong eadd494a9b * fix bug. 2020-12-11 16:56:13 +08:00
wangyidong aa7c7c43c4 * fix bug. 2020-12-11 16:56:13 +08:00
tianshujie98 f734f15e7a * Adjust code style. 2020-12-11 16:52:33 +08:00
wangyidong f7d642e843 * adjust for build by tag. 2020-12-11 16:10:41 +08:00
wangyidong 4b3e092822 * fix bug #3657. 2020-12-11 16:10:41 +08:00
Catouse e82c98d242 * update kindeditor to support transfer events from iframe to parent document. 2020-12-11 16:03:17 +08:00
Catouse 1ef8caaca3 * update zui.js. 2020-12-11 16:02:07 +08:00
wangyidong 51e91bc786 * code bug #3568. 2020-12-11 10:14:29 +08:00
wangyidong 95470ded6e * code bug #3688. 2020-12-11 09:54:23 +08:00
wangyidong 5eda53df87 * code for bug #3693. 2020-12-11 09:30:43 +08:00
wangyidong 4ea7be9c72 * adjust lang. 2020-12-11 08:53:07 +08:00
wangyidong 197d1c0355 * adjust for en lang. 2020-12-10 17:22:21 +08:00
wangyidong b3244a73a3 * adjust for en lang. 2020-12-10 17:15:34 +08:00
wangyidong 28af1ae7e3 * adjust for notice one click safe. 2020-12-10 17:06:50 +08:00
wangyidong ecae390f75 * adjust style. 2020-12-10 17:06:31 +08:00
wangyidong ff9a3932cc * adjust for check one click package. 2020-12-09 10:53:04 +08:00
qiyu-xie 1654db7e6c * Fix bug. 2020-12-08 14:56:04 +08:00
wangyidong 0be576eba3 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-12-08 14:53:01 +08:00
wangyidong fa246c1173 * finish task #3688. 2020-12-08 14:52:26 +08:00
holan20180123 58b718bfc0 * Fix bug #3644. 2020-12-08 14:36:11 +08:00
tianshujie98 a928152210 * Fix bug #3704. 2020-12-08 13:04:57 +08:00
wangyidong ad94534129 * fix bug #3737. 2020-12-08 11:24:07 +08:00
holan20180123 031134ae3f * Fix bug 3642. 2020-12-08 10:41:56 +08:00
wangyidong b5ad4665b4 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-12-08 09:26:47 +08:00
wangyidong 8de5f93c2b * fix bug #3693. 2020-12-08 09:21:32 +08:00
hufangzhou c33b130d05 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-12-08 09:11:28 +08:00
hufangzhou de8e4fc5ab * Fix bug#3715. 2020-12-08 09:11:11 +08:00
tianshujie98 99359da6fd * Fix bug. 2020-12-08 08:29:08 +08:00
wangyidong badeb97dca * adjust for encrypt password. 2020-12-07 18:08:35 +08:00
tianshujie98 2b26da8044 * Fix bug #3730. 2020-12-07 15:20:24 +08:00
tianshujie98 f5f3dcfc99 * Fix bug #3707. 2020-12-07 14:37:44 +08:00
holan20180123 9cdcd2a428 * Fix bug #3636. 2020-12-07 13:10:59 +08:00
tianshujie98 d9ab0caef0 * Fix bug #3720. 2020-12-07 13:07:59 +08:00