Merge branch 'master' into release/firefox-fix
This commit is contained in:
commit
7946db90f1
@ -106,6 +106,7 @@ solid-router#navbar-router(default-route='dashboard')
|
|||||||
empty-widget='hubl-create'
|
empty-widget='hubl-create'
|
||||||
empty-value='projet'
|
empty-value='projet'
|
||||||
widget-project='hubl-menu-fix-url-project'
|
widget-project='hubl-menu-fix-url-project'
|
||||||
|
order-by="project.customer.name"
|
||||||
)
|
)
|
||||||
div.divider
|
div.divider
|
||||||
if endpoints.circles || (endpoints.get && endpoints.get.circles)
|
if endpoints.circles || (endpoints.get && endpoints.get.circles)
|
||||||
@ -133,6 +134,7 @@ solid-router#navbar-router(default-route='dashboard')
|
|||||||
empty-widget='hubl-create'
|
empty-widget='hubl-create'
|
||||||
empty-value='cercle'
|
empty-value='cercle'
|
||||||
widget-circle='hubl-menu-fix-url-circle'
|
widget-circle='hubl-menu-fix-url-circle'
|
||||||
|
order-by="circle.name"
|
||||||
)
|
)
|
||||||
div.divider
|
div.divider
|
||||||
if endpoints.users || (endpoints.get && endpoints.get.users)
|
if endpoints.users || (endpoints.get && endpoints.get.users)
|
||||||
|
Loading…
Reference in New Issue
Block a user