Merge branch 'development'

nilsteampassnet · Dec 11, 2017 · 7f298a3 · 7f298a3
2 parents bbacd45 + 0dd3763
commit 7f298a3
Show file tree

Hide file tree

Showing 56 changed files with 6 additions and 10,242 deletions.
diff --git a/changelog.md b/changelog.md
@@ -26,6 +26,7 @@
  Ensure session extension is always positive
  Added user group allowed for LDAP Windows AD
  Added option to remove the forgot password link on home page if LDAP enabled
+ #2056 Custom Fields - displayed in unassigned folders
  #2054 Alter table statement is run only once
  #2053 Custom Fields - folders unchecked at second call up
  #2051 2FA Google Name Displayed field not saving to configuration

diff --git a/install/css/install.css b/install/css/install.css
diff --git a/install/css/overcast/images/animated-overlay.gif b/install/css/overcast/images/animated-overlay.gif
diff --git a/install/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png b/install/css/overcast/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/install/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png b/install/css/overcast/images/ui-bg_flat_0_eeeeee_40x100.png
diff --git a/install/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png b/install/css/overcast/images/ui-bg_flat_55_c0402a_40x100.png
diff --git a/install/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png b/install/css/overcast/images/ui-bg_flat_55_eeeeee_40x100.png
diff --git a/install/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png b/install/css/overcast/images/ui-bg_glass_100_f8f8f8_1x400.png
diff --git a/install/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png b/install/css/overcast/images/ui-bg_glass_35_dddddd_1x400.png
diff --git a/install/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png b/install/css/overcast/images/ui-bg_glass_60_eeeeee_1x400.png
diff --git a/install/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png b/install/css/overcast/images/ui-bg_inset-hard_75_999999_1x100.png
diff --git a/install/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png b/install/css/overcast/images/ui-bg_inset-soft_50_c9c9c9_1x100.png
diff --git a/install/css/overcast/images/ui-icons_3383bb_256x240.png b/install/css/overcast/images/ui-icons_3383bb_256x240.png
diff --git a/install/css/overcast/images/ui-icons_454545_256x240.png b/install/css/overcast/images/ui-icons_454545_256x240.png
diff --git a/install/css/overcast/images/ui-icons_70b2e1_256x240.png b/install/css/overcast/images/ui-icons_70b2e1_256x240.png
diff --git a/install/css/overcast/images/ui-icons_999999_256x240.png b/install/css/overcast/images/ui-icons_999999_256x240.png
diff --git a/install/css/overcast/images/ui-icons_fbc856_256x240.png b/install/css/overcast/images/ui-icons_fbc856_256x240.png
diff --git a/install/css/overcast/jquery-ui-1.10.3.custom.min.css b/install/css/overcast/jquery-ui-1.10.3.custom.min.css
diff --git a/install/images/76.gif b/install/images/76.gif
diff --git a/install/images/ajax-loader.gif b/install/images/ajax-loader.gif
diff --git a/install/images/cross.png b/install/images/cross.png
diff --git a/install/images/error.png b/install/images/error.png
diff --git a/install/images/exclamation-red.png b/install/images/exclamation-red.png
diff --git a/install/images/information-white.png b/install/images/information-white.png
diff --git a/install/images/minus-circle.png b/install/images/minus-circle.png
diff --git a/install/images/tick-circle.png b/install/images/tick-circle.png
diff --git a/install/images/tick.png b/install/images/tick.png
diff --git a/install/install.css b/install/install.css