Skip to content

Commit 0ee346f

Browse files
BlariBlari
committed
Merge remote-tracking branch 'origin/Master' into Master
# Conflicts: # changelog.md # dist/components/ui_modal.html # dist/components/ui_navbar.html # dist/components/ui_popovers_tooltips.html # dist/css/application.min.css # dist/css/maps/application.min.css.map # src/pages/components/ui_modal.hbs # src/pages/components/ui_navbar.hbs # src/pages/components/ui_popovers_tooltips.hbs # src/sass/_bootstrap-override.scss
2 parents 90b186f + d9b7c5c commit 0ee346f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+534
-309
lines changed

‎dist/charts/charts.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</a>
258258
</li>
259259
<li role="presentation">
260-
<a role="menuitem" target="_self" href="#" class="dropdown-item">
260+
<a role="menuitem" target="_self" href="../other/profile.html" class="dropdown-item">
261261
<span class="mr-3">
262262
<i class="sidebar-icon profile"></i>
263263
</span>
@@ -475,7 +475,7 @@ <h5 class="sidebar-nav-title">Template </h5>
475475
<ul id="sidebar-extra" class="collapse ">
476476
<li class=""><a href="../extra/calendar.html" data-no-pjax >Calendar</a></li>
477477
<li class=""><a href="../extra/invoice.html">Invoice</a></li>
478-
<li class=""><a href="../extra/login.html" target="_blank">Login Page</a></li>
478+
<li class=""><a href="../extra/login.html" data-no-pjax>Login Page</a></li>
479479
<li class=""><a href="../extra/gallery.html">Gallery</a></li>
480480
<li class=""><a href="../extra/search.html">Search Results</a></li>
481481
<li class=""><a href="../extra/time_line.html">Time Line</a></li>
@@ -488,17 +488,16 @@ <h5 class="sidebar-nav-title">Template </h5>
488488
<a href="#">
489489
<i class="sidebar-icon settings-icon"></i>
490490
<span class="icon-text">Settings</span>
491-
492491
</a>
493492
</li>
494493
<li class="">
495-
<a href="#">
494+
<a href="../other/profile.html">
496495
<i class="sidebar-icon account-icon"></i>
497496
<span class="icon-text">Account</span>
498497
</a>
499498
</li>
500499
<li class="">
501-
<a href="../extra/login.html" target="_blank">
500+
<a href="../extra/login.html" data-no-pjax>
502501
<i class="sidebar-icon logout-icon"></i>
503502
<span class="icon-text">Logout</span>
504503
</a>

‎dist/charts/easy_pie.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</a>
258258
</li>
259259
<li role="presentation">
260-
<a role="menuitem" target="_self" href="#" class="dropdown-item">
260+
<a role="menuitem" target="_self" href="../other/profile.html" class="dropdown-item">
261261
<span class="mr-3">
262262
<i class="sidebar-icon profile"></i>
263263
</span>
@@ -475,7 +475,7 @@ <h5 class="sidebar-nav-title">Template </h5>
475475
<ul id="sidebar-extra" class="collapse ">
476476
<li class=""><a href="../extra/calendar.html" data-no-pjax >Calendar</a></li>
477477
<li class=""><a href="../extra/invoice.html">Invoice</a></li>
478-
<li class=""><a href="../extra/login.html" target="_blank">Login Page</a></li>
478+
<li class=""><a href="../extra/login.html" data-no-pjax>Login Page</a></li>
479479
<li class=""><a href="../extra/gallery.html">Gallery</a></li>
480480
<li class=""><a href="../extra/search.html">Search Results</a></li>
481481
<li class=""><a href="../extra/time_line.html">Time Line</a></li>
@@ -488,17 +488,16 @@ <h5 class="sidebar-nav-title">Template </h5>
488488
<a href="#">
489489
<i class="sidebar-icon settings-icon"></i>
490490
<span class="icon-text">Settings</span>
491-
492491
</a>
493492
</li>
494493
<li class="">
495-
<a href="#">
494+
<a href="../other/profile.html">
496495
<i class="sidebar-icon account-icon"></i>
497496
<span class="icon-text">Account</span>
498497
</a>
499498
</li>
500499
<li class="">
501-
<a href="../extra/login.html" target="_blank">
500+
<a href="../extra/login.html" data-no-pjax>
502501
<i class="sidebar-icon logout-icon"></i>
503502
<span class="icon-text">Logout</span>
504503
</a>

