Commit Graph
8823 Commits
Author SHA1 Message Date
wangyidong 7ac6afe616 * finish task #2719,2729. 2016-11-25 15:32:28 +08:00
wangyidong cc1e0f2cf0 * finish task #2730. 2016-11-24 16:55:39 +08:00
wangyidong a70a30f837 * finish task #2733. 2016-11-24 13:48:28 +08:00
wangyidong 23d37c17b7 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-24 11:16:38 +08:00
wangyidong cb64163ea0 * finish task #2735. 2016-11-24 10:29:54 +08:00
wangyidong 80fac82927 * finish task #2736. 2016-11-24 10:05:54 +08:00
chenfeiCF 266727b2fb * add deleted field to zt_module table. 2016-11-24 09:06:29 +08:00
chenfeiCF 842f2c8c20 * finish task #2724. 2016-11-23 17:06:28 +08:00
Catouse c2a4699d5c * improve project task tree UI. 2016-11-23 17:03:28 +08:00
Catouse e490628eca Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-23 16:51:27 +08:00
Catouse a30a1b7b35 * code for task #2751. 2016-11-23 16:49:43 +08:00
chenfeiCF 213b79c896 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-23 16:48:31 +08:00
chenfeiCF 0da4982f3d * finish task #2755. 2016-11-23 16:47:47 +08:00
wangyidong 2d48ca7caf Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-23 16:01:59 +08:00
Catouse c4ba4b015a * finish task #2766. 2016-11-23 15:11:04 +08:00
Catouse d88dcb92f7 Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2016-11-23 14:58:32 +08:00
Catouse d7b75936e0 * finish task #2769 and task #2768. 2016-11-23 14:58:15 +08:00
wangyidong 7a28c7ef3c * finish task #2737. 2016-11-23 14:49:32 +08:00
chenfeiCF fd3b1e0890 * finish task #2731. 2016-11-23 14:47:34 +08:00
Catouse 3f5434f83b Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-23 14:46:44 +08:00
Catouse a93e57260e * update zui. 2016-11-23 14:46:03 +08:00
wangyidong 3cf812b1af * code for task #2752. 2016-11-23 14:38:56 +08:00
wangyidong be0590ac6f Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-23 14:38:21 +08:00
wangyidong af68f3c193 * finish task #2738. 2016-11-23 14:36:41 +08:00
wangyidong 66f4ab8ea6 * fix bug for save query condition. 2016-11-23 14:28:53 +08:00
Catouse 5c613b10e4 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/productplan/css/view.css
	module/project/view/grouptask.html.php
2016-11-23 14:03:54 +08:00
chenfeiCF dc75ee0124 * code for task #2731: could custom branch when batch create story. 2016-11-23 13:32:31 +08:00
wangyidong 26aadd03f9 * finish task #2740. 2016-11-23 11:55:37 +08:00
wangyidong 5aeebbba95 * finish task #2748. 2016-11-23 11:06:51 +08:00
wangyidong 74071c46e5 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-23 10:59:24 +08:00
wangyidong decf0f8b67 * finish task #2750. 2016-11-23 10:59:00 +08:00
wangyidong ceb1fd45fb * add api for integrate svn/git. 2016-11-23 10:40:15 +08:00
chenfeiCF 7a9b077972 * finish task #2745. 2016-11-23 09:24:38 +08:00
chenfeiCF 0f26f8f7d7 * finish task #2777. 2016-11-22 17:19:08 +08:00
wangyidong 8809a36e64 * finish task #2752. 2016-11-22 16:43:53 +08:00
Catouse 4a98f9b3fd Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-22 16:20:41 +08:00
Catouse 65b2930060 * fix style of bordered table. 2016-11-22 16:19:01 +08:00
Catouse 22e81d3d93 * fix table fixed header style in block. 2016-11-22 16:18:35 +08:00
Catouse 979459abab * adjust code format. 2016-11-22 16:18:07 +08:00
wangyidong 0c4205589b Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-22 16:18:03 +08:00
Catouse 79a24ec8fd * fix fixed table header style. 2016-11-22 16:17:58 +08:00
Catouse 2a3e326962 * fix task pri text with zero value. 2016-11-22 16:17:40 +08:00
chenfeiCF 176eb15d75 * close modal when create a testcase from story view. 2016-11-22 16:06:44 +08:00
wangyidong 5cc0de9ec4 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-22 15:57:51 +08:00
wangyidong c6d79ccd4b * finish task #2753 and code task #2719. 2016-11-22 15:56:30 +08:00
chenfeiCF 9e4a7f5316 * finish task #2716. 2016-11-22 15:28:05 +08:00
Catouse 0f25690c86 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-22 14:40:28 +08:00
Catouse 815e104606 * fix hotkey error. 2016-11-22 14:40:18 +08:00
wangyidong d3fb97b921 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-22 14:22:20 +08:00
wangyidong e549d7f015 * finish task #2757. 2016-11-22 14:21:05 +08:00