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
..
foodsoft	finishes i18n set_locale with user settings	2013-06-14 02:39:25 +02:00
tasks	workaround migration bug introduced by 975bcdec3a	2013-09-30 11:01:15 +02:00
templates/haml/scaffold	Upgraded to rails 3.1.8. Fixed various bugs in wiki.	2012-09-30 21:15:55 +02:00
apple_bar.rb	Fixed apple calcualtion issue on fresh coop installations.	2012-12-30 15:32:22 +01:00
foodsoft_config.rb	start of making nickname optional	2013-09-20 22:40:13 +02:00
foodsoft_file.rb	Fxed encoding error when uploading files with non-ascii characters.	2013-09-02 16:46:44 +02:00
order_pdf.rb	i18n and translate page number text too	2013-05-20 17:14:42 +02:00
wikilink.rb	Upgraded to rails 3.1.8. Fixed various bugs in wiki.	2012-09-30 21:15:55 +02:00