Commit Graph

1013 Commits

Author SHA1 Message Date
chenfeiCF
aa0b77bf28 * fix bug for task #2403. 2015-11-13 13:25:19 +08:00
wangyidong
603f64a618 * fix bug for tree. 2015-11-13 09:25:36 +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
chenfeiCF
cb4e84a9da * finish task #2403. 2015-11-13 00:19:43 +08:00
wangyidong
7891848534 * finish task #2393. 2015-11-12 16:25:41 +08:00
wangyidong
275c833e02 * finish task #2394. 2015-11-12 10:14:43 +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
chenfeiCF
1f72c22642 * finish task #2387. 2015-11-10 13:34:06 +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
e2c77e381c * change for compute password strength. 2015-11-06 14:30:55 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +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
chenfeiCF
5b5f982fd6 * fix bug #760. 2015-11-02 08:04:17 +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
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
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
9ad38472fc * finish task #2336,2337,2338,2339. 2015-10-20 10:11:46 +08:00
wangyidong
c03bce590c * finish task #2327. 2015-10-15 10:08:22 +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
abf8b97904 * change for zh-tw. 2015-09-18 09:59:43 +08:00
wangyidong
df8478386a * adjust for import bug. 2015-09-17 14:45:08 +08:00
wangyidong
9cf05383df Merge branch 'master' of github.com:easysoft/zentaopms 2015-09-17 13:57:26 +08:00
Catouse
59fca8a35c * update chartjs. 2015-09-16 18:28:38 +08:00
wangyidong
7d45f50cc2 * adjust for task #2320. 2015-09-16 16:41:45 +08:00
wangyidong
44fae82506 + add for task #2285. 2015-09-16 16:36:59 +08:00
Catouse
c67b0746e0 * change burn chart config. 2015-09-09 14:25:34 +08:00
Catouse
296f0ac78d * finish task #2274. 2015-09-09 12:03:59 +08:00
wangyidong
84d7e49211 * finish task #2278. 2015-09-07 14:10:37 +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
34cbd724fd * finish task #2287. 2015-09-02 10:41:44 +08:00
wangyidong
33fc3798a0 * finish task #2300. 2015-09-01 13:36:54 +08:00
wangyidong
0df81600ae * finish task #2296. 2015-08-28 15:55:31 +08:00
wangyidong
91b76c85d8 * finish task #2313. 2015-08-28 10:54:37 +08:00
wangyidong
d83b92be9a * finish task #2319. 2015-08-26 17:01:27 +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