Commit Graph

7548 Commits

Author SHA1 Message Date
daitingting
7c5358ed0d Merge branch 'master' of https://github.com/easysoft/zentaopms 2015-11-13 15:17:23 +08:00
daitingting
7184cb3a90 * Adjust codes. 2015-11-13 15:14:42 +08:00
wangyidong
8823b0e03c * change 7.4 to 7.4.beta. zentaopms_7.4.beta_20151113 2015-11-13 13:35:20 +08:00
wangyidong
2feed8a2cd Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-13 13:27:57 +08:00
wangyidong
786b78a025 * add 7.4 version. 2015-11-13 13:27:29 +08:00
chenfeiCF
aa0b77bf28 * fix bug for task #2403. 2015-11-13 13:25:19 +08:00
wangyidong
dca7ad86fa Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-13 11:58:04 +08:00
wangyidong
530388712a * change for branch session. 2015-11-13 11:57:36 +08:00
chenfeiCF
ce7be4ebc6 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-13 11:20:36 +08:00
chenfeiCF
af948a8805 * adjust code for task #2382, 2383. 2015-11-13 11:17:53 +08:00
wangyidong
e703770075 * fix error and adjust build code. 2015-11-13 11:12:41 +08:00
wangyidong
d12d84f950 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-13 10:56:47 +08:00
wangyidong
2d61ca8d34 * change zh-tw. 2015-11-13 10:55:50 +08:00
chenfeiCF
2f28d73c47 * finish task #2400. 2015-11-13 10:54:14 +08:00
wangyidong
5c361fdac7 * merge database. 2015-11-13 10:29:52 +08:00
wangyidong
1af9dbe0c5 * adjust for filter super var. 2015-11-13 10:02:28 +08:00
wangyidong
603f64a618 * fix bug for tree. 2015-11-13 09:25:36 +08:00
wangyidong
886eefeca3 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-13 09:02:41 +08:00
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
7891848534 * finish task #2393. 2015-11-12 16:25:41 +08:00
wangyidong
d70f35fa66 * add label for batch create. 2015-11-12 15:39:12 +08:00
wangyidong
3866f3526d Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-12 15:00:14 +08:00
wangyidong
6abfe59501 * finish task #2410. 2015-11-12 14:59:49 +08:00
Catouse
be5f2c680a * finish task #2407. 2015-11-12 14:12:53 +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
chenfeiCF
dc07d9f3cf Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-11 13:44:21 +08:00
chenfeiCF
12f37c1798 * finish task #2404. 2015-11-11 13:43:18 +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