wvengen
|
e42e27957d
|
improve task i18n (affects foodcoops#137)
|
2013-12-10 17:58:32 +01:00 |
|
wvengen
|
66ac3be81f
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
|
2013-11-18 11:42:49 +01:00 |
|
wvengen
|
de948d7692
|
fix and cleanup routing (closes foodcoops#190)
|
2013-10-30 02:27:04 +01:00 |
|
wvengen
|
c37ed74942
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/foodcoop/users/_users.html.haml
|
2013-10-29 19:15:52 +01:00 |
|
wvengen
|
e968919cce
|
beautify map invocations of users
|
2013-10-29 18:46:55 +01:00 |
|
wvengen
|
552af7925d
|
i18n simple_form move of tasks
|
2013-10-09 22:41:23 +02:00 |
|
wvengen
|
a9dff7f1df
|
add missing i18n
|
2013-10-04 10:25:53 +02:00 |
|
wvengen
|
12c0636941
|
fix i18n buglets (closes #167)
|
2013-09-10 10:27:13 +02:00 |
|
Robert Waltemath
|
e5d790021c
|
Add repeated symbol to task list.
|
2013-06-27 10:22:22 +02:00 |
|
Robert Waltemath
|
c27127c745
|
Added i18n strings.
|
2013-06-24 11:53:52 +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
|
990397a7f0
|
Delete only the FOLLOWING tasks.
|
2013-06-21 22:04:36 +02:00 |
|
Robert Waltemath
|
c52e482743
|
Exclude tasks from groups when changing attributes.
|
2013-06-21 20:54:24 +02:00 |
|
Robert Waltemath
|
6b62fc90d8
|
Now creating periodic task via button
|
2013-06-21 13:48:48 +02:00 |
|
Robert Waltemath
|
4037ef12da
|
Users may delete all tasks of a group, i.e. delete the whole group.
|
2013-06-12 12:02:13 +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 |
|
wvengen
|
1a8c8537a4
|
finish tasks i18n
|
2013-04-12 00:00:02 +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
|
d954279d6a
|
Show accept/reject button in task show view.
|
2012-12-22 14:29:59 +01:00 |
|
benni
|
0dff5ea784
|
Fixed some bugs in tasks, apple feature:
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
|
2012-12-16 19:07:45 +01:00 |
|
Robert Waltemath
|
1cdb9e8501
|
Outlined new concept for multiple periodically recurring tasks (#3).
|
2012-11-28 10:13:54 +01:00 |
|
benni
|
f4f10b1e4c
|
Introduced actionbar. Some fixes for balancing page.
|
2012-11-12 13:13:01 +01:00 |
|
benni
|
1d9815731c
|
Removed fancybox. Fixed profile, my ordergroup and tasks.
|
2012-11-12 09:18:44 +01:00 |
|
benni
|
552c553b77
|
Fixed admin, orders, wiki views. Converted all erb to haml.
|
2012-10-15 21:19:17 +02:00 |
|
benni
|
acdb331e36
|
Improved tasks.
|
2012-10-08 21:52:03 +02:00 |
|
benni
|
5fb0bc2444
|
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
|
2012-08-24 11:11:40 +02:00 |
|
benni
|
fc8418bc8e
|
Some fixes in group forms.
|
2012-07-31 18:48:41 +02:00 |
|
benni
|
6c98c7c755
|
Some fixes for task module.
|
2011-05-15 22:06:54 +02:00 |
|
benni
|
5d028ccf3a
|
Added new autocomplete for task assignments.
Introduced the cool jquery token plugin.
|
2011-05-14 19:41:46 +02:00 |
|
benni
|
2e56bfe895
|
Some fixes for tasks.
|
2011-05-14 19:02:52 +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 |
|
Benjamin Meichsner
|
be321798a7
|
Fixed some links in tasks module.
|
2010-06-10 23:25:13 +02:00 |
|
Benjamin Meichsner
|
0e4b6107ba
|
Fixed wrong path in task form.
|
2010-06-10 12:55:06 +02:00 |
|
Benjamin Meichsner
|
74407a5912
|
Fixed paths in task-menu.
|
2010-06-01 16:18:20 +02:00 |
|
Benjamin Meichsner
|
2c1952d625
|
Removed hardcoded links from main tabnav.
* Reorganized routes and foodsoft config
* Avoid saving of wrong foodcoop tokens when following hard coded link
|
2010-03-20 13:45:58 +01:00 |
|
Benjamin Meichsner
|
cf9fa69ac2
|
Minor improvements to task show view.
|
2009-10-16 21:06:55 +02:00 |
|
Benjamin Meichsner
|
d0e04a05ec
|
Removed unecessary weekly task templates.
|
2009-10-16 20:45:20 +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
|
ce375e1637
|
Fixed bad link in tasks/workgroups. Closes #23
|
2009-08-04 12:57:19 +02:00 |
|
Benjamin Meichsner
|
759217763e
|
Added pagination to task archiv.
|
2009-03-23 11:23:41 +01:00 |
|
Benjamin Meichsner
|
f018db5b15
|
Translated tasks/workgroup page.
|
2009-03-23 11:08:56 +01:00 |
|
Benjamin Meichsner
|
a0e10141dc
|
Translations and other little improvements.
|
2009-02-12 21:38:41 +01:00 |
|
Benjamin Meichsner
|
96442477d1
|
Fixed broken links in tasks-module. Translated some views into german.
|
2009-02-06 20:51:14 +01:00 |
|
Benjamin Meichsner
|
6ce6c2c75a
|
Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace).
|
2009-01-15 12:14:01 +01:00 |
|
Benjamin Meichsner
|
fadc951208
|
Second part of admin-namespace-reorder. Also renamed OrderGroup into Ordergroup. More view-sharing between groups is neccessary.
|
2009-01-14 12:46:01 +01:00 |
|
Benjamin Meichsner
|
5b9a7e05df
|
Initial commit of foodsoft 2
|
2009-01-06 11:49:19 +01:00 |
|