Commit Graph

278 Commits

Author SHA1 Message Date
wangyidong
fb2357ef32 * fix bug for create bug in branch. 2015-12-23 17:23:30 +08:00
wangyidong
e45a196b7b * fix bugs. 2015-12-23 09:29:38 +08:00
wangyidong
33dff40092 * fix bug for get build pairs. 2015-12-02 16:21:31 +08:00
wangyidong
b808b0c8c3 * change for build and release view page. 2015-11-30 14:23:36 +08:00
wangyidong
48ada5974b * finish task #2416. 2015-11-26 13:11:01 +08:00
wangyidong
9012728c5a * change for dept. 2015-11-25 12:13:49 +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
wangyidong
35cd899cd5 * fix bug for get noterminate build. 2015-11-19 11:05:24 +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
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
chenfeiCF
00f23416df * adjust code for build and release module. 2015-11-11 20:04:29 +08:00
wangyidong
45fb1f0c92 * finish task #2380,2389,2390. 2015-11-11 11:07:59 +08:00
wangyidong
a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +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
2a39736fd7 * adjust code. 2015-11-04 12:16:40 +08:00
chenfeiCF
a46563dade * adjust the code for task #2357 2358. 2015-11-04 10:23:20 +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
5d7126f5ca * finish task #2335. 2015-11-02 15:30:43 +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
chenfeiCF
4b77b0faa0 Merge branch 'master' of github.com:easysoft/zentaopms 2015-10-30 10:59:09 +08:00
chenfeiCF
125f4244bd * adjust code for bug and build module. 2015-10-30 10:57:48 +08:00
wangyidong
e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
wangyidong
8593f3ce07 * adjust code for branch. 2015-10-29 15:28:08 +08:00
chenfeiCF
9910e1bd1f Merge branch 'master' of github.com:easysoft/zentaopms 2015-10-29 12:21:51 +08:00
chenfeiCF
6a5f590ce9 * adjust for task #2357 2358 2015-10-29 12:18:53 +08:00
wangyidong
1202c8db38 * finish for testtask branch. 2015-10-29 10:05:01 +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
71240b18a7 * finish task #2351. 2015-10-27 14:15:05 +08:00
wangyidong
c4bd3be15d * code for task #2353. 2015-10-26 14:40:49 +08:00
wangyidong
9bd03f5976 * finish task #2353. 2015-10-26 14:15:25 +08:00
wangyidong
5029ba6b23 * finish task #2344. 2015-10-26 13:12:00 +08:00
wangyidong
a1625710cb Merge branch 'master' of github.com:easysoft/zentaopms
*finish task #2342.

Conflicts:
	module/bug/control.php
2015-10-22 17:22:21 +08:00
chenfeiCF
7aebf9efbd * finish task #2358. 2015-10-22 17:12:56 +08:00
wangyidong
df23f3b43e * finish task #2341. 2015-10-22 16:38:39 +08:00
chenfeiCF
2026c89d90 * finish task #2357. 2015-10-22 08:28:54 +08:00
wangyidong
81a305e6b6 * finish task #2328. 2015-10-15 11:21:22 +08:00
wangyidong
d741661d43 * finish task #2374. 2015-10-12 23:58:50 +08:00