‎dist/charts/flot.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</a>
258258
</li>
259259
<li role="presentation">
260-
<a role="menuitem" target="_self" href="#" class="dropdown-item">
260+
<a role="menuitem" target="_self" href="../other/profile.html" class="dropdown-item">
261261
<span class="mr-3">
262262
<i class="sidebar-icon profile"></i>
263263
</span>
@@ -475,7 +475,7 @@ <h5 class="sidebar-nav-title">Template </h5>
475475
<ul id="sidebar-extra" class="collapse ">
476476
<li class=""><a href="../extra/calendar.html" data-no-pjax >Calendar</a></li>
477477
<li class=""><a href="../extra/invoice.html">Invoice</a></li>
478-
<li class=""><a href="../extra/login.html" target="_blank">Login Page</a></li>
478+
<li class=""><a href="../extra/login.html" data-no-pjax>Login Page</a></li>
479479
<li class=""><a href="../extra/gallery.html">Gallery</a></li>
480480
<li class=""><a href="../extra/search.html">Search Results</a></li>
481481
<li class=""><a href="../extra/time_line.html">Time Line</a></li>
@@ -488,17 +488,16 @@ <h5 class="sidebar-nav-title">Template </h5>
488488
<a href="#">
489489
<i class="sidebar-icon settings-icon"></i>
490490
<span class="icon-text">Settings</span>
491-
492491
</a>
493492
</li>
494493
<li class="">
495-
<a href="#">
494+
<a href="../other/profile.html">
496495
<i class="sidebar-icon account-icon"></i>
497496
<span class="icon-text">Account</span>
498497
</a>
499498
</li>
500499
<li class="">
501-
<a href="../extra/login.html" target="_blank">
500+
<a href="../extra/login.html" data-no-pjax>
502501
<i class="sidebar-icon logout-icon"></i>
503502
<span class="icon-text">Logout</span>
504503
</a>

‎dist/charts/morris.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</a>
258258
</li>
259259
<li role="presentation">
260-
<a role="menuitem" target="_self" href="#" class="dropdown-item">
260+
<a role="menuitem" target="_self" href="../other/profile.html" class="dropdown-item">
261261
<span class="mr-3">
262262
<i class="sidebar-icon profile"></i>
263263
</span>
@@ -475,7 +475,7 @@ <h5 class="sidebar-nav-title">Template </h5>
475475
<ul id="sidebar-extra" class="collapse ">
476476
<li class=""><a href="../extra/calendar.html" data-no-pjax >Calendar</a></li>
477477
<li class=""><a href="../extra/invoice.html">Invoice</a></li>
478-
<li class=""><a href="../extra/login.html" target="_blank">Login Page</a></li>
478+
<li class=""><a href="../extra/login.html" data-no-pjax>Login Page</a></li>
479479
<li class=""><a href="../extra/gallery.html">Gallery</a></li>
480480
<li class=""><a href="../extra/search.html">Search Results</a></li>
481481
<li class=""><a href="../extra/time_line.html">Time Line</a></li>
@@ -488,17 +488,16 @@ <h5 class="sidebar-nav-title">Template </h5>
488488
<a href="#">
489489
<i class="sidebar-icon settings-icon"></i>
490490
<span class="icon-text">Settings</span>
491-
492491
</a>
493492
</li>
494493
<li class="">
495-
<a href="#">
494+
<a href="../other/profile.html">
496495
<i class="sidebar-icon account-icon"></i>
497496
<span class="icon-text">Account</span>
498497
</a>
499498
</li>
500499
<li class="">
501-
<a href="../extra/login.html" target="_blank">
500+
<a href="../extra/login.html" data-no-pjax>
502501
<i class="sidebar-icon logout-icon"></i>
503502
<span class="icon-text">Logout</span>
504503
</a>

