Commit Graph
14449 Commits
Author SHA1 Message Date
Yagami da39a96bd2 * Delete feedback in open source. 2019-01-03 16:37:47 +08:00
wangyidong e648230b19 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-03 13:52:41 +08:00
wangyidong 7cafcbdabd * fix error for empty class and count task. 2019-01-03 13:51:08 +08:00
Yagami 0f17b4d16a * Fix xuanxuan config lang. 2019-01-03 10:47:47 +08:00
Yagami de32295a35 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-03 10:21:16 +08:00
Yagami 44f689ed65 * Fix caseheader. 2019-01-03 10:20:55 +08:00
wangyidong 4d38384b41 * finish task #7228. 2019-01-03 09:25:37 +08:00
wangyidong 38387b8320 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-02 16:34:56 +08:00
wangyidong 5ec47edcfc * fix error. 2019-01-02 16:34:27 +08:00
Yagami 6c5d47915a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-02 15:26:47 +08:00
Yagami c0d4da2f0d * Finish task #7232. 2019-01-02 15:26:26 +08:00
wangyidong d1c12ca383 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-02 15:16:11 +08:00
wangyidong d45b7a8ce9 * finish task #7227. 2019-01-02 15:14:56 +08:00
Yagami 20bf14db9c * Finish task #5196. 2019-01-02 13:50:40 +08:00
Yagami 0dceba2e10 * Finish task #5195. 2019-01-02 13:13:10 +08:00
Yagami 936c2157df * Finish task #5197. 2019-01-02 10:39:21 +08:00
Yagami 82ab82136f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-02 10:08:27 +08:00
Yagami ed0692a545 * Finish task #5194. 2019-01-02 10:08:12 +08:00
wangyidong 92f79a59ad Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-02 09:51:48 +08:00
wangyidong 2b15b8d3c6 * finish task #5201. 2019-01-02 09:51:06 +08:00
Yagami c163f11b0f * Finish task #5198. 2019-01-02 09:46:49 +08:00
Yagami cecc728d16 * Finish task #5200. 2019-01-02 09:27:16 +08:00
Yagami 844c63cac5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-02 09:24:00 +08:00
Yagami 700fffb442 * Finish task #5199. 2019-01-02 09:23:35 +08:00
wangyidong 7965361268 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-29 14:55:23 +08:00
wangyidong ca688aa2f8 * finish task #5182. 2018-12-29 14:54:51 +08:00
Yagami 78a2fc9099 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-29 14:43:05 +08:00
Yagami dcf2c80951 * Finish task #5193. 2018-12-29 14:42:45 +08:00
wangyidong 0435d14b74 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-29 14:24:59 +08:00
wangyidong 0e3ef4a715 * finish task #5185. 2018-12-29 14:24:31 +08:00
Yagami e8c04da4b0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-29 14:04:27 +08:00
Yagami 851bcc28b3 * Finish task #5192. 2018-12-29 14:04:09 +08:00
wangyidong 4e2a7e8189 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-29 13:58:39 +08:00
wangyidong 0db6ff757c * finish task #5189. 2018-12-29 13:58:07 +08:00
Yagami 3d850bdc0a * Fix task 5190. 2018-12-29 13:43:29 +08:00
Yagami 3d34eb42e8 * Finish task #5190. 2018-12-29 13:41:36 +08:00
wangyidong 5f5ee0f9cd Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-29 09:11:37 +08:00
wangyidong 659b454228 * finish task #5168. 2018-12-29 09:10:58 +08:00
Catouse 16e6d54a97 * finish task #5173 and bug #2325. 2018-12-28 21:01:51 +08:00
Catouse 00b075ad9c * finish task #5175 and fix bug #2304. 2018-12-28 20:35:21 +08:00
Yagami 125fecef58 * Fix task #5170. 2018-12-28 14:27:38 +08:00
Yagami 5b98a87ddd * Finish task #7219. 2018-12-28 10:57:41 +08:00
wangyidong b883da3ec9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-26 15:53:19 +08:00
Catouse 798350dc73 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-26 15:52:58 +08:00
Catouse 841cb608cc * hide sidebar when collapsed. 2018-12-26 15:52:47 +08:00
wangyidong 8735d788e6 * adjust for task #5180. 2018-12-26 15:51:53 +08:00
wangyidong e5f728c77b Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-26 11:08:00 +08:00
wangyidong 0063b4a86d * update zentao-integrated. 2018-12-26 11:07:21 +08:00
Yagami 923e4fb8fb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-26 10:30:57 +08:00
Yagami da57fc447d * Finish task #5170. 2018-12-26 10:30:34 +08:00