Commit Graph

5906 Commits

Author SHA1 Message Date
chenfeiCF
f4ea06eddf * finish task #2392. 2015-11-13 08:02:54 +08:00
chenfeiCF
cb4e84a9da * finish task #2403. 2015-11-13 00:19:43 +08:00
chenfeiCF
ba1f44853b * finish task #2385. 2015-11-12 22:44:02 +08:00
chenfeiCF
222927bf88 * adjust code for testtask.html.php of my module. 2015-11-12 21:58:11 +08:00
wangyidong
d70f35fa66 * add label for batch create. 2015-11-12 15:39:12 +08:00
wangyidong
6abfe59501 * finish task #2410. 2015-11-12 14:59:49 +08:00
wangyidong
6e95c09e6c * finish task #2409. 2015-11-12 13:48:42 +08:00
wangyidong
b7578aaca2 * finish task #2405. 2015-11-12 11:37:20 +08:00
wangyidong
086848c53e * code task #2404. 2015-11-12 10:40:02 +08:00
wangyidong
19a2e963ca * finish task #2399. 2015-11-12 10:24:29 +08:00
wangyidong
275c833e02 * finish task #2394. 2015-11-12 10:14:43 +08:00
wangyidong
6f12e34d25 * finish task #2398. 2015-11-12 09:54:00 +08:00
wangyidong
d5916dac13 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-12 09:18:29 +08:00
chenfeiCF
00f23416df * adjust code for build and release module. 2015-11-11 20:04:29 +08:00
wangyidong
97f38e1177 * finish task #2408. 2015-11-11 16:54:23 +08:00
wangyidong
fd312662cc * finish task #2395. 2015-11-11 16:15:41 +08:00
wangyidong
4f48349475 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-11 14:56:57 +08:00
wangyidong
dec039edfb * finish task #2391. 2015-11-11 14:56:37 +08:00
chenfeiCF
d953088cfb * change for en and zh-tw lang of release module. 2015-11-11 14:44:07 +08:00
chenfeiCF
94158ab904 * finish task #2401. 2015-11-11 14:20:26 +08:00
wangyidong
68f9066039 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-11 13:30:37 +08:00
wangyidong
a9d90a73c9 * finish task #2386,2402. 2015-11-11 13:29:55 +08:00
chenfeiCF
a178e19241 * finish task #2406. 2015-11-11 13:26:23 +08:00
chenfeiCF
9c7cff9c16 * finish task #2383. 2015-11-11 13:10:07 +08:00
wangyidong
fcadcec130 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-11 11:08:38 +08:00
wangyidong
45fb1f0c92 * finish task #2380,2389,2390. 2015-11-11 11:07:59 +08:00
daitingting
89c17e26e9 * Add bindUser and createUser function for ranzhi. 2015-11-11 10:41:08 +08:00
chenfeiCF
84af2e4700 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-10 17:30:37 +08:00
chenfeiCF
d1129ebf9f * finish task #2382. 2015-11-10 17:29:21 +08:00
wangyidong
8746d7bc64 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-10 17:14:05 +08:00
wangyidong
273bf0a237 * finish task #2378,2379,2381. 2015-11-10 17:12:33 +08:00
chenfeiCF
160eb29d76 * finish task #2397. 2015-11-10 16:45:39 +08:00
chenfeiCF
86b96a9640 * finish task #2388. 2015-11-10 15:29:41 +08:00
chenfeiCF
1f72c22642 * finish task #2387. 2015-11-10 13:34:06 +08:00
chenfeiCF
74d50c2bcd * finish task #2384. 2015-11-10 11:21:54 +08:00
wangyidong
ff210f304d * finish task #2377. 2015-11-10 11:11:48 +08:00
wangyidong
4cf14c3e43 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-10 10:56:35 +08:00
wangyidong
a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +08:00
wangyidong
1df211fdaa * adjust for parseImage. 2015-11-10 10:55:14 +08:00
wangyidong
61eb0a6fc3 * change for upgrade. 2015-11-10 10:50:01 +08:00
chenfeiCF
fe99321c45 * finish task #2396. 2015-11-10 10:43:23 +08:00
wangyidong
b82964c389 * finish task #2376. 2015-11-10 10:37:43 +08:00
daitingting
99eb66aaf0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2015-11-09 16:02:40 +08:00
daitingting
225270d39b * Check privilage. 2015-11-09 16:02:07 +08:00
chenfeiCF
6b92b40e4c * remove back button for manage method of branch. 2015-11-09 15:10:48 +08:00
wangyidong
e98ceb95c7 * finish task #2333. 2015-11-09 13:14:12 +08:00
wangyidong
3478a9010f * adjust for story export. 2015-11-09 10:19:50 +08:00
wangyidong
c3f3cfbed4 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-09 09:49:41 +08:00
wangyidong
653b1c3cd1 * fix bug #749. 2015-11-09 09:32:15 +08:00
chenfeiCF
23430345e9 * adjust the code for common.js of bug module. 2015-11-09 09:24:32 +08:00