Commit Graph
6755 Commits
Author SHA1 Message Date
wangyidong a1c27a2dd2 Merge branch 'master' of github.com:easysoft/zentaopms 2015-09-09 14:20:57 +08:00
Catouse 296f0ac78d * finish task #2274. 2015-09-09 12:03:59 +08:00
wangyidong 0bf04601f0 * adjust lang for sso and mail. 2015-09-09 10:03:23 +08:00
wangyidong a1c129710c * finish task #2288. 2015-09-08 17:17:34 +08:00
wangyidong 530a68da22 * finish task #2272,2271,2270. 2015-09-08 15:30:11 +08:00
wangyidong 0571ffe6a3 * finish task #2276. 2015-09-07 16:56:44 +08:00
wangyidong 84d7e49211 * finish task #2278. 2015-09-07 14:10:37 +08:00
wangyidong b80a050ae3 * finish task #2275. 2015-09-07 13:20:03 +08:00
wangyidong 474e1fe5bd + finish task #2279. 2015-09-07 09:23:21 +08:00
wangyidong 84987d9019 * finish task #2280. 2015-09-06 16:26:01 +08:00
wangyidong 5fc3330334 * finish task #2297. 2015-09-06 16:01:48 +08:00
wangyidong 7871037e38 * finish task #2292. 2015-09-06 14:49:35 +08:00
wangyidong 08f665a20f * finish task #2281. 2015-09-06 13:32:35 +08:00
wangyidong e21f1727bd * finish task #2283. 2015-09-02 17:25:46 +08:00
wangyidong fd11ead66a * finish task #2284. 2015-09-02 13:33:03 +08:00
wangyidong bf21838118 * finish task #2285. 2015-09-02 13:13:58 +08:00
wangyidong 34cbd724fd * finish task #2287. 2015-09-02 10:41:44 +08:00
wangyidong 79fea4c0b1 * code for task #2288. 2015-09-02 10:13:15 +08:00
wangyidong 645fe34e18 * code for task 2290. 2015-09-01 17:17:44 +08:00
wangyidong 6ca4dc0197 * finish task #2290. 2015-09-01 17:04:56 +08:00
wangyidong 8274afc8da * finish task #2291. 2015-09-01 16:06:47 +08:00
wangyidong 68891fa0cf * finish task #2293. 2015-09-01 15:09:37 +08:00
wangyidong 8576ea525a * finish task #2294. 2015-09-01 14:28:59 +08:00
wangyidong 33fc3798a0 * finish task #2300. 2015-09-01 13:36:54 +08:00
wangyidong dfdde5d748 * code for task #2301. 2015-09-01 10:52:23 +08:00
wangyidong a322707b69 * finish task #2305. 2015-08-31 10:57:42 +08:00
wangyidong 2c1543c4a0 * finish task #2295. 2015-08-28 16:02:12 +08:00
wangyidong 0df81600ae * finish task #2296. 2015-08-28 15:55:31 +08:00
wangyidong 0aa0730fd8 * finish task #2298. 2015-08-28 14:58:50 +08:00
wangyidong e4baed44a8 * code for task #2304. 2015-08-28 14:46:26 +08:00
wangyidong 57b494614d * code for task #2304. 2015-08-28 14:21:02 +08:00
wangyidong 83071d3889 * finish task #2304. 2015-08-28 14:17:40 +08:00
wangyidong e53bbdf502 * finish task #2306. 2015-08-28 13:14:02 +08:00
wangyidong 615ef46841 * finish task #2311. 2015-08-28 11:07:36 +08:00
wangyidong 91b76c85d8 * finish task #2313. 2015-08-28 10:54:37 +08:00
wangyidong cc660238a2 * finish task #2316. 2015-08-28 09:56:29 +08:00
wangyidong 09ecfa30dd * finish task #2317. 2015-08-27 14:49:33 +08:00
wangyidong 7bb9a3f923 * finish task #2318. 2015-08-26 17:29:01 +08:00
wangyidong d83b92be9a * finish task #2319. 2015-08-26 17:01:27 +08:00
wangyidong 4bf8f317df Merge branch 'master' of github.com:easysoft/zentaopms 2015-08-26 16:40:19 +08:00
wangyidong 425975b874 * fix a bug. 2015-08-26 16:40:02 +08:00
Catouse 615fb2ff1f * finish task #2312. 2015-08-26 15:23:34 +08:00
wangyidong 9f9d367606 Merge branch 'master' of github.com:easysoft/zentaopms 2015-08-26 14:55:36 +08:00
wangyidong b34c1f5c6c * finish task #2320. 2015-08-26 14:54:54 +08:00
Catouse 783e6e90d8 * finish task #2314. 2015-08-26 14:38:16 +08:00
wangyidong 0f79a4f998 * finish task #2315. 2015-08-26 14:37:01 +08:00
wangyidong aac7b2ef5d * code for task 2322. 2015-08-26 14:13:58 +08:00
wangyidong e1c7f9ddff * revert for task #2322. 2015-08-26 10:48:11 +08:00
wangyidong 4524b6bbd6 * finish task 2322. 2015-08-26 10:11:43 +08:00
wangyidong dddd25f18a * finish task #2312. 2015-08-25 15:14:22 +08:00