‎dist/charts/rickshaw.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</a>
258258
</li>
259259
<li role="presentation">
260-
<a role="menuitem" target="_self" href="#" class="dropdown-item">
260+
<a role="menuitem" target="_self" href="../other/profile.html" class="dropdown-item">
261261
<span class="mr-3">
262262
<i class="sidebar-icon profile"></i>
263263
</span>
@@ -475,7 +475,7 @@ <h5 class="sidebar-nav-title">Template </h5>
475475
<ul id="sidebar-extra" class="collapse ">
476476
<li class=""><a href="../extra/calendar.html" data-no-pjax >Calendar</a></li>
477477
<li class=""><a href="../extra/invoice.html">Invoice</a></li>
478-
<li class=""><a href="../extra/login.html" target="_blank">Login Page</a></li>
478+
<li class=""><a href="../extra/login.html" data-no-pjax>Login Page</a></li>
479479
<li class=""><a href="../extra/gallery.html">Gallery</a></li>
480480
<li class=""><a href="../extra/search.html">Search Results</a></li>
481481
<li class=""><a href="../extra/time_line.html">Time Line</a></li>
@@ -488,17 +488,16 @@ <h5 class="sidebar-nav-title">Template </h5>
488488
<a href="#">
489489
<i class="sidebar-icon settings-icon"></i>
490490
<span class="icon-text">Settings</span>
491-
492491
</a>
493492
</li>
494493
<li class="">
495-
<a href="#">
494+
<a href="../other/profile.html">
496495
<i class="sidebar-icon account-icon"></i>
497496
<span class="icon-text">Account</span>
498497
</a>
499498
</li>
500499
<li class="">
501-
<a href="../extra/login.html" target="_blank">
500+
<a href="../extra/login.html" data-no-pjax>
502501
<i class="sidebar-icon logout-icon"></i>
503502
<span class="icon-text">Logout</span>
504503
</a>

‎dist/charts/sparkline.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</a>
258258
</li>
259259
<li role="presentation">
260-
<a role="menuitem" target="_self" href="#" class="dropdown-item">
260+
<a role="menuitem" target="_self" href="../other/profile.html" class="dropdown-item">
261261
<span class="mr-3">
262262
<i class="sidebar-icon profile"></i>
263263
</span>
@@ -475,7 +475,7 @@ <h5 class="sidebar-nav-title">Template </h5>
475475
<ul id="sidebar-extra" class="collapse ">
476476
<li class=""><a href="../extra/calendar.html" data-no-pjax >Calendar</a></li>
477477
<li class=""><a href="../extra/invoice.html">Invoice</a></li>
478-
<li class=""><a href="../extra/login.html" target="_blank">Login Page</a></li>
478+
<li class=""><a href="../extra/login.html" data-no-pjax>Login Page</a></li>
479479
<li class=""><a href="../extra/gallery.html">Gallery</a></li>
480480
<li class=""><a href="../extra/search.html">Search Results</a></li>
481481
<li class=""><a href="../extra/time_line.html">Time Line</a></li>
@@ -488,17 +488,16 @@ <h5 class="sidebar-nav-title">Template </h5>
488488
<a href="#">
489489
<i class="sidebar-icon settings-icon"></i>
490490
<span class="icon-text">Settings</span>
491-
492491
</a>
493492
</li>
494493
<li class="">
495-
<a href="#">
494+
<a href="../other/profile.html">
496495
<i class="sidebar-icon account-icon"></i>
497496
<span class="icon-text">Account</span>
498497
</a>
499498
</li>
500499
<li class="">
501-
<a href="../extra/login.html" target="_blank">
500+
<a href="../extra/login.html" data-no-pjax>
502501
<i class="sidebar-icon logout-icon"></i>
503502
<span class="icon-text">Logout</span>
504503
</a>

