Commit Graph
10321 Commits
Author SHA1 Message Date
liugang 4eb7fa395a * Finish task #4475 2018-06-25 11:25:32 +08:00
滔哥 de5854c184 * Fix bug#1928. 2018-06-25 10:31:19 +08:00
daitingting acab920f41 * Add all params for dept managers. 2018-06-25 10:27:43 +08:00
daitingting ee3c030f80 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-25 09:58:21 +08:00
daitingting 1b669c7d7e * If feedbackView is true, hide side-col. 2018-06-25 09:57:25 +08:00
Catouse 33d3b9ef32 * fix table style in block. 2018-06-25 09:55:39 +08:00
滔哥 33214ebde8 * Fix bug#1928. 2018-06-24 21:13:08 +08:00
Catouse 9995fdec6c * support show some data view with datatable. 2018-06-23 20:02:57 +08:00
Catouse a06498fd52 * improve dashboard UI. 2018-06-23 16:58:49 +08:00
Catouse 47d6799e81 * remove support ie8. 2018-06-23 16:23:16 +08:00
Catouse 8faed8221c * remove duplicate chart code, the code is in zui. 2018-06-23 16:23:05 +08:00
Catouse 15698c1fb8 * refactor codes. 2018-06-23 15:16:36 +08:00
Catouse c4316f104e * fix burn interval selectbox size. 2018-06-23 14:27:25 +08:00
Catouse c4e8472de9 * fix style of search list and chosen and finish task #4484. 2018-06-23 14:17:58 +08:00
liugang 4d1fda964d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-22 18:00:08 +08:00
liugang 9236fe025e * Fix bug of qa statistic block. 2018-06-22 17:59:53 +08:00
滔哥 d64f5ffc36 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-22 16:31:28 +08:00
滔哥 6c32a3b893 * Fix bug. 2018-06-22 16:31:22 +08:00
wangyidong 58cc58f95c Merge branch 'master' of github.com:easysoft/zentaopms 2018-06-22 16:21:09 +08:00
wangyidong 02a5b86697 * adjust for ux. 2018-06-22 16:20:37 +08:00
滔哥 310d3db0dc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-22 15:49:38 +08:00
liugang 37b2364a9c * Adjust codes. 2018-06-22 15:46:50 +08:00
liugang 6c1fd5634e * Fix bug. 2018-06-22 15:39:09 +08:00
滔哥 9c45581e05 * Finish bug#1933. 2018-06-22 15:38:12 +08:00
滔哥 ac4c646d84 * Finish bug#1937. 2018-06-22 15:22:08 +08:00
滔哥 7c9b45ca0c * Finish bug#1946,1945. 2018-06-22 15:18:23 +08:00
滔哥 93015be6e2 * Finish bug#1946. 2018-06-22 15:13:51 +08:00
滔哥 2ffa3ff230 * Finish bug#1949. 2018-06-22 15:05:10 +08:00
liugang 334f6548ae * Finish task #4489 2018-06-22 14:35:48 +08:00
liugang 3e1a2b565e * Finish task #4482 2018-06-22 13:15:56 +08:00
liugang 01683e7ec4 * Finish task #4477 2018-06-22 11:15:08 +08:00
liugang bace586795 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-22 10:49:53 +08:00
liugang 7c5208c61a * Hide tutorial menu if the global flow is not full. 2018-06-22 10:48:22 +08:00
Catouse 1c72b78bf1 * remove css .table td {overflow:hidden;} and fix bug. 2018-06-22 09:42:12 +08:00
liugang cb0fa7c451 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-21 17:39:53 +08:00
liugang a054614d58 * Finish task #4488 2018-06-21 17:39:31 +08:00
daitingting e0986c8883 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-21 15:15:26 +08:00
daitingting dc7073ac3a * Adjust form to left. 2018-06-21 15:15:09 +08:00
reneteng 817dcdf23b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-21 15:03:31 +08:00
reneteng 21d3d935b8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-21 15:02:14 +08:00
daitingting 62862bc6cf * Adjust form to left. 2018-06-21 15:01:31 +08:00
reneteng aa13ebf9c4 * change translation 2018-06-21 15:01:01 +08:00
daitingting 0d6a3975e5 * Adjust form to left. 2018-06-21 14:52:02 +08:00
daitingting 78e898258a * Format codes. 2018-06-21 14:37:28 +08:00
liugang b9fb4fae18 * Finish task #4479 2018-06-21 13:55:27 +08:00
liugang baf5dffd79 * Finish task #4480,4490 2018-06-21 13:43:20 +08:00
daitingting 2341927a79 * Adjust conflict. 2018-06-20 14:49:26 +08:00
wangyidong f8cd274e20 Merge branch 'master' of github.com:easysoft/zentaopms 2018-06-20 14:39:19 +08:00
wangyidong 1b9f99f127 Merge branch 'master' of github.com:easysoft/zentaopms 2018-06-20 14:27:16 +08:00
daitingting 2594c5691c Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/bug/model.php
	module/product/model.php
	module/testcase/model.php
	module/testsuite/model.php
	module/testtask/model.php
2018-06-20 14:26:46 +08:00