Commit Graph
9672 Commits
Author SHA1 Message Date
Catouse d4bd3ca5a7 * fix chosen drop position. 2018-05-18 11:32:45 +08:00
Catouse da161f111b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 10:33:49 +08:00
Catouse 61c2e0c6e7 * improve modal UI. 2018-05-18 10:33:42 +08:00
daitingting 44de16b021 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 10:29:48 +08:00
daitingting 50e6f8e15f * Add english language. 2018-05-18 10:29:20 +08:00
wangyidong eb937c9e59 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 10:27:44 +08:00
wangyidong bb7b76e803 * adjust for only test. 2018-05-18 10:27:06 +08:00
liugang 0f26c55cab Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 10:05:23 +08:00
liugang ddb33c2a34 * Fix button style. 2018-05-18 10:05:13 +08:00
滔哥 a5c48d625e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:49:33 +08:00
滔哥 8f4fbd18ab * Format code for testcase. 2018-05-18 09:48:23 +08:00
滔哥 61a7474744 * Format code. 2018-05-18 09:47:34 +08:00
daitingting e87d6eb9cb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:39:39 +08:00
daitingting 01e8f79b55 * Merge it. 2018-05-18 09:39:21 +08:00
滔哥 6b487c7cfd Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:38:42 +08:00
滔哥 7d1dc5a5e9 * Format code. 2018-05-18 09:38:35 +08:00
daitingting 2bc846055c Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/task/css/create.css
2018-05-18 09:37:56 +08:00
daitingting 6c6601ae46 * Adjust button positon in name. 2018-05-18 09:37:19 +08:00
chenfeiCF 9ebca72c86 * Finish task #4151. 2018-05-18 09:31:17 +08:00
滔哥 e52e1a9373 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:28:26 +08:00
滔哥 eafa14bdca * Task#4159. 2018-05-18 09:28:19 +08:00
wangyidong 66cf0a2572 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 09:26:16 +08:00
wangyidong 6b548f637f * adjust for team. 2018-05-18 09:25:53 +08:00
liugang 59229b0c52 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:06:11 +08:00
liugang 1ec3ae0f8d * Fix status and severity style. 2018-05-18 09:05:39 +08:00
Catouse 22f8b657e8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-18 09:01:03 +08:00
Catouse 2518ac259e * change savequery dialog style. 2018-05-18 09:00:47 +08:00
Catouse 81fe923a60 * fix query label style. 2018-05-18 09:00:27 +08:00
wangyidong 600bfd300b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-18 08:58:18 +08:00
wangyidong 3f41de395d * finish task #4149. 2018-05-18 08:57:51 +08:00
滔哥 16762b2bef * Task#4154. 2018-05-18 08:46:53 +08:00
滔哥 ae39caedad * Task#4141. 2018-05-17 20:02:39 +08:00
滔哥 82dd51d2af * Task#4158. 2018-05-17 19:54:06 +08:00
滔哥 5d7d3ceb48 * Task#4161. 2018-05-17 19:47:23 +08:00
Catouse 4d1e624c3b * fix icon style in bug/browse view. 2018-05-17 18:33:48 +08:00
Catouse 07852489c9 * fix savequery modal style. 2018-05-17 18:33:24 +08:00
Catouse 10ca7db0ce * remove debug codes. 2018-05-17 18:16:43 +08:00
Catouse bb5a2975d2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 18:14:53 +08:00
Catouse 582d1b1a2c * refactor codes. 2018-05-17 18:14:46 +08:00
wangyidong 98a51a8c2d Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-17 17:28:42 +08:00
daitingting 430c205805 * Remove split-row when from is not doc.
* Adjust language.
2018-05-17 17:05:28 +08:00
daitingting 3ac0602e10 * Adjust codes. 2018-05-17 17:00:24 +08:00
wangyidong 3591e5732e Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-17 16:38:06 +08:00
wangyidong 8b78775556 * adjust for report page. 2018-05-17 16:37:40 +08:00
daitingting f88d50c01a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 16:12:36 +08:00
daitingting 5b97fbdc0b * Adjust modulesTree. 2018-05-17 16:12:12 +08:00
Catouse 7e3f890623 Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2018-05-17 15:40:20 +08:00
Catouse 7b890d9a03 * refactor codes. 2018-05-17 15:40:11 +08:00
tengfei ba2a44a659 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 15:09:59 +08:00
tengfei 44d87c1368 * translation changed 2018-05-17 15:07:58 +08:00