Commit Graph

259 Commits

Author SHA1 Message Date
wangyidong
103919866f * fix bug #755. 2015-11-23 15:18:42 +08:00
wangyidong
c657433fa2 * adjust code and fix bug. 2015-11-20 10:45:18 +08:00
wangyidong
603f64a618 * fix bug for tree. 2015-11-13 09:25:36 +08:00
wangyidong
7891848534 * finish task #2393. 2015-11-12 16:25:41 +08:00
wangyidong
fd312662cc * finish task #2395. 2015-11-11 16:15:41 +08:00
wangyidong
dec039edfb * finish task #2391. 2015-11-11 14:56:37 +08:00
wangyidong
273bf0a237 * finish task #2378,2379,2381. 2015-11-10 17:12:33 +08:00
wangyidong
ff210f304d * finish task #2377. 2015-11-10 11:11:48 +08:00
wangyidong
b82964c389 * finish task #2376. 2015-11-10 10:37:43 +08:00
wangyidong
653b1c3cd1 * fix bug #749. 2015-11-09 09:32:15 +08:00
wangyidong
e2c77e381c * change for compute password strength. 2015-11-06 14:30:55 +08:00
wangyidong
e003ed01f0 * finish task #2363,2364. 2015-11-05 17:27:59 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +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
1202c8db38 * finish for testtask branch. 2015-10-29 10:05:01 +08:00
wangyidong
66af5e5183 * finish task #2344. 2015-10-26 09:35:22 +08:00
wangyidong
df23f3b43e * finish task #2341. 2015-10-22 16:38:39 +08:00
wangyidong
333b0be157 * finish task #2323,2340. 2015-10-22 09:03:37 +08:00
wangyidong
8274afc8da * finish task #2291. 2015-09-01 16:06:47 +08:00
wangyidong
8576ea525a * finish task #2294. 2015-09-01 14:28:59 +08:00
wangyidong
e0a643cd0b * change projectcommon to projectCommon,productcommon to productCommon. 2015-07-30 15:35:55 +08:00
wangyidong
dc381b40b5 * fix bugs. 2015-07-03 11:33:21 +08:00
wangyidong
0345e1a380 * adjust for task #2266. 2015-05-21 13:36:25 +08:00
wangyidong
55c7228a35 * adjust for project story module. 2015-05-20 11:06:16 +08:00
wangyidong
d00db8682c * adjust for change root. 2015-05-19 17:11:18 +08:00
wangyidong
0ca09de3d7 * change for zh-tw lang. 2015-05-18 13:55:40 +08:00
wangyidong
ba83f43b15 * finish task #2242. 2015-05-06 15:42:23 +08:00
wangyidong
dca976c86a * code for task #2236. 2015-05-06 11:16:28 +08:00
wangyidong
06f1199112 * finish task #2236. 2015-05-05 15:50:34 +08:00
wangyidong
d38fc50737 * fix a bug. 2015-04-29 18:11:44 +08:00
wangyidong
ab3c3a6fbf * fix a bug #689. 2015-04-14 11:07:48 +08:00
wangyidong
4046ab3cdd * fix bug #691. 2015-04-01 16:25:36 +08:00
wangyidong
44161c02c0 * fix for doc tree. 2015-04-01 16:05:28 +08:00
wangyidong
c9f0b9f861 * change for zh-tw. 2015-02-04 15:43:19 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
xia0ta0
3477298ca4 Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-10 11:32:38 +08:00
xia0ta0
0399ee3358 * fix bug#647. 2014-12-10 11:27:55 +08:00
Catouse
c58c386c59 * fix duplicate references of chosen. 2014-12-09 17:12:30 +08:00
wangyidong
ca30b0775f * finish task #2138. 2014-11-03 07:30:41 +00:00
xia0ta0
f5b311cd0f * fix bug: get stories of custom child module error. 2014-10-30 14:50:06 +08:00
xia0ta0
4fedcd4234 * fix bug of fixModulePath. 2014-10-15 15:20:35 +08:00
wangyidong
2088a01aee * fix bug #610. 2014-08-26 07:34:16 +00:00
wangyidong
60595ffa00 * fix a bug. 2014-08-21 01:43:03 +00:00
xia0ta0
41c3ffae4f Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/search/view/buildform.html.php
2014-08-20 10:54:50 +08:00
wangyidong
de50683bc3 * finish task #2050. 2014-08-18 09:02:04 +00:00
wangyidong
165f5e86a5 Merge branch 'master' of github.com:easysoft/zentaopms 2014-08-12 08:38:48 +00:00
chujilu
f56e7c0b14 * adjust code 2014-08-12 16:16:26 +08:00
wangyidong
01023e5fb2 * finish task #1793. 2014-08-12 08:14:52 +00:00
chujilu
46f9884495 * adjust code 2014-08-12 15:49:32 +08:00