Merge branch 'hotfix-branches'

Indicia-Team · Jun 24, 2018 · b32ba81 · b32ba81
2 parents 4ec5054 + 3f9f7f5
commit b32ba81
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -31,7 +31,7 @@
  *
  * @var string
  */
-$config['version'] = '1.60.1';
+$config['version'] = '1.60.2';
 /**
  * Version release date.
  *

diff --git a/client_helpers b/client_helpers
diff --git a/media b/media
+10 −1		css/default_site.css
+91 −0		css/forms.css
+0 −7		css/jquery-ui.min.css
+117 −0		css/menus.css
+392 −0		css/site.css
+0 −55		css/theme-bootstrap-3.css
+2 −2		css/theme-bootstrap-3.css.map
+0 −52		css/theme-generic.css
+2 −2		css/theme-generic.css.map
+0 −98		css/warehouse.css
+0 −7		css/warehouse.css.map
+ −		images/banner.png
+ −		images/indicia-logo.png
+ −		images/indicia_logo.png
+ −		images/warehouse-banner.jpg
+205 −189		js/addRowToGrid.js
+333 −0		js/additional-methods.js
+0 −4		js/additional-methods.min.js
+0 −58		js/indicia.additional-methods.js
+0 −14		js/indicia.functions.js
+0 −286		js/indicia.widgets.js
+298 −0		js/jquery-ui.custom.min.js
+22 −0		js/jquery-ui.effects.js
+0 −13		js/jquery-ui.min.js
+116 −0		js/jquery.ajaxQueue.js
+894 −0		js/jquery.autocomplete.js
+10 −0		js/jquery.bgiframe.min.js
+9,404 −4		js/jquery.js
+120 −0		js/jquery.metadata.js
+9 −80		js/jquery.reportgrid.js
+1,200 −0		js/jquery.validate.js
+51 −4		js/jquery.validate.min.js
+1 −1		js/reportFilters.js
+121 −0		js/superfish.js
+6 −6		js/verification.js
+0 −10		scss/bootstrap-3/_form-controls.scss
+0 −5		scss/bootstrap-3/_reports.scss
+0 −18		scss/common/_autocomplete.scss
+0 −38		scss/common/_media-info.scss
+1 −3		scss/common/_variables.scss
+0 −11		scss/generic/_form-controls.scss
+1 −5		scss/theme-bootstrap-3.scss
+1 −3		scss/theme-generic.scss
+0 −10		scss/warehouse-components/_attributes-by-survey-edit.scss
+0 −77		scss/warehouse-components/_attributes-by-survey-index.scss
+0 −8		scss/warehouse-components/_metadata.scss
+0 −27		scss/warehouse-components/_page.scss
+0 −4		scss/warehouse-components/_reports.scss
+0 −2		scss/warehouse-components/_variables.scss
+0 −6		scss/warehouse.scss
+ −		themes/default/images/Thumbs.db
+ −		themes/default/images/ui-bg_flat_0_aaaaaa_40x100.png
+ −		themes/default/images/ui-bg_flat_75_ffffff_40x100.png
+ −		themes/default/images/ui-bg_glass_55_f6ecb6_1x400.png
+ −		themes/default/images/ui-bg_glass_65_ffffff_1x400.png
+ −		themes/default/images/ui-bg_glass_75_dadada_1x400.png
+ −		themes/default/images/ui-bg_glass_75_e6e6e6_1x400.png
+ −		themes/default/images/ui-bg_highlight-hard_75_a1d3ca_1x100.png
+ −		themes/default/images/ui-bg_inset-soft_95_fef1ec_1x100.png
+ −		themes/default/images/ui-icons_222222_256x240.png
+ −		themes/default/images/ui-icons_2e83ff_256x240.png
+ −		themes/default/images/ui-icons_444444_256x240.png
+ −		themes/default/images/ui-icons_454545_256x240.png
+ −		themes/default/images/ui-icons_555555_256x240.png
+ −		themes/default/images/ui-icons_777620_256x240.png
+ −		themes/default/images/ui-icons_777777_256x240.png
+ −		themes/default/images/ui-icons_888888_256x240.png
+ −		themes/default/images/ui-icons_cc0000_256x240.png
+ −		themes/default/images/ui-icons_cd0a0a_256x240.png
+ −		themes/default/images/ui-icons_ffffff_256x240.png
+406 −0		themes/default/jquery-ui.custom.css
+0 −5		themes/default/jquery-ui.theme.min.css