merge with august sprint for commission

2017-08-29 18:44:31 +06:30
parent 7c5db11df5 5fcfbdc020
commit 76fb16615d
26 changed files with 3377 additions and 788 deletions
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -6,6 +6,9 @@
@import "bootstrap-datepicker3";
@import "jquery.datetimepicker";
@import "dataTables/jquery.dataTables";
+@import "daterangepicker-bs3";
+@import "select2";
+@import "bootstrap-datetimepicker";

 /* Show it is fixed to the top */
 // body {
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -4,6 +4,8 @@
@import "jquery-ui";
@import "bootstrap-datepicker3";

+@import "jquery.datetimepicker";
+
 /* Show it is fixed to the top */
 // body {
 //   min-height: 75rem;