Commit Graph

139 Commits

Author SHA1 Message Date
wangyidong
a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
chenfeiCF
834aee0f27 * adjust the code. 2015-11-03 16:58:32 +08:00
wangyidong
b65a72e141 * change code and add notice. 2015-11-03 16:05:40 +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
e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
chenfeiCF
4823890b2d * adjust for task #2359. 2015-10-29 21:53:59 +08:00
wangyidong
3673201509 * adjust for task #2336. 2015-10-27 15:03:20 +08:00
wangyidong
71240b18a7 * finish task #2351. 2015-10-27 14:15:05 +08:00
wangyidong
b979a5da38 * finish task #2352. 2015-10-27 09:34:05 +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
wangyidong
df23f3b43e * finish task #2341. 2015-10-22 16:38:39 +08:00
chenfeiCF
c45326cca4 * finish task #2359. 2015-10-21 10:32:07 +08:00
wangyidong
9ad38472fc * finish task #2336,2337,2338,2339. 2015-10-20 10:11:46 +08:00
wangyidong
e084f9c2fd * fix bug #732. 2015-09-10 16:47:34 +08:00
wangyidong
84d7e49211 * finish task #2278. 2015-09-07 14:10:37 +08:00
wangyidong
ded3e99d37 * finish task #2267. 2015-05-13 16:44:44 +08:00
wangyidong
e2260064d8 * change for order. 2015-05-08 15:44:14 +08:00
wangyidong
163fb178f1 * finish task #2237. 2015-05-08 13:12:15 +08:00
wangyidong
cd1a74d560 Merge branch 'master' of github.com:easysoft/zentaopms 2015-05-08 09:50:06 +08:00
wangyidong
36a4c32720 * finish task #2241,2245. 2015-05-08 09:47:39 +08:00
Catouse
cd464d2a0f * finish task #2243:change search drop menu UI. 2015-05-07 15:27:21 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
a175b9bae8 * finish task #2188. 2015-01-28 10:09:56 +08:00
xia0ta0
0d194bfec0 * code for task#658. 2014-12-12 09:22:25 +08:00
xia0ta0
df54dbdde6 * code for task#2171. 2014-12-10 17:39:41 +08:00
xia0ta0
08359a0bfd * code for task#2171. 2014-12-10 16:32:01 +08:00
wangyidong
d1aed6cc98 * fix a bug #652. 2014-11-27 06:46:49 +00:00
wangyidong
01023e5fb2 * finish task #1793. 2014-08-12 08:14:52 +00:00
xia0ta0
4610b92469 * correct wrong word: build. 2014-06-27 10:49:41 +08:00
wyd621
e3d60141b9 * fix errors. 2014-04-02 00:47:07 +00:00
Catouse
cfe5286571 * ajusted style of head part. 2014-03-13 21:11:00 +08:00
wyd621
9230beaaa8 * fix bug. 2014-03-12 05:17:07 +00:00
wyd621
6c0fd8e4ff * finish task #1728. 2013-11-02 00:24:27 +00:00
wyd621
52a589c724 * get last five roadmap. 2013-10-30 07:40:50 +00:00
wyd621
6c08351d5b * fix a bug. 2013-10-23 07:56:38 +00:00
wyd621
cc183e4056 * adjust var name. 2013-10-23 02:27:03 +00:00
wyd621
1140dbe11f * finish task #1662. 2013-08-02 15:44:40 +08:00
azhi
e609beffb6 * finish task#1658. 2013-07-29 16:41:12 +08:00
wyd621
fd4a36dc8c * finish task #1601. 2013-07-23 15:49:47 +08:00
wwccss
e4405b929e * remove E_STRICT errors. 2013-07-17 20:13:46 +08:00
wyd621
ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
chencongzhi520@gmail.com
1c18615310 * finish task#1555. 2013-07-12 07:41:41 +00:00
chencongzhi520@gmail.com
01cebe53ae * finish task#1533. 2013-07-10 06:06:46 +00:00
chencongzhi520@gmail.com
33b345087b * move the createProductLink and createProjectLink to model from control.
* code for dropmenu.
2013-07-08 00:38:56 +00:00
chencongzhi520@gmail.com
ff235f4cd5 * set the orderBy='code' for product and project. 2013-07-06 03:21:43 +00:00
chencongzhi520@gmail.com
bcf35c4b7b * adjust the code. 2013-07-06 03:00:01 +00:00
chencongzhi520@gmail.com
d4944de830 * code for dropMenu. 2013-07-05 07:13:12 +00:00