diff --git a/README.md b/README.md index 612c4091d..683411485 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ Browse [lots more notable Discourse instances](http://www.discourse.org/faq/cust ## Development -1. If you're **brand new to Ruby and Rails**, please see [**Discourse as Your First Rails App**](http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/) or our [**Discourse Vagrant Developer Guide**](docs/VAGRANT.md), which includes a development environment in a virtual machine. +1. If you're **brand new to Ruby and Rails**, please see [**Discourse as Your First Rails App**](http://blog.discourse.org/2013/04/discourse-as-your-first-rails-app/) or our [**Discourse Vagrant Developer Guide**](docs/VAGRANT.md), which includes a development environment in a virtual machine. -2. If you're familiar with how Rails works and are comfortable setting up your own environment, use our [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md). +2. If you're familiar with how Rails works and are comfortable setting up your own environment, use our [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md). Before you get started, ensure you have the following minimum versions: [Ruby 2.0.0+](http://www.ruby-lang.org/en/downloads/), [PostgreSQL 9.3+](http://www.postgresql.org/download/), [Redis 2.6+](http://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first! @@ -40,13 +40,11 @@ Discourse is built for the *next* 10 years of the Internet, so our requirements | Browsers | Tablets | Smartphones | | -------- | ------- | ----------- | -| Safari 5.1+| iPad 2+ | iOS 7+ | +| Safari 5.1+| iPad 2+ | iOS 7+ | | Google Chrome 23+ | Android 4.1+ | Android 4.1+ | | Internet Explorer 10+ | Windows 8 | Windows Phone 8 | | Firefox 16+ | | -Internet Explorer 9.0 will no longer be supported in 2016. - ## Built With - [Ruby on Rails](https://github.com/rails/rails) — Our back end API is a Rails app. It responds to requests RESTfully in JSON. diff --git a/app/assets/javascripts/discourse/initializers/ie9-hax.js.es6 b/app/assets/javascripts/discourse/initializers/ie9-hax.js.es6 deleted file mode 100644 index 4c124aac0..000000000 --- a/app/assets/javascripts/discourse/initializers/ie9-hax.js.es6 +++ /dev/null @@ -1,10 +0,0 @@ -export default { - name: 'ie9-hacks', - initialize: function() { - if (!window) { return; } - - // IE9 does not support a console object unless the developer tools are open - if (!window.console) { window.console = {}; } - if (!window.console.log) { window.console.log = Ember.K; } - } -}; diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6 index 4969c0872..94633e1bc 100644 --- a/app/assets/javascripts/discourse/routes/discourse.js.es6 +++ b/app/assets/javascripts/discourse/routes/discourse.js.es6 @@ -89,7 +89,7 @@ export function cleanDOM() { // Remove any link focus // NOTE: the '.not("body")' is here to prevent a bug in IE10 on Win7 - // cf. https://stackoverflow.com/questions/5657371/ie9-window-loses-focus-due-to-jquery-mobile + // cf. https://stackoverflow.com/questions/5657371 $(document.activeElement).not("body").not(".no-blur").blur(); Discourse.set('notifyCount',0); diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss index 55b15a9b5..f9c3ca2a5 100644 --- a/app/assets/stylesheets/common/foundation/mixins.scss +++ b/app/assets/stylesheets/common/foundation/mixins.scss @@ -101,15 +101,8 @@ background-color: blend-primary-secondary(5%); } -// We definately need -webkit for latest iPhone and Safari -// When we deprecate IE9 we should clean up just to have webkit and non prefixed -// ms is left around for ie9 -// moz is for firefox 15 (do we even work with that?) -// -o would be for opera 11.5 +// We still need -webkit for latest iPhone and Safari @mixin transform($transforms) { - -o-transform: $transforms; - -moz-transform: $transforms; - -ms-transform: $transforms; -webkit-transform: $transforms; - transform: $transforms; + transform: $transforms; } diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index b4dd08904..6edf84153 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -109,9 +109,6 @@ width: calc(50% - 65px); } -// hide cancel upload link on IE9 (not supported) -.ie9 #cancel-file-upload { display: none; } - // only disabled when the device is touch-only .touch.mobile-device #reply-control.open .grippie { display: none; diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 047283b44..65be0cea9 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -9,9 +9,6 @@ class UploadsController < ApplicationController client_id = params[:client_id] synchronous = is_api? && params[:synchronous] - # HACK FOR IE9 to prevent the "download dialog" - response.headers["Content-Type"] = "text/plain" if request.user_agent =~ /MSIE 9/ - if type == "avatar" if SiteSetting.sso_overrides_avatar || !SiteSetting.allow_uploaded_avatars return render json: failed_json, status: 422 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8a5d7c7ca..fb45a9b9d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,6 +1,5 @@ - - + <%= content_for?(:title) ? yield(:title) + ' - ' + SiteSetting.title : SiteSetting.title %> @@ -60,8 +59,6 @@ - - <%- unless customization_disabled? || loading_admin? %> <%= SiteCustomization.custom_header(session[:preview_style], mobile_view? ? :mobile : :desktop) %> <%- end %> diff --git a/plugins/discourse-details/README.md b/plugins/discourse-details/README.md index afebd4f1a..8018a66b8 100644 --- a/plugins/discourse-details/README.md +++ b/plugins/discourse-details/README.md @@ -2,7 +2,7 @@ HTML 5.1 `
` polyfill for [Discourse](https://www.discourse.org). -NOTE: Does not work on IE9. +NOTE: Does not work on IE9, but we don't support IE9 as of Jan 1 2016. ## Usage diff --git a/vendor/assets/javascripts/browser-update.js.erb b/vendor/assets/javascripts/browser-update.js.erb index ef9d05b31..918c6f775 100644 --- a/vendor/assets/javascripts/browser-update.js.erb +++ b/vendor/assets/javascripts/browser-update.js.erb @@ -17,7 +17,7 @@ var $buo = function() { badAndroid = true; } - // sam: my main concern here is mobile, but its an outlier, for now we support ie9, set conditionally and stuff with pushState + // sam: my main concern here is mobile, but its an outlier, for now we support ie10, set conditionally and stuff with pushState if (window.ie === "new" || (window.history && window.history.pushState && !badAndroid)) { return; } @@ -62,4 +62,4 @@ var $buo = function() { $bu=$buo(); -})(this); \ No newline at end of file +})(this);