diff --git a/CHANGES.markdown b/CHANGES.markdown index f15945b..3e8909b 100755 --- a/CHANGES.markdown +++ b/CHANGES.markdown @@ -1,5 +1,11 @@ ## Changes +#### 0.9.0 + + * switch to Rails 3.2.x + * Tweeter Bootstrap as default theme + * many fixes + #### 0.8.6 * new calendar view diff --git a/Gemfile b/Gemfile index 09b19af..3d19c66 100755 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.3' +gem 'rails', '~> 3.2.1' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 48b2f3a..c0ff36a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,7 +117,7 @@ DEPENDENCIES jquery-rails json mysql2 - rails (= 3.2.3) + rails (~> 3.2.1) sass sass-rails (~> 3.2.3) uglifier (>= 1.0.3) diff --git a/README.markdown b/README.markdown index 6f8c24f..d02c1df 100755 --- a/README.markdown +++ b/README.markdown @@ -1,7 +1,5 @@ [![Dependency Status](https://gemnasium.com/musashimm/mailr.png?travis)](https://gemnasium.com/musashimm/mailr) -**NOTE** The last stable version is 0.8.6. Now I try to moved code to Rails 3.2.3 and add Boostrap from Tweeter as default theme. - ## Introduction _MailR_ is a IMAP mail client based on _Ruby on Rails_ platform. @@ -9,7 +7,7 @@ _MailR_ is a IMAP mail client based on _Ruby on Rails_ platform. ## Requirements -In _Rails 3_ all dependencies should be defined in file _Gemfile_. All needed gems can be installed using bundler. +In _Rails 3_ and above all dependencies should be defined in file _Gemfile_. All needed gems can be installed using bundler. ## Installation procedure @@ -20,7 +18,7 @@ In _Rails 3_ all dependencies should be defined in file _Gemfile_. All needed ge bundle install ``` -* Check _config/defaults.yml_ for proper values. +* Check _config/settings.yml_ for proper values. (see _config/settings.yml.example_). * Prepare config/database.yml file (see _config/database.yml.example_). * Migrate database (rake db:migrate) * Start rails server if applicable @@ -37,10 +35,4 @@ rake db:clear_data ## Specific configuration -For themes: if server sends files with no content in production mode comment out - -```ruby -config.action_dispatch.x_sendfile_header = "X-Sendfile" -``` - -in _config/environments/production.rb_ file. +None diff --git a/TODO.markdown b/TODO.markdown index 2979b2d..f1d3348 100755 --- a/TODO.markdown +++ b/TODO.markdown @@ -1,9 +1,11 @@ ## Todo + * add themes + app/controllers/folders_controller.rb: - * [ 30] [TODO] recreate local copy of folders - * [ 99] [TODO] save system folders + * [ 29] [TODO] recreate local copy of folders + * [ 98] [TODO] save system folders app/controllers/messages_controller.rb: @@ -11,10 +13,9 @@ app/controllers/messages_controller.rb: app/controllers/messages_ops_controller.rb: - * [249] [FIXME] edit does not support attachments - * [304] [TODO] check if email address is valid if not get address from contacts + * [261] [FIXME] edit does not support attachments + * [325] [TODO] check if email address is valid if not get address from contacts app/models/prefs.rb: - * [ 19] [TODO] move refresh to prefs and make refresh page with messages - + * [ 21] [TODO] move refresh to prefs and make refresh page with messages diff --git a/config/settings.yml.example b/config/settings.yml.example index 476e21f..3b1c759 100755 --- a/config/settings.yml.example +++ b/config/settings.yml.example @@ -1,4 +1,4 @@ -version: 0.9 +version: 0.9.0 theme: olive locale: pl