Commit Graph

267 Commits

Author SHA1 Message Date
wangyidong
45fb1f0c92 * finish task #2380,2389,2390. 2015-11-11 11:07:59 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
chenfeiCF
a46563dade * adjust the code for task #2357 2358. 2015-11-04 10:23:20 +08:00
chenfeiCF
834aee0f27 * adjust the code. 2015-11-03 16:58:32 +08:00
wangyidong
eee2990ea7 * adjust lang for branch. 2015-11-02 10:52:04 +08:00
wangyidong
7c7117d233 * adjust productplan for branch. 2015-10-30 16:05:19 +08:00
chenfeiCF
125f4244bd * adjust code for bug and build module. 2015-10-30 10:57:48 +08:00
chenfeiCF
4823890b2d * adjust for task #2359. 2015-10-29 21:53:59 +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
71240b18a7 * finish task #2351. 2015-10-27 14:15: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
578d47a409 * finish task #2342. 2015-10-22 17:18:34 +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
chenfeiCF
c45326cca4 * finish task #2359. 2015-10-21 10:32:07 +08:00
wangyidong
e4c40098c2 * finish task #2367. 2015-10-14 16:06:30 +08:00
wangyidong
7d45f50cc2 * adjust for task #2320. 2015-09-16 16:41:45 +08:00
wangyidong
90897e53ca * fix bug #734. 2015-09-14 15:23:24 +08:00
wangyidong
09ecfa30dd * finish task #2317. 2015-08-27 14:49:33 +08:00
wangyidong
b34c1f5c6c * finish task #2320. 2015-08-26 14:54:54 +08:00
wangyidong
dddd25f18a * finish task #2312. 2015-08-25 15:14:22 +08:00
wangyidong
5ab2b007ba * fix bug #724. 2015-07-29 14:04:21 +08:00
wangyidong
ae4cd7ef86 * fix for link bug. 2015-05-25 13:43:37 +08:00
Catouse
003ffaae90 * change report UI. 2015-05-12 15:42:11 +08:00
wangyidong
6c5089fe93 * fix a bug for create bug from case. 2015-05-04 16:47:30 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
d7c0a03f8b * fix a bug. 2014-12-16 07:20:30 +00:00
xia0ta0
54c49e2340 * code for task#2154. 2014-12-11 17:40:06 +08:00
xia0ta0
1cf0e89af6 * code for task#2160. 2014-12-11 09:32:11 +08:00
wangyidong
64ab8de121 * finish task #2156. 2014-12-09 08:59:46 +00:00
wangyidong
d015ef75e7 * finish task #2168. 2014-12-04 09:07:18 +00:00
wangyidong
4da87b6926 * fix a bug for #648. 2014-11-27 06:07:02 +00:00
wangyidong
22dc72f739 * sort upload images. 2014-11-06 09:16:27 +00:00
ChuJilu
c1337e49da * finish task #2107. 2014-11-05 17:23:04 +08:00
wangyidong
bc391577ba * fix a bug. 2014-11-03 08:35:17 +00:00
wangyidong
7c96bd88ee * finish task #2878. 2014-11-03 05:51:43 +00:00
ChuJilu
1cae54bcaf * finish task 2106. 2014-10-24 16:17:03 +08:00
wangyidong
fc37dcd3bc * change for zh-tw. 2014-08-27 01:10:40 +00:00
wangyidong
8c50180759 * change checkrepeat to removeDuplicate. 2014-08-25 03:08:21 +00:00
chujilu
dffe80c44b * rewrite count() method
* change the config of story review
2014-08-21 20:41:42 +08:00
wangyidong
5d2a658222 * fix a bug. 2014-08-21 01:54:42 +00:00
wangyidong
ddc3fd28ea * finish task #2003. 2014-08-18 07:14:09 +00:00
wangyidong
163ababa70 Merge branch 'master' of github.com:easysoft/zentaopms 2014-08-14 06:38:37 +00:00
chujilu
16d3078300 * task 2011 2014-08-14 14:22:39 +08:00
wangyidong
45be42a13b * finish task #1934. 2014-08-14 06:08:48 +00:00
wangyidong
8501046c11 * finish task #1185. 2014-08-13 05:58:51 +00:00