Commit Graph
260 Commits
Author SHA1 Message Date
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
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 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 79fea4c0b1 * code for task #2288. 2015-09-02 10:13:15 +08:00
wangyidong e0a643cd0b * change projectcommon to projectCommon,productcommon to productCommon. 2015-07-30 15:35:55 +08:00
wangyidong 7c6747e7d2 * fix a bug #718. 2015-07-07 15:04:53 +08:00
wangyidong 1e0555c378 * fix a bug. 2015-06-09 11:35:07 +08:00
wangyidong ae4cd7ef86 * fix for link bug. 2015-05-25 13:43:37 +08:00
wangyidong 0345e1a380 * adjust for task #2266. 2015-05-21 13:36:25 +08:00
wangyidong 927851d74f * adjust for link story and bug for release build and productplan. 2015-05-20 16:13:24 +08:00
wangyidong 0ca09de3d7 * change for zh-tw lang. 2015-05-18 13:55:40 +08:00
wangyidong 6f3931a15b * finish task #2255. 2015-05-13 14:13:32 +08:00
wangyidong 2eb38cfeba * fix a bug for search bug in link bug. 2015-04-15 13:53:33 +08:00
wangyidong 02a5d0bf2b * fix bug #679. 2015-03-12 14:56:29 +08:00
wangyidong c9f0b9f861 * change for zh-tw. 2015-02-04 15:43:19 +08:00
wangyidong 3b78433dee * fix bug #677. 2015-01-30 16:00:17 +08:00
wangyidong 5c1c020f25 Merge branch 'master' of github.com:easysoft/zentaopms 2015-01-29 16:56:54 +08:00