Commit Graph

243 Commits

Author SHA1 Message Date
chenfeiCF
b5d020c652 * fix a bug. 2015-12-16 13:49:09 +08:00
wangyidong
b808b0c8c3 * change for build and release view page. 2015-11-30 14:23:36 +08:00
wangyidong
0160e99054 * adjust style. 2015-11-30 14:19:25 +08:00
wangyidong
48ada5974b * finish task #2416. 2015-11-26 13:11:01 +08:00
wangyidong
3c4c0e137e * finish task #2417. 2015-11-25 10:11:02 +08:00
wangyidong
a01925a0f2 * finish task #2419. 2015-11-24 10:18:48 +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
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
d70f35fa66 * add label for batch create. 2015-11-12 15:39:12 +08:00
wangyidong
19a2e963ca * finish task #2399. 2015-11-12 10:24:29 +08:00
wangyidong
6f12e34d25 * finish task #2398. 2015-11-12 09:54:00 +08:00
chenfeiCF
00f23416df * adjust code for build and release module. 2015-11-11 20:04:29 +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
9c7cff9c16 * finish task #2383. 2015-11-11 13:10:07 +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
74d50c2bcd * finish task #2384. 2015-11-10 11:21:54 +08:00
wangyidong
951f843615 * change for en and zh-tw lang. 2015-11-06 15:35:18 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
b65a72e141 * change code and add notice. 2015-11-03 16:05:40 +08:00
chenfeiCF
e93cb9e75d Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/build/model.php
	module/release/model.php
2015-11-02 16:02:29 +08:00
chenfeiCF
a6b66e916e * adjust code for bug #757. 2015-11-02 15:50:47 +08:00
wangyidong
9bfcc069ab Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/release/model.php
2015-11-02 15:33:17 +08:00
wangyidong
5d7126f5ca * finish task #2335. 2015-11-02 15:30:43 +08:00
chenfeiCF
f82bd56ce2 * fix bug #757. 2015-11-02 14:35:35 +08:00
wangyidong
eee2990ea7 * adjust lang for branch. 2015-11-02 10:52:04 +08:00
wangyidong
3214cb08ce * change for roadmap. 2015-11-02 09:47:37 +08:00
wangyidong
7c7117d233 * adjust productplan for branch. 2015-10-30 16:05:19 +08:00
wangyidong
e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
wangyidong
e1d907628c * finish task #2346 2347 2348. 2015-10-28 14:33:06 +08:00
chenfeiCF
7960c73e1b Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/build/model.php
2015-10-27 20:21:01 +08:00
chenfeiCF
546e61c36a * finish task #2350. 2015-10-27 18:55:59 +08:00
wangyidong
b979a5da38 * finish task #2352. 2015-10-27 09:34:05 +08:00
wangyidong
df23f3b43e * finish task #2341. 2015-10-22 16:38:39 +08:00
wangyidong
c20745f87d * finish task #2356. 2015-10-16 15:46:03 +08:00
wangyidong
c571a8a440 * finish task #2361. 2015-10-15 17:28:40 +08:00
wangyidong
d741661d43 * finish task #2374. 2015-10-12 23:58:50 +08:00
wangyidong
abf8b97904 * change for zh-tw. 2015-09-18 09:59:43 +08:00
wangyidong
35b25360e3 * adjust lang for build and release. 2015-09-17 14:48:20 +08:00
wangyidong
f008c12234 * adjust code for utf8 bom in file. 2015-09-16 10:19:31 +08:00
wangyidong
5c13559737 * fix bug #735. 2015-09-10 16:08:45 +08:00
wangyidong
202e3e96b4 * code bug #736. 2015-09-10 15:42:20 +08:00
wangyidong
a1c129710c * finish task #2288. 2015-09-08 17:17:34 +08:00
wangyidong
79fea4c0b1 * code for task #2288. 2015-09-02 10:13:15 +08:00
wangyidong
425975b874 * fix a bug. 2015-08-26 16:40:02 +08:00
wangyidong
e0a643cd0b * change projectcommon to projectCommon,productcommon to productCommon. 2015-07-30 15:35:55 +08:00