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 |
|
Catouse
|
e8aff5c01d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-20 14:41:22 +08:00 |
|
wangyidong
|
f8cd274e20
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-06-20 14:39:19 +08:00 |
|
Catouse
|
eedf30e0c6
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-20 14:36:52 +08:00 |
|
Catouse
|
b24eb3c2ac
|
* update zui file.
|
2018-06-20 14:36:00 +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
|
0f94ffe7c2
|
* update zui.
|
2018-06-20 10:24:59 +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
|
eb29ee0b6f
|
* make page responsive for small screen.
|
2018-06-19 17:25:10 +08:00 |
|
Catouse
|
e89a58a9b7
|
* fix UI of block panel drag and drop.
|
2018-06-19 17:20:56 +08:00 |
|
Catouse
|
83c6f5a99a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-06-19 17:04:36 +08:00 |
|
Catouse
|
df3e713276
|
* remove fixed container size.
|
2018-06-19 17:04:27 +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
|
e9920819c0
|
* fix container size in modal.
|
2018-06-19 16:44:36 +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
|
370fdea071
|
* update zui files.
|
2018-06-19 10:54:19 +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 |
|