wvengen
|
6d3db7636a
|
make search work without nickname usage
|
2013-09-20 23:18:06 +02:00 |
|
wvengen
|
c38ce28347
|
fix i18n bug
|
2013-06-06 02:13:40 +02:00 |
|
wvengen
|
7af796c09c
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
|
2013-03-21 22:08:09 +01:00 |
|
Benjamin Meichsner
|
07581b7ecf
|
Removed acts_as_paranoid. Implemented own version.
|
2013-03-16 17:57:38 +01:00 |
|
Manuel Wiedenmann
|
6a564f0a25
|
admin controllers
|
2013-02-09 12:47:21 +07:00 |
|
benni
|
552c553b77
|
Fixed admin, orders, wiki views. Converted all erb to haml.
|
2012-10-15 21:19:17 +02:00 |
|
benni
|
29a6cd8b62
|
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
|
2012-09-30 21:15:55 +02:00 |
|
benni
|
fc8418bc8e
|
Some fixes in group forms.
|
2012-07-31 18:48:41 +02:00 |
|
benni
|
4a8e286d98
|
Fixed encoding issues with ruby > 1.9.2..
|
2012-04-16 08:49:54 +02:00 |
|
benni
|
9ad93e9c06
|
Catch exceptions when deleting ordegroups.
|
2011-06-10 13:33:10 +02:00 |
|
benni
|
172db1d37e
|
Admin namespace beendet.
|
2011-06-10 13:22:15 +02:00 |
|
benni
|
6ddef7267a
|
Refactored items_per_page. Start on admin/workgroups.
|
2011-06-10 12:18:55 +02:00 |
|
benni
|
c173cf4a6a
|
my_profile and admin/ordergroups.
|
2011-06-10 01:36:04 +02:00 |
|
benni
|
a787b3cf24
|
Admin/users refactored.
|
2011-06-09 22:03:27 +02:00 |
|
Benjamin Meichsner
|
571548dfbc
|
Fixed routing bug on (ex) admin controller.
|
2010-03-22 01:58:37 +01:00 |
|
Benjamin Meichsner
|
a0e10141dc
|
Translations and other little improvements.
|
2009-02-12 21:38:41 +01:00 |
|
Benjamin Meichsner
|
325d47b22f
|
Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.
|
2009-02-11 15:23:59 +01:00 |
|
Benjamin Meichsner
|
7f09bb55e4
|
Fixed some wrong links in admin-startpage and bugs in ordergroup-model.
|
2009-02-01 21:53:08 +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
|
2d5dc03b90
|
Groups are now workgroups. First part of moving groups-logic into admin-namespace.
|
2009-01-13 19:01:56 +01:00 |
|
Benjamin Meichsner
|
461dfa8531
|
Moved users into new admin-namespace and made the controller restful. Also moved some logic from the controller into the user-model (dry it up..).
|
2009-01-12 18:26:09 +01:00 |
|