Commit Graph
10274 Commits
Author SHA1 Message Date
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
wangyidong 146c148586 * adjust for setMenu method. 2018-06-20 14:26:19 +08:00
daitingting e0fed55401 * Adjust modulePageNav for mobile page. 2018-06-20 14:24:22 +08:00
liugang 6e25725965 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-20 14:12:34 +08:00
liugang 1eb7ed4198 * Finish task #4461. 2018-06-20 14:11:52 +08:00
Catouse 2544b973ca * fix paste text lines in batch create form not work. 2018-06-20 13:37:38 +08:00
Catouse 59804604f1 * fix user login panel width. 2018-06-20 13:36:34 +08:00
Catouse 4e1a251388 * change style of custom/ajaxmenu view. 2018-06-20 10:32:26 +08:00
Catouse af3e2469d1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-20 09:22:54 +08:00
Catouse c6952e9a1a * change style of dashboard block panels. 2018-06-20 09:22:44 +08:00
Catouse f9d74dec94 * change style of custom/ajaxmenu view. 2018-06-20 09:15:42 +08:00
liugang 8846edc16b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-19 18:14:35 +08:00
liugang 08fb94f161 * Format codes. 2018-06-19 18:14:21 +08:00
Catouse e89a58a9b7 * fix UI of block panel drag and drop. 2018-06-19 17:20:56 +08:00
liugang 9cfc03d122 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-19 16:56:14 +08:00
liugang 5b0459d968 * Custom define menu. 2018-06-19 16:55:43 +08:00
Catouse 85ab286d4b * improve UI for large screens. 2018-06-19 14:31:54 +08:00
Catouse e5140604c1 * improve UI of dashboard. 2018-06-19 14:06:55 +08:00
Catouse e8c822f670 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-19 13:56:32 +08:00
Catouse d4edf035ae * support custom navbar menu items. 2018-06-19 13:56:24 +08:00
wangyidong 6506886dc3 * adjust for ux. 2018-06-19 10:59:20 +08:00
Catouse 013bfdcf07 * change UI of user/reset view. 2018-06-19 10:54:32 +08:00
Catouse bdf0f98617 * change style of blocks. 2018-06-19 10:53:59 +08:00
Catouse 069e1cbf4d * fix fixed table head in dashboard not work after drag and drop panel. 2018-06-19 10:16:50 +08:00
Catouse 59456e61f0 * improve UI of dashboard. 2018-06-15 18:01:51 +08:00
Catouse 53fc742e64 * improve UI of dashboard. 2018-06-15 17:40:55 +08:00
Catouse eae27fa1ba Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-15 14:16:26 +08:00
Catouse ebc3ecbe0f * change submit button position of comment modal in todo view. 2018-06-15 14:16:17 +08:00
liugang 684a51aede Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-15 14:11:38 +08:00
Catouse 5af1da0382 * improve UI for tutorial mode. 2018-06-15 14:11:11 +08:00
liugang 32f90f5778 * Finish task #4467. 2018-06-15 14:10:36 +08:00
Catouse 622d81b3a2 * improve search form UI for small screen. 2018-06-15 13:54:01 +08:00
Catouse 1b594402c8 * improve UI of project/story view. 2018-06-15 13:53:41 +08:00
Catouse cd7aca8d53 * fix branch property not defined error. 2018-06-15 13:32:34 +08:00
Catouse 15d1cd199f * improve UI of tutorial views. 2018-06-15 13:32:11 +08:00
Catouse b5ff0d3090 * improve kanban UI. 2018-06-15 11:58:01 +08:00
estellbright 20ff5b5491 Merge branch 'master' of github.com:easysoft/zentaopms 2018-06-15 09:42:31 +08:00
Catouse 9805a21e28 * fix kanban UI. 2018-06-15 09:21:18 +08:00
estellbright 1a4427c0db Fix #Task #4464. 2018-06-15 09:03:41 +08:00
Catouse 47ea0dd617 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-15 08:56:22 +08:00
Catouse ea2bcf0df9 * finisha task #4445. 2018-06-15 08:56:14 +08:00
Catouse 2b90bac67e * finish task #4453. 2018-06-15 08:55:55 +08:00
liugang bbdc292f8a * Finish task #4462. 2018-06-14 17:36:01 +08:00
liugang 251d4844cc * Finish task #4473. 2018-06-14 15:54:14 +08:00
liugang 4988ee0985 * Hide useless dynamics and search objetcs in different working type. 2018-06-14 15:22:15 +08:00
liugang 2573f78046 * Hide product index link if the global flow is not full. 2018-06-14 14:46:25 +08:00
liugang 35bcf01ff5 * Replace $this->config with $config in view files. 2018-06-14 14:34:41 +08:00
liugang 3a833a0f7a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-14 14:32:19 +08:00