Commit Graph
11496 Commits
Author SHA1 Message Date
liugang fa6ed57b81 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-10 17:43:45 +08:00
liugang 4ad2bdac02 * Refact browse page of bug. 2018-05-10 17:43:29 +08:00
wangyidong 39c95c823d * finish task #4078. 2018-05-10 17:15:06 +08:00
Catouse 39dfb0648a * refactor codes. 2018-05-10 16:33:16 +08:00
Catouse 726556fd04 * refactor codes. 2018-05-10 16:18:00 +08:00
Catouse 8206f36332 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-10 16:02:08 +08:00
Catouse f2ba54dac9 * improve UI of task/create view. 2018-05-10 16:02:02 +08:00
wangyidong f214c7ece2 * adjust product-all page. 2018-05-10 15:52:47 +08:00
wangyidong 32dcdeb74c * finish task #4054. 2018-05-10 15:52:19 +08:00
wangyidong 8e45aed577 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-10 15:33:09 +08:00
wangyidong d5972b7a23 * finish task #3982. 2018-05-10 15:32:08 +08:00
Catouse c32fa94946 * update zui css. 2018-05-10 15:15:39 +08:00
Catouse 2662906129 * refactor code. 2018-05-10 15:14:19 +08:00
Catouse 03aed39442 * change label-level to label-severity. 2018-05-10 15:13:08 +08:00
Catouse 8e5b1a81b4 * change file language. 2018-05-10 14:58:44 +08:00
wangyidong ad4a3c3532 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-10 14:53:26 +08:00
wangyidong 3f2e2b96e7 * finish task #3981. 2018-05-10 14:52:04 +08:00
Catouse c02d5cf74a * improve table form style. 2018-05-10 14:51:17 +08:00
Catouse 0a375759a7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-10 14:50:03 +08:00
Catouse 623696b1b0 * update mzui. 2018-05-10 14:49:56 +08:00
Catouse 2fda0ddde3 * refactor code. 2018-05-10 14:49:38 +08:00
wangyidong a3bd5c2970 * adjust for table style. 2018-05-10 14:44:18 +08:00
wangyidong 08da02ba10 * finish task #3980. 2018-05-10 14:43:18 +08:00
wangyidong bd6668f25b Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-10 14:41:12 +08:00
wangyidong 3a62ffb622 * finish task #4044. 2018-05-10 14:40:44 +08:00
Catouse 0343fbca91 * make dropdown menu in subNavbar auto open when mouse hover. 2018-05-10 14:11:44 +08:00
Catouse 3ec32f4569 * hide datatable btn. 2018-05-10 13:49:13 +08:00
Catouse 3b3967b5b4 * change center-block width for form view. 2018-05-10 13:43:39 +08:00
wangyidong 52799cf5b8 * finish task #3978. 2018-05-10 11:18:09 +08:00
wangyidong 767a210d02 * finish task #3974. 2018-05-10 10:03:17 +08:00
wangyidong d20a923105 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-10 10:00:33 +08:00
wangyidong aede4506ce * finish task #3973. 2018-05-10 10:00:05 +08:00
daitingting e098acb326 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-09 18:07:01 +08:00
daitingting 81d2309191 * Adjust index file of doc. 2018-05-09 18:06:34 +08:00
wangyidong c3e3d3e974 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-09 15:20:15 +08:00
wangyidong ab4d9a1f2c * fix error and adjust for ux. 2018-05-09 15:18:45 +08:00
daitingting cad8f8652b * Optimize them. 2018-05-09 15:17:34 +08:00
daitingting 33a8e0d535 * Merge it. 2018-05-09 14:59:06 +08:00
daitingting 7807b3fd12 * Adjust codes. 2018-05-09 14:55:01 +08:00
daitingting 226074e7b2 * Adjust codes. 2018-05-09 14:54:38 +08:00
daitingting bcb5137abe * Move update sql to 10.0.beta. 2018-05-09 14:40:50 +08:00
daitingting b6f0a806f8 * Adjust icon. 2018-05-09 14:35:51 +08:00
Catouse 60f224db4a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-09 11:15:15 +08:00
Catouse 911da9d0cb * update zentao icons. 2018-05-09 11:15:09 +08:00
daitingting da9f9f6a05 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/doc/view/browse.html.php
2018-05-09 11:01:40 +08:00
daitingting 80478980dd * Rewrite showfile page of doc. 2018-05-09 11:00:55 +08:00
Catouse a4e6189f51 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-09 10:48:12 +08:00
Catouse 6a5098c40e * update zui css. 2018-05-09 10:48:07 +08:00
滔哥 5db3cf9041 * Format code. 2018-05-09 10:04:14 +08:00
滔哥 ed48dbeb81 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-09 10:00:36 +08:00