Commit Graph
10635 Commits
Author SHA1 Message Date
wangyidong e75acb4b95 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-11 16:59:50 +08:00
wangyidong 4cc371b757 * finish task #3583. 2018-01-11 16:59:27 +08:00
dajiao007 87807110d5 modify tranlate and adjust column width 2018-01-11 16:46:08 +08:00
wangyidong 0d77963c0a Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-11 11:07:37 +08:00
wangyidong bd1ea46a9c * finish task #3560. 2018-01-11 11:05:50 +08:00
滔哥 9dc01a4ba2 * Format code. 2018-01-11 09:41:49 +08:00
滔哥 884d9a85ed * Format code. 2018-01-11 09:35:18 +08:00
滔哥 ed33a84ed2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-01-11 09:30:48 +08:00
dajiao007 fa00dc9d9c modify the translate 2018-01-10 19:39:51 +08:00
滔哥 1177206405 * Finish Task#3551. 2018-01-10 17:29:30 +08:00
滔哥 1e12da117f * Finish Task#3576. 2018-01-10 16:43:17 +08:00
滔哥 13458b1b38 * Task#3576 2018-01-10 11:25:08 +08:00
滔哥 a5e2e4a6e6 * Fix bug. 2018-01-10 09:51:56 +08:00
滔哥 561fd66584 marage sql. 2018-01-10 08:35:02 +08:00
滔哥 70f18180d2 * Task#3576 2018-01-10 08:33:18 +08:00
wangyidong 6301f40a61 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-08 15:51:49 +08:00
wangyidong b10b13b4b8 * finish task #3562. 2018-01-08 15:50:53 +08:00
滔哥 5b2d718c7c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-01-05 11:08:09 +08:00
滔哥 1eee375a7f * Finish task#3551 2018-01-05 11:08:00 +08:00
wangyidong cf8b8902b4 * code for task #3579. 2018-01-05 09:15:59 +08:00
wangyidong 607076205e * finish task #3579. 2018-01-04 17:28:51 +08:00
wangyidong e35451994c * finish task #3582. 2018-01-04 14:18:49 +08:00
wangyidong ae2cd0e4a0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-04 14:12:26 +08:00
wangyidong 8a9ad3f23a * finish task #3584. 2018-01-04 14:12:02 +08:00
Renee bfa06024b6 Update README.md
Sync with manual
2018-01-04 11:18:47 +08:00
wangyidong b5f462607c Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-04 09:47:01 +08:00
wangyidong 783c5acfa3 * finish task #3570. 2018-01-04 09:46:30 +08:00
滔哥 a92a0bdb29 * Finish task#3553 2018-01-03 22:06:04 +08:00
滔哥 204639fd2b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-01-03 21:14:11 +08:00
滔哥 88653f881f * Finish task#3574 2018-01-03 21:14:05 +08:00
wangyidong 9f7b5146e8 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-03 16:40:44 +08:00
wangyidong fad9e34e8d * finish task #3585. 2018-01-03 16:40:27 +08:00
滔哥 86a3b53329 * Fix bug. 2018-01-02 17:21:42 +08:00
滔哥 8c776b6607 * Fix bug. 2018-01-02 17:20:21 +08:00
滔哥 f96395c6a6 * Add db.php for .gitignore 2018-01-02 10:07:45 +08:00
滔哥 c2d928f58a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-01-02 10:04:37 +08:00
wangyidong 0ec4afb68b * finish task #3558. 2018-01-02 08:55:33 +08:00
滔哥 0d5b43fb5c * Task#3574 2017-12-29 17:27:58 +08:00
wangyidong b36436dcf6 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-29 17:01:57 +08:00
wangyidong 9abd1d6cf3 * finish task #3588. 2017-12-29 17:01:35 +08:00
滔哥 345178901a * Finish Task#3552. 2017-12-29 16:21:56 +08:00
滔哥 8f58d40985 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-29 16:09:12 +08:00
滔哥 71b62c922c * Finish Task#3554. 2017-12-29 16:09:04 +08:00
滔哥 ba2439d265 * Finish Task#3566. 2017-12-29 15:53:10 +08:00
wangyidong 1e547a4bed Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-29 11:27:19 +08:00
wangyidong d71d582f3d * adjust code. 2017-12-29 11:25:53 +08:00
滔哥 92601443c9 * Finish Task#3565. 2017-12-29 11:04:50 +08:00
滔哥 d88201be75 * Format code. 2017-12-29 09:26:05 +08:00
滔哥 b4a165b573 * Add install sql for Task#3561 2017-12-29 09:16:58 +08:00
滔哥 e5b312e326 * Add upgrade for Task#3561 2017-12-29 09:11:19 +08:00