Commit Graph
945 Commits
Author SHA1 Message Date
wangyidong 5866f61a86 * Merge from master. 2020-12-16 17:36:51 +08:00
tianshujie98 d8fb7654be * Finish task #8683. 2020-12-16 15:42:20 +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 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 2b26da8044 * Fix bug #3730. 2020-12-07 15:20:24 +08:00
wangyidong 0352480278 * fix bug. 2020-12-01 13:31:01 +08:00
z f19b03ede0 * fix for check one clicke package. 2020-11-30 15:22:33 +08:00
z ca26bfbfec * fix bug and upgrade. 2020-11-29 17:21:01 +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
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
Catouse 2c6d7d153b * storage template html as templateHtml property of keditor instance. 2020-10-12 20:08:20 +08:00
tianshujie98 677fa52863 * Revert submission. 2020-10-09 08:31:30 +08:00
tianshujie98 dd3c2677b6 * Adjust code style. 2020-09-25 16:51:31 +08:00
tianshujie98 ac8ab8d868 * Finish task #8009. 2020-09-24 09:30:55 +08:00
holan20180123 1aca528db1 * Finish task #7917. 2020-09-17 16:20:04 +08:00
holan20180123 e590c140b3 * Finish task #7917. 2020-09-17 15:58:09 +08:00
qiyu-xie a1fcff2a25 * Finish task#7929. 2020-09-16 15:46:25 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
z 859b836916 * adjust for ja lang. 2020-09-12 10:55:23 +08:00
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
tianshujie98 5657235d84 * Fix bug 3464. 2020-09-11 14:44:29 +08:00
z c6116c1b9e * finish task #7800. 2020-09-04 09:45:42 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
tianshujie98 fdf70435de Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-07 17:02:37 +08:00
z 4acf8e3990 * finish task #7603,7603. 2020-08-07 15:14:20 +08:00
tianshujie98 a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
z a748df7c3c * code for task #7600. 2020-08-04 14:05:41 +08:00
z 9a17e562d8 * merge fr lang. 2020-08-03 10:14:25 +08:00
z 9b835f13fd * finish task #7534. 2020-07-24 20:57:32 +08:00
z 174f3b99ca * finish task #7310. 2020-07-06 15:57:58 +08:00
z 9b80f4d9de * code for task #7302. 2020-07-06 09:08:09 +08:00
z 3aca3ee0cc * finish task #7301. 2020-07-03 13:07:49 +08:00
z 30415e3d52 * fix for undelete project and product. 2020-06-23 09:26:47 +08:00
z 3a391ea836 * finish task #7277. 2020-06-22 14:30:52 +08:00
z 6b6c9a713e * finish task #7260. 2020-06-17 14:40:44 +08:00
z d8ce393afa * finish task #7264. 2020-06-17 10:48:37 +08:00
z 5eca2a6ca7 * adjust for change locate page when login. 2020-06-16 10:45:19 +08:00
wangyidong fd0da30d09 * fix bug. 2020-05-26 09:14:31 +08:00