Commit Graph
20756 Commits
Author SHA1 Message Date
hufangzhou bb8556a296 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-17 08:45:44 +08:00
hufangzhou 417cc0d800 * Finish task#8661. 2020-12-17 08:45:26 +08:00
wangyidong 16c921432d * finish task #8682. 2020-12-16 17:41:35 +08:00
wangyidong 411fff6248 * finish task #8681. 2020-12-16 17:41:35 +08:00
leiyong 061abbd023 Merge branch 'master' of github.com:easysoft/zentaopms 2020-12-16 17:29:21 +08:00
leiyong 6029f1ac69 * Adjust code. 2020-12-16 17:27:44 +08:00
wangyidong 79359a5571 * code for task #8653. 2020-12-16 17:26:27 +08:00
leiyong 687c85c539 * Finish task#8689. 2020-12-16 17:25:09 +08:00
holan20180123 8570e4fae9 * Finish task #8672. 2020-12-16 17:13:50 +08:00
tianshujie98 1a245d7229 * Finish task #8686. 2020-12-16 16:55:11 +08:00
Yagami ae552beafa * Merge sql. 2020-12-16 16:52:37 +08:00
Yagami b8d97f2f2d * Adjust code. 2020-12-16 16:51:58 +08:00
Yagami 3c2d15a481 * Fix lang. 2020-12-16 16:44:53 +08:00
tianshujie98 8967a97964 * Finish task #8686. 2020-12-16 16:29:21 +08:00
holan20180123 3c970489fa * Finish task #8574. 2020-12-16 16:10:31 +08:00
holan20180123 187b665fd0 * Finish task #8677. 2020-12-16 15:49:17 +08:00
qiyu-xie ae5ac873f1 * Fix bug#3692. 2020-12-16 15:37:57 +08:00
tianshujie98 b6fd197901 * Finish task #8669. 2020-12-16 15:35:46 +08:00
tianshujie98 9a214bbae2 * Finish task #8680. 2020-12-16 15:31:29 +08:00
qiyu-xie 54f6434a5c * Finish task#8659. 2020-12-16 15:28:42 +08:00
tianshujie98 c6ce008774 * Finish task #8683. 2020-12-16 15:23:51 +08:00
tianshujie98 51f12ade78 * Finish task #8688. 2020-12-16 15:01:57 +08:00
wangyidong d1b96633f1 * Change for compatible openssl and mcrypt.
* Fix error when no isset canBeChanged var.
2020-12-16 14:51:09 +08:00
tianshujie98 a7669d60f4 * Change the program variable to project. 2020-12-16 14:46:36 +08:00
holan20180123 44c7bcbd59 * Finish task #8678. 2020-12-16 14:46:05 +08:00
tianshujie98 c1fb6ddf0e * Finish task #8651. 2020-12-16 14:39:19 +08:00
leiyong 14ce1b7a90 * Finish task#8697. 2020-12-16 14:36:24 +08:00
qiyu-xie cf3ba0798f * Finish task#8698. 2020-12-16 14:24:30 +08:00
hufangzhou db3dccfe5e Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 14:22:45 +08:00
hufangzhou 30e13a49c8 * Finish task#8687. 2020-12-16 14:22:32 +08:00
tianshujie98 62bbdfa544 * Finish task #8695. 2020-12-16 14:21:58 +08:00
leiyong 290e4fe73d * Finish task#8699. 2020-12-16 14:10:34 +08:00
hufangzhou bc839b6e9b Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 13:49:24 +08:00
hufangzhou 8b80e3b217 * Finish task#8656. 2020-12-16 13:49:11 +08:00
holan20180123 bc5decef6e Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 13:44:20 +08:00
holan20180123 61d69d5321 * Finish task #8679. 2020-12-16 13:44:00 +08:00
hufangzhou adac247b71 * Finish task#8657. 2020-12-16 10:16:12 +08:00
hufangzhou 18d59ed478 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 10:07:12 +08:00
tianshujie98 3bc550e573 * Modify the commit field type. 2020-12-16 13:27:12 +08:00
hufangzhou f73812b3e1 * Modify the function comment. 2020-12-16 10:07:02 +08:00
leiyong b7f2235dc4 Merge branch 'master' of github.com:easysoft/zentaopms 2020-12-16 09:04:35 +08:00
leiyong cd5e4e1593 * Adjust code. 2020-12-16 09:04:13 +08:00
hufangzhou 0d1b376fcf * Adjust the code. 2020-12-16 08:59:44 +08:00
hufangzhou 6583d98e15 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 08:26:01 +08:00
hufangzhou dbcc5c949b * Adjust the code. 2020-12-16 08:25:44 +08:00
tianshujie98 90f9d9ad7c * Adjust code style. 2020-12-15 17:29:59 +08:00
leiyong a173276115 * Fix bug. 2020-12-15 10:16:39 +08:00
qiyu-xie 8a1e26837d * Delete link. 2020-12-15 09:34:58 +08:00
qiyu-xie 2e747acb1f * Adjust code style. 2020-12-15 09:21:59 +08:00
hufangzhou 1bcadb5260 * Fix an error. 2020-12-15 08:25:03 +08:00