Commit Graph

314 Commits

Author SHA1 Message Date
wangyidong
d89d674cdd * code for task #2522,2579. 2016-04-20 14:51:05 +08:00
chenfeiCF
d1bcb26a7a * fix error for task #2554 when browseType is 'byproduct'. 2016-04-19 13:31:14 +08:00
Catouse
b356e65732 * finish task #2552. 2016-04-18 18:45:58 +08:00
Catouse
62f35f1a18 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/project/view/taskheader.html.php
2016-04-18 16:38:37 +08:00
Catouse
ba2eff3f57 * code for task #2552. 2016-04-18 16:35:50 +08:00
wangyidong
619e9220ca * adjust and fix block. 2016-04-15 15:03:35 +08:00
wangyidong
c5dcca79bf * set homepage for product/project/qa. 2016-04-15 11:32:46 +08:00
chenfeiCF
ceee26974e * code for task #2536: Set custom for batch edit project. 2016-04-14 15:42:28 +08:00
wangyidong
ceb50edff9 * code for task #2527. 2016-04-08 13:28:33 +08:00
wangyidong
ee0ace3c75 * finish task #2559. 2016-04-05 14:29:21 +08:00
wangyidong
2e72d5724b * finish task #2551. 2016-04-01 16:24:38 +08:00
chenfeiCF
c9658bc638 * finish task #2554.
* code model.php of product module for task #2553.
2016-03-31 09:39:28 +08:00
wangyidong
2cbcebc17f Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-29 15:10:38 +08:00
wangyidong
647e9bee18 * finish task #2580. 2016-03-29 15:08:46 +08:00
chenfeiCF
590afbf92e * finish task #2569. 2016-03-29 14:27:57 +08:00
wangyidong
4c06f689c4 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-28 09:28:43 +08:00
wangyidong
be07c40bf7 * code for task #2561. 2016-03-28 09:27:09 +08:00
chenfeiCF
8d843914d4 * finish task #2543.
* adjust method name createGroupLink to createGroupManageMemberLink.
2016-03-25 17:27:08 +08:00
chenfeiCF
ab8f86396f * adjust buildSearchForm method: put setSearchParams method in model. 2016-03-13 07:43:03 +08:00
chenfeiCF
2f9ac5d436 * refactor task method for project module. 2016-03-02 17:35:05 +08:00
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