Commit Graph
1170 Commits
Author SHA1 Message Date
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 d22230a546 * change for custom menu. 2016-04-18 16:27:15 +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 d45ecec122 * code for task #2536: Set custom for batch edit product. 2016-04-14 16:38:30 +08:00
chenfeiCF ceee26974e * code for task #2536: Set custom for batch edit project. 2016-04-14 15:42:28 +08:00
Catouse 27ed67331e * improve dashboard UI. 2016-04-13 17:42:21 +08:00
Catouse 6b5f1228c8 * finish task #2576. 2016-04-12 13:32:54 +08:00
chenfeiCF 25648f4067 * fix bug 822. 2016-04-11 16:58:37 +08:00
wangyidong bfeaca5fa3 * change for browse in mobile. 2016-04-11 10:14:46 +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 e08ddd12b8 * finish task #2555. 2016-03-31 11:04:17 +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 ddf15aa13b * fix bug for getOptionMenu when project link two products or more. 2016-03-29 16:12:00 +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
chenfeiCF 8cd6978375 * finish task #2567. 2016-03-29 10:34:34 +08:00
chenfeiCF 92f2cb6c5d * finish task #2572. 2016-03-28 16:42:41 +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
wangyidong 420ff1ab87 Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-25 13:34:14 +08:00
wangyidong d4dd709c33 * adjust for build search sql. 2016-03-25 13:33:37 +08:00
chenfeiCF 53175bca26 * finish task #2565. 2016-03-25 10:26:49 +08:00
wangyidong b57e0ba64f * change for zh-tw lang. 2016-03-15 11:06:21 +08:00
wangyidong 0f6e89bd70 - rm treeview.html.php. 2016-03-14 11:28:01 +08:00
wangyidong 5188f6aa0b Merge branch 'master' of github.com:easysoft/zentaopms 2016-03-14 08:10:15 +08:00
chenfeiCF 0bebfe176a * delete lang items which have not been used. 2016-03-14 02:44:40 +08:00
chenfeiCF eb20cc4741 * fix the bug: not load search model when calling setSearchParams method. 2016-03-13 11:54:47 +08:00
chenfeiCF 0190934f07 * add empty mode for getPairs method of project model. 2016-03-13 10:56:16 +08:00
chenfeiCF ab8f86396f * adjust buildSearchForm method: put setSearchParams method in model. 2016-03-13 07:43:03 +08:00
chenfeiCF 55c2f7e63a * change the code style for story.js of project module. 2016-03-12 21:36:26 +08:00
wangyidong 1a8a8a0be4 * adjust mail style. 2016-03-11 17:31:39 +08:00
chenfeiCF 140a15b0be * change the dao property name for task #2458. 2016-03-09 16:50:36 +08:00
chenfeiCF 2f9ac5d436 * refactor task method for project module. 2016-03-02 17:35:05 +08:00
wangyidong e23311969d * change for new framework. 2016-03-01 10:57:53 +08:00
chenfeiCF 8a604925ee * finish task #2492. 2016-02-29 10:16:34 +08:00
Catouse 334a0b1009 * change UI of mail content for user. 2016-02-23 16:55:50 +08:00
Catouse 80b50cb041 * ajust style of project/manageproducts UI. 2016-02-22 15:14:31 +08:00
Catouse 9141bb13d7 * fix style of tree menu. 2016-02-22 15:03:44 +08:00
Catouse e35b0f273e * fix style of inline radios. 2016-02-22 13:39:43 +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 26e611bee5 * finish task #1799. 2016-02-17 10:16:18 +08:00
wangyidong d324bb72e6 Merge branch 'master' of github.com:easysoft/zentaopms 2016-02-15 17:29:46 +08:00
wangyidong e8bb9aa1ee * finish task #1295. 2016-02-15 17:29:23 +08:00