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
|
ad508b207b
|
Updated to rails 3.0.12. remove old gettext code.
|
2012-04-15 19:59:39 +02:00 |
|
benni
|
172db1d37e
|
Admin namespace beendet.
|
2011-06-10 13:22:15 +02:00 |
|
benni
|
46450cebef
|
New annotation, because of db switch to mysql.
Background: sqlite has some problems with decimal option.
|
2011-05-07 21:55:24 +02:00 |
|
benni
|
c2496aa4fd
|
Consider task duration in ordergroup stats.
* Also added duration to task template in workgroup task_duration.
|
2011-05-07 21:54:00 +02:00 |
|
benni
|
dcd2a514a6
|
Added duration to tasks. Annotated all models.
|
2011-05-07 20:50:39 +02:00 |
|
Benjamin Meichsner
|
e75a42d509
|
Merge branch 'wiki'
|
2009-08-15 17:24:08 +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
|
6659fe90f3
|
Merge branch 'stats'
|
2009-08-02 19:57:19 +02:00 |
|
Benjamin Meichsner
|
0d910dfbbd
|
Moved foodcoop/workgroups into new namespace foodcoop. Closes #20
|
2009-08-02 18:42:52 +02:00 |
|
Benjamin Meichsner
|
d848831fea
|
Implemented stats for ordergroups on startpage. Annotated models.
|
2009-08-01 13:41:22 +02:00 |
|
Benjamin Meichsner
|
0a2a79237a
|
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
|
2009-02-02 16:35:43 +01:00 |
|
Benjamin Meichsner
|
190a777278
|
Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.
|
2009-01-29 21:28:22 +01:00 |
|
Benjamin Meichsner
|
2d5dc03b90
|
Groups are now workgroups. First part of moving groups-logic into admin-namespace.
|
2009-01-13 19:01:56 +01:00 |
|