‎dist/components/ui_alerts.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</a>
258258
</li>
259259
<li role="presentation">
260-
<a role="menuitem" target="_self" href="#" class="dropdown-item">
260+
<a role="menuitem" target="_self" href="../other/profile.html" class="dropdown-item">
261261
<span class="mr-3">
262262
<i class="sidebar-icon profile"></i>
263263
</span>
@@ -475,7 +475,7 @@ <h5 class="sidebar-nav-title">Template </h5>
475475
<ul id="sidebar-extra" class="collapse ">
476476
<li class=""><a href="../extra/calendar.html" data-no-pjax >Calendar</a></li>
477477
<li class=""><a href="../extra/invoice.html">Invoice</a></li>
478-
<li class=""><a href="../extra/login.html" target="_blank">Login Page</a></li>
478+
<li class=""><a href="../extra/login.html" data-no-pjax>Login Page</a></li>
479479
<li class=""><a href="../extra/gallery.html">Gallery</a></li>
480480
<li class=""><a href="../extra/search.html">Search Results</a></li>
481481
<li class=""><a href="../extra/time_line.html">Time Line</a></li>
@@ -488,17 +488,16 @@ <h5 class="sidebar-nav-title">Template </h5>
488488
<a href="#">
489489
<i class="sidebar-icon settings-icon"></i>
490490
<span class="icon-text">Settings</span>
491-
492491
</a>
493492
</li>
494493
<li class="">
495-
<a href="#">
494+
<a href="../other/profile.html">
496495
<i class="sidebar-icon account-icon"></i>
497496
<span class="icon-text">Account</span>
498497
</a>
499498
</li>
500499
<li class="">
501-
<a href="../extra/login.html" target="_blank">
500+
<a href="../extra/login.html" data-no-pjax>
502501
<i class="sidebar-icon logout-icon"></i>
503502
<span class="icon-text">Logout</span>
504503
</a>

‎dist/components/ui_badge.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</a>
258258
</li>
259259
<li role="presentation">
260-
<a role="menuitem" target="_self" href="#" class="dropdown-item">
260+
<a role="menuitem" target="_self" href="../other/profile.html" class="dropdown-item">
261261
<span class="mr-3">
262262
<i class="sidebar-icon profile"></i>
263263
</span>
@@ -475,7 +475,7 @@ <h5 class="sidebar-nav-title">Template </h5>
475475
<ul id="sidebar-extra" class="collapse ">
476476
<li class=""><a href="../extra/calendar.html" data-no-pjax >Calendar</a></li>
477477
<li class=""><a href="../extra/invoice.html">Invoice</a></li>
478-
<li class=""><a href="../extra/login.html" target="_blank">Login Page</a></li>
478+
<li class=""><a href="../extra/login.html" data-no-pjax>Login Page</a></li>
479479
<li class=""><a href="../extra/gallery.html">Gallery</a></li>
480480
<li class=""><a href="../extra/search.html">Search Results</a></li>
481481
<li class=""><a href="../extra/time_line.html">Time Line</a></li>
@@ -488,17 +488,16 @@ <h5 class="sidebar-nav-title">Template </h5>
488488
<a href="#">
489489
<i class="sidebar-icon settings-icon"></i>
490490
<span class="icon-text">Settings</span>
491-
492491
</a>
493492
</li>
494493
<li class="">
495-
<a href="#">
494+
<a href="../other/profile.html">
496495
<i class="sidebar-icon account-icon"></i>
497496
<span class="icon-text">Account</span>
498497
</a>
499498
</li>
500499
<li class="">
501-
<a href="../extra/login.html" target="_blank">
500+
<a href="../extra/login.html" data-no-pjax>
502501
<i class="sidebar-icon logout-icon"></i>
503502
<span class="icon-text">Logout</span>
504503
</a>

0 commit comments

Comments
 (0)