Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zimbra-admin-api-js
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Public
zimbra-admin-api-js
Commits
068d515b
Commit
068d515b
authored
Jun 19, 2018
by
Juorder Gonzalez quiñonez
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/ZBoxApp/manager-react
into develop
parents
d53f25c7
c532b6df
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
9 deletions
+11
-9
mailbox.jsx
src/components/mailbox/mailbox.jsx
+1
-2
panel_actions.jsx
src/components/panel_actions.jsx
+2
-1
panel_actions_allows.jsx
src/components/panel_actions_allows.jsx
+2
-1
index.jsx
src/index.jsx
+0
-1
_datepicker.scss
src/sass/components/_datepicker.scss
+4
-4
_variables.scss
src/sass/utils/_variables.scss
+1
-0
utils.jsx
src/utils/utils.jsx
+1
-0
No files found.
src/components/mailbox/mailbox.jsx
View file @
068d515b
...
...
@@ -31,7 +31,6 @@ import ZimbraStore from '../../stores/zimbra_store.jsx';
const
QueryOptions
=
Constants
.
QueryOptions
;
const
messageType
=
Constants
.
MessageType
;
const
codes
=
Constants
.
ZimbraCodes
;
export
default
class
Mailboxes
extends
React
.
Component
{
constructor
(
props
)
{
...
...
@@ -270,7 +269,7 @@ export default class Mailboxes extends React.Component {
domain
:
domainName
,
loading
:
false
});
}).
catch
(
console
.
error
.
bind
(
'error'
)
);
}).
catch
(
(
err
)
=>
err
);
}
getAllMailboxes
(
domainId
)
{
...
...
src/components/panel_actions.jsx
View file @
068d515b
...
...
@@ -47,7 +47,8 @@ export default class PanelActions extends React.Component {
e
.
preventDefault
();
if
(
this
.
props
.
onExport
)
{
return
this
.
props
.
onExport
(
this
.
state
[
'items'
+
this
.
props
.
name
]);
const
{
data
:
items
}
=
this
.
props
;
return
this
.
props
.
onExport
(
items
);
}
throw
new
Error
(
'onExport function was not defined, onExport :'
+
this
.
props
.
onExport
);
...
...
src/components/panel_actions_allows.jsx
View file @
068d515b
...
...
@@ -47,7 +47,8 @@ export default class PanelActions extends React.Component {
e
.
preventDefault
();
if
(
this
.
props
.
onExport
)
{
return
this
.
props
.
onExport
(
this
.
state
[
'items'
+
this
.
props
.
name
]);
const
{
data
:
items
}
=
this
.
props
;
return
this
.
props
.
onExport
(
items
);
}
throw
new
Error
(
'onExport function was not defined, onExport :'
+
this
.
props
.
onExport
);
...
...
src/index.jsx
View file @
068d515b
...
...
@@ -31,7 +31,6 @@ import * as Client from './utils/client.jsx';
import
*
as
Utils
from
'./utils/utils.jsx'
;
import
Constants
from
'./utils/constants.jsx'
;
import
$
from
'jquery'
;
import
React
from
'react'
;
import
ReactDOM
from
'react-dom'
;
import
{
Router
,
Route
,
IndexRedirect
,
Redirect
,
browserHistory
}
from
'react-router'
;
...
...
src/sass/components/_datepicker.scss
View file @
068d515b
.datepicker-days
{
padding
:
10px
10px
0
px
10px
;
padding
:
10px
10px
0
;
.switch
{
text-align
:
center
;
}
.today
{
color
:
#337ab7
;
color
:
$color-active-day
;
}
.day
{
...
...
@@ -18,7 +18,7 @@
}
.active
{
color
:
#FFF
;
background-color
:
#337ab7
;
background-color
:
$color-active-day
;
color
:
$white
;
}
}
src/sass/utils/_variables.scss
View file @
068d515b
...
...
@@ -27,6 +27,7 @@ $color-yellow: #ffb606;
$color-orange
:
#e67e22
;
$color-red
:
#e74c3c
;
$color-red-deep
:
#c0392b
;
$color-active-day
:
#337ab7
;
// Additional colors
$color-text
:
#6a6c6f
;
...
...
src/utils/utils.jsx
View file @
068d515b
...
...
@@ -881,6 +881,7 @@ export function getConfigName() {
}
export
function
isDevMode
()
{
// eslint-disable-next-line
return
process
.
env
.
NODE_ENV
===
'development'
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment