Commit Graph
8808 Commits
Author SHA1 Message Date
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
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
wangyidong 40818f0779 * revert bug lang. 2016-11-22 14:12:49 +08:00
Catouse 6fe63dcc59 * finish task #2781. 2016-11-22 13:42:41 +08:00
Catouse 97ea6de6b2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-22 11:35:28 +08:00
Catouse 6fe397cf6d * improve tree UI. 2016-11-22 11:33:55 +08:00
Catouse 57b5a526cd * adjust dropdown style. 2016-11-22 11:33:39 +08:00
Catouse 24db1cd1fc * update chosen and code for task #2684. 2016-11-22 11:33:23 +08:00
wangyidong 9410cab78f Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-22 11:28:13 +08:00
wangyidong 45c6658826 * finish task #2710. 2016-11-22 11:27:51 +08:00
chenfeiCF 995d4653cc * add task, bug, case counts of story to datatable. 2016-11-22 11:24:25 +08:00
chenfeiCF 54419ad74b * add task progress to datatable and adjust task view page of create method. 2016-11-22 10:38:33 +08:00
wangyidong 26a9b56aa8 * finish task #2705. 2016-11-22 10:08:15 +08:00
wangyidong 1fdd5206cb * finish task #2728. 2016-11-22 09:54:02 +08:00
wangyidong 5765831546 + add new file for syntaxhighlighter. 2016-11-22 09:43:46 +08:00
wangyidong 6707744696 * finish task #2754. 2016-11-21 17:08:10 +08:00
wangyidong ba7957bbce Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-21 17:03:52 +08:00