wvengen
|
734179a2bd
|
clarify group_orders i18n
|
2013-02-12 00:06:23 +01:00 |
|
wvengen
|
8d899581bd
|
finish group_orders i18n + controller
|
2013-02-09 02:01:31 +01:00 |
|
Benjamin Meichsner
|
2a66d37c3a
|
Fixed wrong start balance in new group order.
|
2013-01-26 15:17:56 +01:00 |
|
benni
|
b9138efa79
|
Fixed floating error in group_order new.
|
2012-12-22 14:42:19 +01:00 |
|
benni
|
9919183cb0
|
Fixed missing group_order_article in group_order show.
Also add eager loading for associated objects.
|
2012-12-16 16:50:09 +01:00 |
|
benni
|
0edd29dfd4
|
Merge branch 'master' into master-to-rails3
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
|
2012-12-14 18:10:46 +01:00 |
|
benni
|
f4f10b1e4c
|
Introduced actionbar. Some fixes for balancing page.
|
2012-11-12 13:13:01 +01:00 |
|
benni
|
552c553b77
|
Fixed admin, orders, wiki views. Converted all erb to haml.
|
2012-10-15 21:19:17 +02:00 |
|
benni
|
92649d3053
|
Removed acts_as_ordered. Fixed bug in group_orders archive.
|
2012-10-03 20:08:54 +02:00 |
|
benni
|
ec2e761e7f
|
Fixed multi coop routing and changed config accessors.
|
2012-08-24 19:52:38 +02:00 |
|
benni
|
5fb0bc2444
|
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
|
2012-08-24 11:11:40 +02:00 |
|