wvengen
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +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
wvengen
36b18bcfbd
finish messages i18n + controller + model
2013-02-09 10:18:52 +01:00
benni
db07b28b1c
Fixed bug in accessing foodsoft config.
2012-12-28 13:28:03 +01:00
benni
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +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
7c9d666909
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
...
Conflicts:
Gemfile
2012-11-24 15:27:48 +01:00
Robert Waltemath
2bd52b9270
Corrected config hash index to ':mailing_list_subscribe'
2012-11-13 10:18:40 +01:00
Julius
95efe554fc
Add another option for mailing list subscription tip
2012-11-12 18:08:47 +01:00
Robert Waltemath
f0bf196934
order group recepient list ascending
2012-10-15 17:33:33 +02:00
benni
52e62f8ddb
Fixed messages. New styling for token input plugin.
2012-10-08 18:19:15 +02:00
benni
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
benni
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
benni
fc8418bc8e
Some fixes in group forms.
2012-07-31 18:48:41 +02:00
benni
d5552059ce
Refactored messages modul, but refactoring is still neccessary.
2011-05-18 14:47:17 +02:00
Benjamin Meichsner
ffc3adf907
Second (last) part of multiple foodcoop installation.
...
* When before_filter select_foodcoop is activated,
the database and configs will be loaded on each request.
* Replaced APP_CONFIG with new Foodsoft.config method.
2009-03-24 17:25:33 +01:00
Benjamin Meichsner
843e4a7233
Added ability to send private messages.
2009-03-17 18:28:09 +01:00
Benjamin Meichsner
e4c394d881
New foodcoop configuration option. Use own mailinglist instead of messaging system.
2009-03-17 18:13:00 +01:00
Benjamin Meichsner
e8d55e50c0
Complete refactoring of messaging module. From now messages are saved only once and send afterwards via a the 'send_emails'-rake-task.
2009-01-15 18:26:37 +01:00
Benjamin Meichsner
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
