Commit Graph
11718 Commits
Author SHA1 Message Date
Catouse 27d88fe998 * merge code. 2018-05-17 09:56:22 +08:00
Catouse e9d51b9360 * fix project statistic block style. 2018-05-17 09:56:07 +08:00
Catouse 3cb9e07bd7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 09:49:08 +08:00
Catouse 6d99041b8b * fix modal style. 2018-05-17 09:48:59 +08:00
Catouse 77b78b57eb * fix block styles. 2018-05-17 09:48:51 +08:00
wangyidong 897346d6f9 * adjust for testcase bugs page. 2018-05-17 09:45:10 +08:00
wangyidong 54d73617e0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-17 09:35:24 +08:00
wangyidong a4048ea3a2 * finish task #4136,4134. 2018-05-17 09:34:16 +08:00
滔哥 cb334ba0ab Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 09:32:06 +08:00
滔哥 a95ca70cea * Task#4137. 2018-05-17 09:32:00 +08:00
Catouse 47eac5821d * fix modal style. 2018-05-17 09:29:30 +08:00
Catouse 6e3df90c27 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 09:27:16 +08:00
Catouse 590fb904e1 * fix chosen style. 2018-05-17 09:27:08 +08:00
wangyidong 646079892c Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-17 09:05:15 +08:00
wangyidong 304653cd65 * fix bug. 2018-05-17 09:04:44 +08:00
Catouse b5d0e60258 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-17 08:52:30 +08:00
Catouse b78a175040 * fix $.closeModal not work. 2018-05-17 08:52:23 +08:00
daitingting e2bd9a8e0b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 17:46:46 +08:00
daitingting 880d85d7d7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 17:46:19 +08:00
Catouse a02d415176 * remove html required attribute. 2018-05-16 17:46:11 +08:00
daitingting fad7ac2701 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/build/view/linkbug.html.php
	module/build/view/linkstory.html.php
	module/project/view/create.html.php
	module/release/view/linkbug.html.php
	module/release/view/linkstory.html.php
2018-05-16 17:46:01 +08:00
Catouse c269296739 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 17:44:55 +08:00
Catouse 9c97348013 * refactor codes. 2018-05-16 17:44:49 +08:00
daitingting 0056609d9c * Adjust button style. 2018-05-16 17:44:42 +08:00
wangyidong d31cb467ee Merge branch 'master' of github.com:easysoft/zentaopms 2018-05-16 16:02:48 +08:00
wangyidong 316ba36b94 * adjust for bug-linkbugs page. 2018-05-16 16:01:56 +08:00
Catouse bd0a029ec5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 15:31:20 +08:00
Catouse db8155f6ae * improve UI for sortable table. 2018-05-16 15:31:13 +08:00
滔哥 a3deb382e2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 15:21:38 +08:00
滔哥 a4e39f0acf * Format code. 2018-05-16 15:21:23 +08:00
Catouse 984117329e * change details style. 2018-05-16 15:13:20 +08:00
Catouse 78c9a03539 * fix user profile dialog width. 2018-05-16 15:11:05 +08:00
Catouse 980b218c8f Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 15:08:52 +08:00
Catouse 9a7263b427 * update zui files. 2018-05-16 15:08:45 +08:00
liugang 6bd19bff24 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 15:06:10 +08:00
liugang c0a9d8eb61 * Adjust style. 2018-05-16 15:06:01 +08:00
Catouse d120507aef Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 15:05:35 +08:00
Catouse 4be5a4c3ec * refactor codes. 2018-05-16 15:05:29 +08:00
liugang 600f4cab37 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 14:49:59 +08:00
liugang 82b9d32295 * Optimize codes. 2018-05-16 14:49:46 +08:00
Catouse 683386d7aa * disabled block color setting. 2018-05-16 14:32:01 +08:00
Catouse a1e57b2044 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 14:11:14 +08:00
Catouse 7986465387 * update buttons style. 2018-05-16 14:11:08 +08:00
chenfeiCF 743488862e * Finish task #4063, #4064, #4065. 2018-05-16 14:00:00 +08:00
Catouse ba9be5b486 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 13:50:14 +08:00
Catouse d7c643853b * improve UI of about dialog and admin/index links view. 2018-05-16 13:50:04 +08:00
daitingting 7f0eddc801 * Add note when there is no test task. 2018-05-16 13:35:15 +08:00
wangyidong 02e41e1fc1 * finish task #3975. 2018-05-16 13:06:35 +08:00
daitingting 74ebec4bac Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 11:19:44 +08:00
daitingting 98fad5db13 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-05-16 11:18:16 +08:00