Commit Graph

294 Commits

Author SHA1 Message Date
chenfeiCF
d9ddbd0450 * finish task #2458. 2016-02-19 13:49:25 +08:00
chenfeiCF
9f99387a7e * finish task #2457. 2016-02-18 21:38:54 +08:00
wangyidong
e8bb9aa1ee * finish task #1295. 2016-02-15 17:29:23 +08:00
wangyidong
62c590a94b * finish task #2431. 2015-12-21 14:20:13 +08:00
wangyidong
72eca957bf * fix bug for project link story when branch is empty. 2015-12-10 13:50:05 +08:00
wangyidong
02ce779b65 * adjust code. 2015-11-26 13:29:29 +08:00
wangyidong
48ada5974b * finish task #2416. 2015-11-26 13:11:01 +08:00
wangyidong
886eefeca3 Merge branch 'master' of github.com:easysoft/zentaopms 2015-11-13 09:02:41 +08:00
chenfeiCF
f4ea06eddf * finish task #2392. 2015-11-13 08:02:54 +08:00
wangyidong
7891848534 * finish task #2393. 2015-11-12 16:25:41 +08:00
wangyidong
45fb1f0c92 * finish task #2380,2389,2390. 2015-11-11 11:07:59 +08:00
chenfeiCF
86b96a9640 * finish task #2388. 2015-11-10 15:29:41 +08:00
wangyidong
a0c97d7e01 * adjust for branch name by product name. 2015-11-10 10:55:34 +08:00
wangyidong
e2c77e381c * change for compute password strength. 2015-11-06 14:30:55 +08:00
wangyidong
b65a72e141 * change code and add notice. 2015-11-03 16:05:40 +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
wangyidong
e1d907628c * finish task #2346 2347 2348. 2015-10-28 14:33:06 +08:00
wangyidong
5029ba6b23 * finish task #2344. 2015-10-26 13:12:00 +08:00
wangyidong
66af5e5183 * finish task #2344. 2015-10-26 09:35:22 +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
daitingting
a56a0bde16 * finish task #2360. 2015-10-20 13:14:58 +08:00
wangyidong
2495cae340 * fix bugs #746,747. 2015-10-08 15:52:49 +08:00
wangyidong
0138d6f7f9 * fix a bug. 2015-09-23 11:01:00 +08:00
wangyidong
7d45f50cc2 * adjust for task #2320. 2015-09-16 16:41:45 +08:00
wangyidong
08f665a20f * finish task #2281. 2015-09-06 13:32:35 +08:00
wangyidong
bf21838118 * finish task #2285. 2015-09-02 13:13:58 +08:00
wangyidong
91b76c85d8 * finish task #2313. 2015-08-28 10:54:37 +08:00
wangyidong
9f9d367606 Merge branch 'master' of github.com:easysoft/zentaopms 2015-08-26 14:55:36 +08:00
wangyidong
b34c1f5c6c * finish task #2320. 2015-08-26 14:54:54 +08:00
Catouse
783e6e90d8 * finish task #2314. 2015-08-26 14:38:16 +08:00
wangyidong
9390e960ee * finish task #3344. 2015-07-17 13:24:48 +08:00
wangyidong
ecf44af91d * fix bugs. 2015-07-01 10:29:06 +08:00
wangyidong
04c534936e * fix a bug. 2015-06-05 14:49:58 +08:00
wangyidong
dc0f5ec51a * change for notice. 2015-05-20 14:45:48 +08:00
wangyidong
55c7228a35 * adjust for project story module. 2015-05-20 11:06:16 +08:00
wangyidong
1c89035b86 * change for update order. 2015-05-20 09:47:21 +08:00
wangyidong
ded3e99d37 * finish task #2267. 2015-05-13 16:44:44 +08:00
Catouse
70e1004102 * change burn report UI. 2015-05-11 17:05:14 +08:00
wangyidong
0aaefcaada * finish task #2253. 2015-05-08 16:24:04 +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
ba83f43b15 * finish task #2242. 2015-05-06 15:42:23 +08:00
wangyidong
c56d8e69c6 * finish task #2206, 2207. 2015-02-28 14:56:35 +08:00
wangyidong
cfc96b690e * fix bug #673. 2015-01-29 09:53:40 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
2d83179de0 * finish task #2193. 2015-01-27 17:16:43 +08:00
wangyidong
b99331df56 * finish task #2196. 2015-01-27 15:06:32 +08:00
wangyidong
c5e93987e0 * finish task #2167. 2014-12-15 09:14:00 +00:00