Commit Graph

19 Commits

Author SHA1 Message Date
wvengen 0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
	app/controllers/login_controller.rb
	app/models/message.rb
	app/views/sessions/new.html.haml
2013-04-04 00:29:50 +02:00
Benjamin Meichsner 53518039f1 Fixed error message, when using GET for password reset actions. 2013-03-27 22:20:54 +01:00
Benjamin Meichsner 915e1b9e79 Fixed bug in reset password error handling. 2013-03-27 22:12:46 +01:00
Benjamin Meichsner 80b203a8da Fixed missing templates in accept invitation action. 2013-03-23 17:51:33 +01:00
wvengen b12a906a74 finish login i18n + controller 2013-02-05 12:54:55 +01:00
benni 349cadd5e9 Renabled mail delivering in invites and login contrller. 2012-12-30 16:11:35 +01:00
benni 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni 1708df3f6c Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
benni 5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni 6f7682d6a0 Fixed new user invite. 2012-08-06 12:00:40 +02:00
benni e40f865c45 Refactored login module. Implemented standard sessions controller. 2011-05-11 13:38:46 +02:00
benni 2d7d0d3b94 Updated actionmailer classes and API. 2011-05-11 10:54:02 +02:00
Benjamin Meichsner 571548dfbc Fixed routing bug on (ex) admin controller. 2010-03-22 01:58:37 +01:00
Benjamin Meichsner c6187ebade Fixed bug in password reset feature.
* Translated messages
* Cleaned up some code
2009-04-17 12:06:36 +02:00
Benjamin Meichsner 3ea8d5a2ef Refactoring of message system. 2009-02-18 01:06:35 +01:00
Benjamin Meichsner 24b66ee8d4 Small bugfix in shared view. Translations on start-page. 2009-02-06 21:18:20 +01:00
Benjamin Meichsner aa47a24fda Refactoring of invitations. 2009-02-02 00:09:50 +01:00
Benjamin Meichsner d75c206db5 Fixed some wrong links in startpage. Added gettext-help for controllers. 2009-02-01 23:09:03 +01:00
Benjamin Meichsner 5b9a7e05df Initial commit of foodsoft 2 2009-01-06 11:49:19 +01:00