wvengen
|
74bfc85562
|
Merge remote-tracking branch 'fsmanuel/master' into master.
Updated migration date to today.
Conflicts:
db/schema.rb
|
2013-07-18 18:48:49 +02:00 |
Robert Waltemath
|
a7fd7a7936
|
Removed obsolete code of old workgroup-centric weekly task concept.
|
2013-06-22 18:14:11 +02:00 |
|
Robert Waltemath
|
46b07a6136
|
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks
Conflicts:
config/locales/de.yml
|
2013-06-12 10:00:11 +02:00 |
Manuel Wiedenmann
|
60c4c5510a
|
adds a new user settings system + migration + rake task/worker updates
|
2013-06-06 03:40:15 +02:00 |
|
Manuel Wiedenmann
|
21c7fa40c1
|
adds a foodsoft:setup_development rake task
|
2013-05-26 14:02:16 +02:00 |
|
Robert Waltemath
|
981944b869
|
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
Conflicts:
Gemfile
db/schema.rb
|
2013-03-15 17:59:19 +01:00 |
benni
|
620ec946f1
|
Merge branch 'master' into master-rails3-merging
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
|
2012-12-11 10:32:59 +01:00 |
|
Robert Waltemath
|
1cdb9e8501
|
Outlined new concept for multiple periodically recurring tasks (#3).
|
2012-11-28 10:13:54 +01:00 |
|
benni
|
971e80b505
|
Fixed foodsoft rake tasks.
|
2012-08-27 08:38:43 +02:00 |
|
benni
|
af3875d46b
|
Refactored order finishing. Delay user notifications.
|
2012-08-24 14:24:36 +02:00 |
|
benni
|
524d9b7c7a
|
Fixed rake task to create weekly tasks.
|
2012-06-26 23:18:55 +02:00 |
|
benni
|
182742fbec
|
Merge branch 'master' into rails3
Conflicts:
.gitignore
app/models/task.rb
app/models/workgroup.rb
app/views/shared/_group_form.html.haml
config/locales/de.yml
db/schema.rb
|
2012-06-26 11:51:56 +02:00 |
|
benni
|
7d54a416df
|
Allow changing number of automaticly created next weekly tasks.
|
2012-06-24 11:01:16 +02:00 |
|
benni
|
2d7d0d3b94
|
Updated actionmailer classes and API.
|
2011-05-11 10:54:02 +02:00 |
|
benni
|
1e49a44a92
|
Added seeds.rb for an easy start.
|
2011-05-06 20:23:33 +02:00 |
Benjamin Meichsner
|
84699a9052
|
Avoid task exit when deliver with bad emails addresses.
|
2010-03-20 23:07:55 +01:00 |
|
Benjamin Meichsner
|
55d2976e98
|
Moved order stats and cleanup stuff into rake task.
Closes #14
|
2010-02-09 21:45:57 +01:00 |
Benjamin Meichsner
|
4ba612aa5b
|
Fixed bug in new rake task.
|
2009-08-14 13:50:05 +02:00 |
|
Benjamin Meichsner
|
332fc831c8
|
Send warn messages for unassigned tasks 7 days before due date.
|
2009-08-12 21:47:07 +02:00 |
|
Benjamin Meichsner
|
58ce422ef7
|
Reduced number of generated weekly tasks.
|
2009-08-11 18:39:21 +02:00 |
|
Benjamin Meichsner
|
49be55238b
|
Added rake task to notify workgroup members if not enough users assigned an upcoming task.
|
2009-08-11 18:10:14 +02:00 |
|
Benjamin Meichsner
|
d8cdbe4abb
|
Added rake task for auto create of upcoming workgroup tasks (weekly tasks).
|
2009-08-11 17:22:08 +02:00 |
|
Benjamin Meichsner
|
ce2156d75f
|
Send order-finish-notifications in background.
|
2009-03-11 16:58:31 +01:00 |
|
Benjamin Meichsner
|
3ea8d5a2ef
|
Refactoring of message system.
|
2009-02-18 01:06:35 +01:00 |
|
Benjamin Meichsner
|
67743cd014
|
Implement notification for upcoming tasks via a daily fired rake-task.
|
2009-02-10 15:07:47 +01:00 |
|
Benjamin Meichsner
|
e16bebd042
|
Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'.
|
2009-02-01 20:56:23 +01:00 |
|
Benjamin Meichsner
|
5b9a7e05df
|
Initial commit of foodsoft 2
|
2009-01-06 11:49:19 +01:00 |