resetting develop/master so can continue working

Author: nutso

README.md

@@ -18,17 +18,20 @@ Released under GPLv2 in accordance with Redmine licensing.
   * Flexible: recurs only if the previous task was complete
 * View/Add/Edit/Delete issue recurrence permissions controlled via Redmine's native Roles and Permissions menu
 
+Note: recurrences depend on the date of the issue that is recurring (e.g. if you want it 
+to recur every 2nd Thursday of the month, the issue's first date should be a Thursday)
+
 ## Installation
 
 Follow standard Redmine plugin installation -- (barely) modified from http://www.redmine.org/projects/redmine/wiki/Plugins
 
-1. Copy or clone the plugin directory into #{RAILS_ROOT}/plugins/recurring_tasks
+1. Copy or clone the plugin directory into #{RAILS_ROOT}/plugins/recurring_tasks -- note the folder name 'recurring_tasks' must be verbatim.
 
    e.g. git clone https://github.com/nutso/redmine-plugin-recurring-tasks.git recurring_tasks
 
 2. Rake the database migration (make a db backup before)
 
-   e.g. rake redmine:plugins:migrate RAILS_ENV=production
+   e.g. bundle exec rake redmine:plugins:migrate RAILS_ENV=production
 
 3. Restart Redmine (or web server)
 
@@ -38,9 +41,9 @@ You should now be able to see the plugin list in Administration -> Plugins.
      
 1. Set the check for recurrence via Crontab.
 
-   Crontab example (running the check for recurrence every 6 hours):
+   Crontab example (running the check for recurrence every 6 hours on the 15s) -- replace {path_to_redmine} with your actual path, e.g. /var/www/redmine:
    ```bash
-   * */4 * * * /bin/sh "cd {path_to_redmine} && bundle exec rake RAILS_ENV=production redmine:recur_tasks" >> log/cron_rake.log 2>&1
+   15 */4 * * * /bin/sh "cd {path_to_redmine} && bundle exec rake RAILS_ENV=production redmine:recur_tasks" >> log/cron_rake.log 2>&1
    ```
 
 2. Decide which role(s) should have the ability to view/add/edit/delete issue recurrence and configure accordingly in Redmine's permission manager (Administration > Roles and Permissions) 
@@ -73,7 +76,7 @@ Follow standard Redmine plugin un-installation -- (barely) modified from http://
 
 1. Downgrade the database (make a db backup before)
 
-   rake redmine:plugins:migrate NAME=recurring_tasks VERSION=0 RAILS_ENV=production
+   bundle exec rake redmine:plugins:migrate NAME=recurring_tasks VERSION=0 RAILS_ENV=production
 
 2. Remove the plugin from the plugins folder (#{RAILS_ROOT}/plugins)
 

ReleaseNotes.md

@@ -16,11 +16,15 @@
 * Backwards-compatibility to Redmine 2.2 by testing if issue.closed_on? method exists ([#49](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/36))
 * Redmine 3.0 support contributed by @lammel ([#65](https://github.com/nutso/redmine-plugin-recurring-tasks/pull/65))
 * French translation updated by @jbeauvois ([#66](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/66)
+* Better documentation of plugin permissions
+* Reversible migrations so can uninstall fully ([#53](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/53))
+* Highlighting to user that adding recurrence via issues page is the best way ([#52](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/52))
 
 ## Version 1.4.0 (07 Sep 2014)
 
+* NOTE: Version number in 1.4.0 is incorrectly labelled as 1.3.0. ([#58](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/58))
 * French translation updated by @fidergo-stephane-gourichon ([#46](https://github.com/nutso/redmine-plugin-recurring-tasks/pull/46))
-* Recur on day x of every n months ([#26](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/26)) -- contributed by @cryptogopher ([#41](https://github.com/nutso/redmine-plugin-recurring-tasks/pull/41)); resolves ([#26](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/26))
+* Recur on day x of every n months ([#26](https://github.com/nutso/redmine-plugin-recurring-tasks/issues/26)) -- contributed by @cryptogopher ([#41](https://github.com/nutso/redmine-plugin-recurring-tasks/pull/41))
 
 ## Version 1.3.0 (01 Mar 2014)
 

app/views/recurring_tasks/index.html.erb

@@ -1,6 +1,6 @@
 <% if [email protected]? %>
   <div class="contextual">
-    <%= link_to(l(:label_add_recurring_task), {:action => 'new'}, :class => 'icon icon-add') %>
+    <%= link_to(l(:label_add_recurring_task), {:action => 'new'}, :class => 'icon icon-add', :title => l(:help_add_general_recurring_task)) %>
   </div>
 <% end %>
 

config/locales/en.yml

@@ -45,3 +45,5 @@ en:
   recurring_task_created: "Recurrence created. "
   recurring_task_saved: "Recurrence saved. "
   recurring_task_removed: "Recurrence removed. "
+  
+  help_add_general_recurring_task: "You may find it easier to add recurrence via the specific issue's page."

db/migrate/002_standardize_recurrence_units_nonlocalized.rb

@@ -24,7 +24,7 @@ def up
   # There is no guarantee that the current localized translation was the value
   # previously in the database.
   def down
-    # say "ActiveRecord::IrreversibleMigration"
-    raise ActiveRecord::IrreversibleMigration
+    logger.error ActiveRecord::IrreversibleMigration
+    say "Cannot roll back StandardizeRecurrenceUnitsNonlocalized database migration as it modified the data, not the structure."     
   end
 end

db/migrate/004_set_default_modifier_for_existing_monthly_issues.rb

@@ -18,6 +18,7 @@ def up
   # There is no rolling back - this is a change to the DATA in the database, 
   # not to the structure itself.
   def down
-    raise ActiveRecord::IrreversibleMigration
+    logger.error ActiveRecord::IrreversibleMigration
+    say "Cannot roll back SetDefaultModifierForExistingMonthlyIssues database migration as it modified the data, not the structure."     
   end
 end

init.rb

@@ -10,7 +10,7 @@
   author_url 'https://github.com/nutso/'
   url 'https://github.com/nutso/redmine-plugin-recurring-tasks'
   description 'Allows you to set a task to recur on a regular schedule, or when marked complete, regenerate a new task due in the future. Plugin is based -- very loosely -- on the periodic tasks plugin published by Tanguy de Courson'
-  version '1.3.0'
+  version '1.4.0'
 
   Redmine::MenuManager.map :top_menu do |menu|
     menu.push :recurring_tasks, { :controller => 'recurring_tasks', :action => 'index' }, :caption => :label_recurring_tasks, :if => Proc.new { User.current.admin? }