Commit Graph
1034 Commits
Author SHA1 Message Date
holan20180123 6efc361133 * Finish task #8797. 2020-12-23 14:28:44 +08:00
holan20180123 aa208aca62 * Finish task #8789. 2020-12-22 16:57:21 +08:00
holan20180123 9c73a943f5 * Finish task #8797. 2020-12-22 16:07:13 +08:00
holan20180123 4ad1b0bb28 * Finish task #8797. 2020-12-22 15:43:46 +08:00
hufangzhou 91b64fce08 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-18 11:56:31 +08:00
hufangzhou 45eb988020 * Fix bug#3767. 2020-12-18 11:56:09 +08:00
Yagami 66747a8069 * Rename project common to execution common. 2020-12-18 10:04:30 +08:00
tianshujie98 5d91eb77f4 * Modify the variables of the user module. 2020-12-17 14:43:51 +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
tianshujie98 c6ce008774 * Finish task #8683. 2020-12-16 15:23:51 +08:00
wangyidong c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +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 28af1ae7e3 * adjust for notice one click safe. 2020-12-10 17:06:50 +08:00
wangyidong bf6dcd8481 * adjust for check one click package. 2020-12-09 17:44:43 +08:00
Yagami 6cd56309e2 * Finish task #8585. 2020-12-09 13:19:07 +08:00
Yagami fdd19cd2a1 * Finish task #8580. 2020-12-09 11:41:41 +08:00
wangyidong ff9a3932cc * adjust for check one click package. 2020-12-09 10:53:04 +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
tianshujie98 99359da6fd * Fix bug. 2020-12-08 08:29:08 +08:00
tianshujie98 bfce366ef1 * Fix bug. 2020-12-08 08:24:20 +08:00
tianshujie98 5be348e08e * Fix bug #3730. 2020-12-07 15:34:59 +08:00
tianshujie98 2b26da8044 * Fix bug #3730. 2020-12-07 15:20:24 +08:00
wangyidong 0352480278 * fix bug. 2020-12-01 13:31:01 +08:00
wangyidong a1ae7b15bf * fix bug. 2020-12-01 13:24:04 +08:00
wangyidong e10897a838 * fix bug. 2020-12-01 09:03:32 +08:00
z f19b03ede0 * fix for check one clicke package. 2020-11-30 15:22:33 +08:00
hufangzhou a98557a3cc * Modify the variable name. 2020-11-30 08:46:59 +08:00
z ca26bfbfec * fix bug and upgrade. 2020-11-29 17:21:01 +08:00
leiyong 1a70a9f311 * Add projectstory module permissions. 2020-11-26 17:52:30 +08:00
hufangzhou 5b0a2a341a * Finish task#8447. 2020-11-26 10:56:51 +08:00
hufangzhou 6cdd6d850b Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-25 12:31:08 +08:00
hufangzhou bfc2ec33ad * Fix an error. 2020-11-25 12:27:04 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
hufangzhou 37f8d75f1e * Finish task#8455. 2020-11-25 09:15:28 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami 310bf2b2c3 * Rename my project and program. 2020-11-20 14:53:33 +08:00
z 3e902392ac * search with account. 2020-11-20 13:09:02 +08:00
z 5362b9367f * add new version and upgrade. 2020-11-19 11:20:03 +08:00
qiyu-xie 3d85fc9346 * Finish task#8423. 2020-11-17 16:58:46 +08:00
leiyong 2d866bbd8b * Fix bug. 2020-11-17 16:23:24 +08:00
tianshujie98 ed8dcc38cd * Finish task #8422. 2020-11-17 14:42:50 +08:00
tianshujie98 9b811e95cb * Adjust code style and add language item. 2020-11-13 16:44:43 +08:00
qiyu-xie 1ea321fea5 * Finish task#8239. 2020-11-05 11:10:53 +08:00
guanxiying 7bcea20380 * Add bind and oauth register function. 2020-11-02 16:33:22 +08:00
guanxiying 7f1029c349 * Add usermodel::login function 2020-11-02 16:31:10 +08:00
guanxiying b29244195c * Add login function. 2020-11-02 16:30:38 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00