muck-users 0.2.19 → 0.2.20
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/controllers/admin/muck/roles_controller.rb +0 -2
- data/app/controllers/muck/user_sessions_controller.rb +11 -9
- data/app/controllers/muck/users_controller.rb +79 -46
- data/app/views/user_mailer/activation_confirmation.text.ar.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.ar.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.bg.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.bg.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.ca.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.ca.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.cs.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.da.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.da.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.de.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.de.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.el.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.el.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.es.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.et.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.et.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.fa.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.fa.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.fi.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.fi.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.fr.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.gl.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.gl.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.hi.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.hr.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.hu.html.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.hu.plain.erb +3 -3
- data/app/views/user_mailer/activation_confirmation.text.id.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.id.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.it.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.it.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.iw.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.iw.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.ja.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.ja.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.ko.html.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.ko.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.lt.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.lt.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.lv.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.mt.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.mt.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.nl.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.no.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.no.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.pl.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.pl.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.ro.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.ro.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.ru.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.ru.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.sk.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.sk.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.sl.html.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.sl.plain.erb +3 -3
- data/app/views/user_mailer/activation_confirmation.text.sq.html.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.sq.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.sr.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.sr.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.sv.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.th.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.th.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.tl.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.tl.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.tr.html.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.tr.plain.erb +3 -3
- data/app/views/user_mailer/activation_confirmation.text.uk.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.uk.plain.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.vi.html.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.vi.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.zh-CN.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.zh-CN.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.zh-TW.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.zh-TW.plain.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.zh.html.erb +1 -1
- data/app/views/user_mailer/activation_confirmation.text.zh.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.ar.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.ar.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.bg.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.bg.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.ca.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.ca.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.cs.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.cs.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.da.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.da.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.de.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.de.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.el.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.el.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.es.plain.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.et.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.et.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.fa.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.fa.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.fi.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.fi.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.fr.plain.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.gl.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.gl.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.hi.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.hi.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.hr.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.hr.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.hu.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.hu.plain.erb +3 -3
- data/app/views/user_mailer/activation_instructions.text.id.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.it.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.it.plain.erb +3 -3
- data/app/views/user_mailer/activation_instructions.text.iw.plain.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.ja.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.ja.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.ko.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.ko.plain.erb +3 -3
- data/app/views/user_mailer/activation_instructions.text.lt.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.lt.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.lv.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.lv.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.mt.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.mt.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.nl.plain.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.no.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.no.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.pl.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.pl.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.pt-PT.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.pt-PT.plain.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.ro.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.ro.plain.erb +3 -3
- data/app/views/user_mailer/activation_instructions.text.ru.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.ru.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.sk.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.sk.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.sl.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.sl.plain.erb +3 -3
- data/app/views/user_mailer/activation_instructions.text.sq.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.sq.plain.erb +3 -3
- data/app/views/user_mailer/activation_instructions.text.sr.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.sr.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.sv.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.sv.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.th.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.th.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.tl.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.tl.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.tr.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.tr.plain.erb +3 -3
- data/app/views/user_mailer/activation_instructions.text.uk.html.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.uk.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.vi.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.vi.plain.erb +3 -3
- data/app/views/user_mailer/activation_instructions.text.zh-CN.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.zh-CN.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.zh-TW.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.zh-TW.plain.erb +2 -2
- data/app/views/user_mailer/activation_instructions.text.zh.html.erb +1 -1
- data/app/views/user_mailer/activation_instructions.text.zh.plain.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.ar.html.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.ar.plain.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.bg.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.bg.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.ca.html.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.ca.plain.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.cs.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.cs.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.da.html.erb +1 -1
- data/app/views/user_mailer/password_not_active_instructions.text.da.plain.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.de.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.de.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.el.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.el.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.es.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.es.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.et.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.et.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.fa.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.fa.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.fi.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.fi.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.fr.html.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.fr.plain.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.gl.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.gl.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.hi.html.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.hi.plain.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.hr.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.hr.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.hu.html.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.hu.plain.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.id.html.erb +1 -1
- data/app/views/user_mailer/password_not_active_instructions.text.id.plain.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.it.html.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.it.plain.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.iw.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.iw.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.ja.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.ja.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.ko.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.ko.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.lt.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.lt.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.lv.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.lv.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.mt.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.mt.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.nl.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.nl.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.no.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.no.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.pl.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.pl.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.pt-PT.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.pt-PT.plain.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.ro.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.ro.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.ru.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.ru.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.sk.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.sk.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.sl.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.sl.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.sq.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.sq.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.sr.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.sr.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.sv.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.sv.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.th.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.th.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.tl.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.tl.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.tr.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.tr.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.uk.html.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.uk.plain.erb +5 -5
- data/app/views/user_mailer/password_not_active_instructions.text.vi.html.erb +2 -2
- data/app/views/user_mailer/password_not_active_instructions.text.vi.plain.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.zh-CN.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.zh-CN.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.zh-TW.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.zh-TW.plain.erb +4 -4
- data/app/views/user_mailer/password_not_active_instructions.text.zh.html.erb +3 -3
- data/app/views/user_mailer/password_not_active_instructions.text.zh.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.ar.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.ar.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.bg.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.bg.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.ca.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.ca.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.cs.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.cs.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.da.html.erb +1 -1
- data/app/views/user_mailer/password_reset_instructions.text.da.plain.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.de.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.de.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.el.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.el.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.es.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.es.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.et.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.et.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.fa.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.fa.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.fi.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.fi.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.fr.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.fr.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.gl.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.gl.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.hi.html.erb +1 -1
- data/app/views/user_mailer/password_reset_instructions.text.hi.plain.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.hr.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.hr.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.hu.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.hu.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.id.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.id.plain.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.it.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.it.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.iw.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.iw.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.ja.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.ja.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.ko.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.ko.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.lt.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.lt.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.lv.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.lv.plain.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.mt.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.mt.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.nl.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.nl.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.no.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.no.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.pl.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.pl.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.pt-PT.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.pt-PT.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.ro.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.ro.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.ru.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.ru.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.sk.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.sk.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.sl.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.sl.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.sq.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.sq.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.sr.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.sr.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.sv.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.sv.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.th.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.th.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.tl.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.tl.plain.erb +5 -5
- data/app/views/user_mailer/password_reset_instructions.text.tr.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.tr.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.uk.html.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.uk.plain.erb +6 -6
- data/app/views/user_mailer/password_reset_instructions.text.vi.html.erb +2 -2
- data/app/views/user_mailer/password_reset_instructions.text.vi.plain.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.zh-CN.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.zh-CN.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.zh-TW.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.zh-TW.plain.erb +4 -4
- data/app/views/user_mailer/password_reset_instructions.text.zh.html.erb +3 -3
- data/app/views/user_mailer/password_reset_instructions.text.zh.plain.erb +4 -4
- data/app/views/user_mailer/username_request.text.ar.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.ar.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.cs.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.el.html.erb +2 -2
- data/app/views/user_mailer/username_request.text.el.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.fa.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.fa.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.fr.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.fr.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.gl.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.gl.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.hi.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.hi.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.hr.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.hu.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.hu.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.it.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.it.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.iw.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.iw.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.ja.html.erb +2 -2
- data/app/views/user_mailer/username_request.text.ja.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.ko.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.lt.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.lt.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.lv.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.lv.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.mt.html.erb +2 -2
- data/app/views/user_mailer/username_request.text.mt.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.no.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.no.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.ro.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.ro.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.ru.html.erb +2 -2
- data/app/views/user_mailer/username_request.text.ru.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.sk.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.sl.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.sq.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.sq.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.sr.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.sv.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.th.html.erb +2 -2
- data/app/views/user_mailer/username_request.text.th.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.tr.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.uk.html.erb +2 -2
- data/app/views/user_mailer/username_request.text.uk.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.zh-CN.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.zh-CN.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.zh-TW.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.zh-TW.plain.erb +1 -1
- data/app/views/user_mailer/username_request.text.zh.html.erb +1 -1
- data/app/views/user_mailer/username_request.text.zh.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.ar.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.ar.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.bg.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.bg.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.ca.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.ca.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.cs.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.cs.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.da.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.da.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.de.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.de.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.el.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.el.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.es.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.es.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.et.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.et.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.fa.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.fa.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.fi.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.fi.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.gl.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.gl.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.hi.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.hi.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.hr.html.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.hr.plain.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.hu.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.hu.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.id.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.id.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.it.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.it.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.iw.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.ja.html.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.ja.plain.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.ko.html.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.ko.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.lt.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.lt.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.lv.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.lv.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.mt.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.mt.plain.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.nl.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.nl.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.no.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.no.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.pl.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.pl.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.pt-PT.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.pt-PT.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.ro.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.ru.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.ru.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.sk.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.sk.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.sl.html.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.sl.plain.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.sq.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.sq.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.sr.html.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.sr.plain.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.sv.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.sv.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.th.html.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.th.plain.erb +3 -3
- data/app/views/user_mailer/welcome_notification.text.tr.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.tr.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.uk.html.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.uk.plain.erb +2 -2
- data/app/views/user_mailer/welcome_notification.text.vi.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.vi.plain.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.zh-CN.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.zh-TW.html.erb +1 -1
- data/app/views/user_mailer/welcome_notification.text.zh.html.erb +1 -1
- data/config/muck_users_routes.rb +7 -7
- data/locales/en.yml +113 -116
- data/locales/ja.yml +1 -1
- data/muck-users.gemspec +407 -2
- data/test/rails_root/config/database.yml +12 -11
- data/test/rails_root/db/migrate/20090402234137_create_languages.rb +18 -0
- data/test/rails_root/db/migrate/20090426041056_create_countries.rb +15 -0
- data/test/rails_root/db/migrate/20090426041103_create_states.rb +18 -0
- data/test/rails_root/lib/tasks/muck.rake +7 -0
- data/test/rails_root/public/images/arrow_down.gif +0 -0
- data/test/rails_root/public/images/arrow_up.gif +0 -0
- data/test/rails_root/public/images/fancybox/fancy_closebox.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_left.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_progress.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_right.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_shadow_e.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_shadow_n.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_shadow_ne.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_shadow_nw.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_shadow_s.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_shadow_se.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_shadow_sw.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_shadow_w.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_title_left.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_title_main.png +0 -0
- data/test/rails_root/public/images/fancybox/fancy_title_right.png +0 -0
- data/test/rails_root/public/images/icons/blue_guy.png +0 -0
- data/test/rails_root/public/images/icons/button_background.png +0 -0
- data/test/rails_root/public/images/icons/cancel.png +0 -0
- data/test/rails_root/public/images/icons/close.png +0 -0
- data/test/rails_root/public/images/icons/comment.png +0 -0
- data/test/rails_root/public/images/icons/exclaim.png +0 -0
- data/test/rails_root/public/images/icons/external.png +0 -0
- data/test/rails_root/public/images/icons/feed.png +0 -0
- data/test/rails_root/public/images/icons/grey_guy.png +0 -0
- data/test/rails_root/public/images/icons/hide.png +0 -0
- data/test/rails_root/public/images/icons/information.png +0 -0
- data/test/rails_root/public/images/icons/minus.png +0 -0
- data/test/rails_root/public/images/icons/pending.png +0 -0
- data/test/rails_root/public/images/icons/question.png +0 -0
- data/test/rails_root/public/images/icons/search_box.png +0 -0
- data/test/rails_root/public/images/icons/star.png +0 -0
- data/test/rails_root/public/images/icons/stop.png +0 -0
- data/test/rails_root/public/images/icons/thumb_down.png +0 -0
- data/test/rails_root/public/images/icons/thumb_up.png +0 -0
- data/test/rails_root/public/images/nothing.png +0 -0
- data/test/rails_root/public/images/service_icons/16/amazon.png +0 -0
- data/test/rails_root/public/images/service_icons/16/ask.png +0 -0
- data/test/rails_root/public/images/service_icons/16/bibsonomy.png +0 -0
- data/test/rails_root/public/images/service_icons/16/bing.png +0 -0
- data/test/rails_root/public/images/service_icons/16/blogger.png +0 -0
- data/test/rails_root/public/images/service_icons/16/bloglines.png +0 -0
- data/test/rails_root/public/images/service_icons/16/citeulike.png +0 -0
- data/test/rails_root/public/images/service_icons/16/clipmarks.png +0 -0
- data/test/rails_root/public/images/service_icons/16/connotea.png +0 -0
- data/test/rails_root/public/images/service_icons/16/dailymotion.png +0 -0
- data/test/rails_root/public/images/service_icons/16/delicious.png +0 -0
- data/test/rails_root/public/images/service_icons/16/digg.png +0 -0
- data/test/rails_root/public/images/service_icons/16/diigo.png +0 -0
- data/test/rails_root/public/images/service_icons/16/facebook.png +0 -0
- data/test/rails_root/public/images/service_icons/16/feed.png +0 -0
- data/test/rails_root/public/images/service_icons/16/fireeagle.png +0 -0
- data/test/rails_root/public/images/service_icons/16/flickr.png +0 -0
- data/test/rails_root/public/images/service_icons/16/fotolog.png +0 -0
- data/test/rails_root/public/images/service_icons/16/friendfeed.png +0 -0
- data/test/rails_root/public/images/service_icons/16/friendster.png +0 -0
- data/test/rails_root/public/images/service_icons/16/furl.png +0 -0
- data/test/rails_root/public/images/service_icons/16/goodreads.png +0 -0
- data/test/rails_root/public/images/service_icons/16/google.png +0 -0
- data/test/rails_root/public/images/service_icons/16/googleblog.png +0 -0
- data/test/rails_root/public/images/service_icons/16/googlenews.png +0 -0
- data/test/rails_root/public/images/service_icons/16/icerocket.png +0 -0
- data/test/rails_root/public/images/service_icons/16/identica.png +0 -0
- data/test/rails_root/public/images/service_icons/16/joost.png +0 -0
- data/test/rails_root/public/images/service_icons/16/lastfm.png +0 -0
- data/test/rails_root/public/images/service_icons/16/librarything.png +0 -0
- data/test/rails_root/public/images/service_icons/16/linkedin.png +0 -0
- data/test/rails_root/public/images/service_icons/16/livejournal.png +0 -0
- data/test/rails_root/public/images/service_icons/16/magnolia.png +0 -0
- data/test/rails_root/public/images/service_icons/16/mendeley.png +0 -0
- data/test/rails_root/public/images/service_icons/16/metacafe.png +0 -0
- data/test/rails_root/public/images/service_icons/16/mixx.png +0 -0
- data/test/rails_root/public/images/service_icons/16/myspace.png +0 -0
- data/test/rails_root/public/images/service_icons/16/netflix.png +0 -0
- data/test/rails_root/public/images/service_icons/16/netvibes.png +0 -0
- data/test/rails_root/public/images/service_icons/16/newsvine.png +0 -0
- data/test/rails_root/public/images/service_icons/16/oai.png +0 -0
- data/test/rails_root/public/images/service_icons/16/odeo.png +0 -0
- data/test/rails_root/public/images/service_icons/16/opml.png +0 -0
- data/test/rails_root/public/images/service_icons/16/pandora.png +0 -0
- data/test/rails_root/public/images/service_icons/16/photobucket.png +0 -0
- data/test/rails_root/public/images/service_icons/16/picasa.png +0 -0
- data/test/rails_root/public/images/service_icons/16/polyvore.png +0 -0
- data/test/rails_root/public/images/service_icons/16/pownce.png +0 -0
- data/test/rails_root/public/images/service_icons/16/reddit.png +0 -0
- data/test/rails_root/public/images/service_icons/16/simpy.png +0 -0
- data/test/rails_root/public/images/service_icons/16/smugmug.png +0 -0
- data/test/rails_root/public/images/service_icons/16/stumbleupon.png +0 -0
- data/test/rails_root/public/images/service_icons/16/tag.png +0 -0
- data/test/rails_root/public/images/service_icons/16/technorati.png +0 -0
- data/test/rails_root/public/images/service_icons/16/tumblr.png +0 -0
- data/test/rails_root/public/images/service_icons/16/twine.png +0 -0
- data/test/rails_root/public/images/service_icons/16/twitter.png +0 -0
- data/test/rails_root/public/images/service_icons/16/vimeo.png +0 -0
- data/test/rails_root/public/images/service_icons/16/webshots.png +0 -0
- data/test/rails_root/public/images/service_icons/16/wordpress.png +0 -0
- data/test/rails_root/public/images/service_icons/16/xanga.png +0 -0
- data/test/rails_root/public/images/service_icons/16/yahoo.png +0 -0
- data/test/rails_root/public/images/service_icons/16/yelp.png +0 -0
- data/test/rails_root/public/images/service_icons/16/youtube.png +0 -0
- data/test/rails_root/public/images/service_icons/16/zooomr.png +0 -0
- data/test/rails_root/public/images/service_icons/16/zotero.png +0 -0
- data/test/rails_root/public/images/service_icons/24/amazon.png +0 -0
- data/test/rails_root/public/images/service_icons/24/ask.png +0 -0
- data/test/rails_root/public/images/service_icons/24/bibsonomy.png +0 -0
- data/test/rails_root/public/images/service_icons/24/bing.png +0 -0
- data/test/rails_root/public/images/service_icons/24/blogger.png +0 -0
- data/test/rails_root/public/images/service_icons/24/bloglines.png +0 -0
- data/test/rails_root/public/images/service_icons/24/citeulike.png +0 -0
- data/test/rails_root/public/images/service_icons/24/clipmarks.png +0 -0
- data/test/rails_root/public/images/service_icons/24/connotea.png +0 -0
- data/test/rails_root/public/images/service_icons/24/dailymotion.png +0 -0
- data/test/rails_root/public/images/service_icons/24/delicious.png +0 -0
- data/test/rails_root/public/images/service_icons/24/digg.png +0 -0
- data/test/rails_root/public/images/service_icons/24/diigo.png +0 -0
- data/test/rails_root/public/images/service_icons/24/facebook.png +0 -0
- data/test/rails_root/public/images/service_icons/24/feed.png +0 -0
- data/test/rails_root/public/images/service_icons/24/fireeagle.png +0 -0
- data/test/rails_root/public/images/service_icons/24/flickr.png +0 -0
- data/test/rails_root/public/images/service_icons/24/fotolog.png +0 -0
- data/test/rails_root/public/images/service_icons/24/friendfeed.png +0 -0
- data/test/rails_root/public/images/service_icons/24/friendster.png +0 -0
- data/test/rails_root/public/images/service_icons/24/furl.png +0 -0
- data/test/rails_root/public/images/service_icons/24/goodreads.png +0 -0
- data/test/rails_root/public/images/service_icons/24/google.png +0 -0
- data/test/rails_root/public/images/service_icons/24/googleblog.png +0 -0
- data/test/rails_root/public/images/service_icons/24/googlenews.png +0 -0
- data/test/rails_root/public/images/service_icons/24/icerocket.png +0 -0
- data/test/rails_root/public/images/service_icons/24/identica.png +0 -0
- data/test/rails_root/public/images/service_icons/24/joost.png +0 -0
- data/test/rails_root/public/images/service_icons/24/lastfm.png +0 -0
- data/test/rails_root/public/images/service_icons/24/librarything.png +0 -0
- data/test/rails_root/public/images/service_icons/24/linkedin.png +0 -0
- data/test/rails_root/public/images/service_icons/24/livejournal.png +0 -0
- data/test/rails_root/public/images/service_icons/24/magnolia.png +0 -0
- data/test/rails_root/public/images/service_icons/24/mendeley.png +0 -0
- data/test/rails_root/public/images/service_icons/24/metacafe.png +0 -0
- data/test/rails_root/public/images/service_icons/24/mixx.png +0 -0
- data/test/rails_root/public/images/service_icons/24/myspace.png +0 -0
- data/test/rails_root/public/images/service_icons/24/netflix.png +0 -0
- data/test/rails_root/public/images/service_icons/24/netvibes.png +0 -0
- data/test/rails_root/public/images/service_icons/24/newsvine.png +0 -0
- data/test/rails_root/public/images/service_icons/24/oai.png +0 -0
- data/test/rails_root/public/images/service_icons/24/odeo.png +0 -0
- data/test/rails_root/public/images/service_icons/24/opml.png +0 -0
- data/test/rails_root/public/images/service_icons/24/pandora.png +0 -0
- data/test/rails_root/public/images/service_icons/24/photobucket.png +0 -0
- data/test/rails_root/public/images/service_icons/24/picasa.png +0 -0
- data/test/rails_root/public/images/service_icons/24/polyvore.png +0 -0
- data/test/rails_root/public/images/service_icons/24/pownce.png +0 -0
- data/test/rails_root/public/images/service_icons/24/reddit.png +0 -0
- data/test/rails_root/public/images/service_icons/24/simpy.png +0 -0
- data/test/rails_root/public/images/service_icons/24/smugmug.png +0 -0
- data/test/rails_root/public/images/service_icons/24/stumbleupon.png +0 -0
- data/test/rails_root/public/images/service_icons/24/tag.png +0 -0
- data/test/rails_root/public/images/service_icons/24/technorati.png +0 -0
- data/test/rails_root/public/images/service_icons/24/tumblr.png +0 -0
- data/test/rails_root/public/images/service_icons/24/twine.png +0 -0
- data/test/rails_root/public/images/service_icons/24/twitter.png +0 -0
- data/test/rails_root/public/images/service_icons/24/vimeo.png +0 -0
- data/test/rails_root/public/images/service_icons/24/webshots.png +0 -0
- data/test/rails_root/public/images/service_icons/24/wordpress.png +0 -0
- data/test/rails_root/public/images/service_icons/24/xanga.png +0 -0
- data/test/rails_root/public/images/service_icons/24/yahoo.png +0 -0
- data/test/rails_root/public/images/service_icons/24/yelp.png +0 -0
- data/test/rails_root/public/images/service_icons/24/youtube.png +0 -0
- data/test/rails_root/public/images/service_icons/24/zooomr.png +0 -0
- data/test/rails_root/public/images/service_icons/24/zotero.png +0 -0
- data/test/rails_root/public/images/service_icons/48/amazon.png +0 -0
- data/test/rails_root/public/images/service_icons/48/ask.png +0 -0
- data/test/rails_root/public/images/service_icons/48/bibsonomy.png +0 -0
- data/test/rails_root/public/images/service_icons/48/bing.png +0 -0
- data/test/rails_root/public/images/service_icons/48/blogger.png +0 -0
- data/test/rails_root/public/images/service_icons/48/bloglines.png +0 -0
- data/test/rails_root/public/images/service_icons/48/citeulike.png +0 -0
- data/test/rails_root/public/images/service_icons/48/clipmarks.png +0 -0
- data/test/rails_root/public/images/service_icons/48/connotea.png +0 -0
- data/test/rails_root/public/images/service_icons/48/dailymotion.png +0 -0
- data/test/rails_root/public/images/service_icons/48/delicious.png +0 -0
- data/test/rails_root/public/images/service_icons/48/digg.png +0 -0
- data/test/rails_root/public/images/service_icons/48/diigo.png +0 -0
- data/test/rails_root/public/images/service_icons/48/facebook.png +0 -0
- data/test/rails_root/public/images/service_icons/48/feed.png +0 -0
- data/test/rails_root/public/images/service_icons/48/fireeagle.png +0 -0
- data/test/rails_root/public/images/service_icons/48/flickr.png +0 -0
- data/test/rails_root/public/images/service_icons/48/fotolog.png +0 -0
- data/test/rails_root/public/images/service_icons/48/friendfeed.png +0 -0
- data/test/rails_root/public/images/service_icons/48/friendster.png +0 -0
- data/test/rails_root/public/images/service_icons/48/furl.png +0 -0
- data/test/rails_root/public/images/service_icons/48/goodreads.png +0 -0
- data/test/rails_root/public/images/service_icons/48/google.png +0 -0
- data/test/rails_root/public/images/service_icons/48/googleblog.png +0 -0
- data/test/rails_root/public/images/service_icons/48/googlenews.png +0 -0
- data/test/rails_root/public/images/service_icons/48/icerocket.png +0 -0
- data/test/rails_root/public/images/service_icons/48/identica.png +0 -0
- data/test/rails_root/public/images/service_icons/48/joost.png +0 -0
- data/test/rails_root/public/images/service_icons/48/lastfm.png +0 -0
- data/test/rails_root/public/images/service_icons/48/librarything.png +0 -0
- data/test/rails_root/public/images/service_icons/48/linkedin.png +0 -0
- data/test/rails_root/public/images/service_icons/48/livejournal.png +0 -0
- data/test/rails_root/public/images/service_icons/48/magnolia.png +0 -0
- data/test/rails_root/public/images/service_icons/48/mendeley.png +0 -0
- data/test/rails_root/public/images/service_icons/48/metacafe.png +0 -0
- data/test/rails_root/public/images/service_icons/48/mixx.png +0 -0
- data/test/rails_root/public/images/service_icons/48/myspace.png +0 -0
- data/test/rails_root/public/images/service_icons/48/netflix.png +0 -0
- data/test/rails_root/public/images/service_icons/48/netvibes.png +0 -0
- data/test/rails_root/public/images/service_icons/48/newsvine.png +0 -0
- data/test/rails_root/public/images/service_icons/48/oai.png +0 -0
- data/test/rails_root/public/images/service_icons/48/odeo.png +0 -0
- data/test/rails_root/public/images/service_icons/48/opml.png +0 -0
- data/test/rails_root/public/images/service_icons/48/pandora.png +0 -0
- data/test/rails_root/public/images/service_icons/48/photobucket.png +0 -0
- data/test/rails_root/public/images/service_icons/48/picasa.png +0 -0
- data/test/rails_root/public/images/service_icons/48/polyvore.png +0 -0
- data/test/rails_root/public/images/service_icons/48/pownce.png +0 -0
- data/test/rails_root/public/images/service_icons/48/reddit.png +0 -0
- data/test/rails_root/public/images/service_icons/48/simpy.png +0 -0
- data/test/rails_root/public/images/service_icons/48/smugmug.png +0 -0
- data/test/rails_root/public/images/service_icons/48/stumbleupon.png +0 -0
- data/test/rails_root/public/images/service_icons/48/tag.png +0 -0
- data/test/rails_root/public/images/service_icons/48/technorati.png +0 -0
- data/test/rails_root/public/images/service_icons/48/tumblr.png +0 -0
- data/test/rails_root/public/images/service_icons/48/twine.png +0 -0
- data/test/rails_root/public/images/service_icons/48/twitter.png +0 -0
- data/test/rails_root/public/images/service_icons/48/vimeo.png +0 -0
- data/test/rails_root/public/images/service_icons/48/webshots.png +0 -0
- data/test/rails_root/public/images/service_icons/48/wordpress.png +0 -0
- data/test/rails_root/public/images/service_icons/48/xanga.png +0 -0
- data/test/rails_root/public/images/service_icons/48/yahoo.png +0 -0
- data/test/rails_root/public/images/service_icons/48/yelp.png +0 -0
- data/test/rails_root/public/images/service_icons/48/youtube.png +0 -0
- data/test/rails_root/public/images/service_icons/48/zooomr.png +0 -0
- data/test/rails_root/public/images/service_icons/48/zotero.png +0 -0
- data/test/rails_root/public/images/service_icons/60/amazon.png +0 -0
- data/test/rails_root/public/images/service_icons/60/ask.png +0 -0
- data/test/rails_root/public/images/service_icons/60/bibsonomy.png +0 -0
- data/test/rails_root/public/images/service_icons/60/bing.png +0 -0
- data/test/rails_root/public/images/service_icons/60/blogger.png +0 -0
- data/test/rails_root/public/images/service_icons/60/bloglines.png +0 -0
- data/test/rails_root/public/images/service_icons/60/citeulike.png +0 -0
- data/test/rails_root/public/images/service_icons/60/clipmarks.png +0 -0
- data/test/rails_root/public/images/service_icons/60/connotea.png +0 -0
- data/test/rails_root/public/images/service_icons/60/dailymotion.png +0 -0
- data/test/rails_root/public/images/service_icons/60/delicious.png +0 -0
- data/test/rails_root/public/images/service_icons/60/digg.png +0 -0
- data/test/rails_root/public/images/service_icons/60/diigo.png +0 -0
- data/test/rails_root/public/images/service_icons/60/facebook.png +0 -0
- data/test/rails_root/public/images/service_icons/60/feed.png +0 -0
- data/test/rails_root/public/images/service_icons/60/fireeagle.png +0 -0
- data/test/rails_root/public/images/service_icons/60/flickr.png +0 -0
- data/test/rails_root/public/images/service_icons/60/fotolog.png +0 -0
- data/test/rails_root/public/images/service_icons/60/friendfeed.png +0 -0
- data/test/rails_root/public/images/service_icons/60/friendster.png +0 -0
- data/test/rails_root/public/images/service_icons/60/furl.png +0 -0
- data/test/rails_root/public/images/service_icons/60/goodreads.png +0 -0
- data/test/rails_root/public/images/service_icons/60/google.png +0 -0
- data/test/rails_root/public/images/service_icons/60/googleblog.png +0 -0
- data/test/rails_root/public/images/service_icons/60/googlenews.png +0 -0
- data/test/rails_root/public/images/service_icons/60/icerocket.png +0 -0
- data/test/rails_root/public/images/service_icons/60/identica.png +0 -0
- data/test/rails_root/public/images/service_icons/60/joost.png +0 -0
- data/test/rails_root/public/images/service_icons/60/lastfm.png +0 -0
- data/test/rails_root/public/images/service_icons/60/librarything.png +0 -0
- data/test/rails_root/public/images/service_icons/60/linkedin.png +0 -0
- data/test/rails_root/public/images/service_icons/60/livejournal.png +0 -0
- data/test/rails_root/public/images/service_icons/60/magnolia.png +0 -0
- data/test/rails_root/public/images/service_icons/60/mendeley.png +0 -0
- data/test/rails_root/public/images/service_icons/60/metacafe.png +0 -0
- data/test/rails_root/public/images/service_icons/60/mixx.png +0 -0
- data/test/rails_root/public/images/service_icons/60/myspace.png +0 -0
- data/test/rails_root/public/images/service_icons/60/netflix.png +0 -0
- data/test/rails_root/public/images/service_icons/60/netvibes.png +0 -0
- data/test/rails_root/public/images/service_icons/60/newsvine.png +0 -0
- data/test/rails_root/public/images/service_icons/60/oai.png +0 -0
- data/test/rails_root/public/images/service_icons/60/odeo.png +0 -0
- data/test/rails_root/public/images/service_icons/60/opml.png +0 -0
- data/test/rails_root/public/images/service_icons/60/pandora.png +0 -0
- data/test/rails_root/public/images/service_icons/60/photobucket.png +0 -0
- data/test/rails_root/public/images/service_icons/60/picasa.png +0 -0
- data/test/rails_root/public/images/service_icons/60/polyvore.png +0 -0
- data/test/rails_root/public/images/service_icons/60/pownce.png +0 -0
- data/test/rails_root/public/images/service_icons/60/reddit.png +0 -0
- data/test/rails_root/public/images/service_icons/60/simpy.png +0 -0
- data/test/rails_root/public/images/service_icons/60/smugmug.png +0 -0
- data/test/rails_root/public/images/service_icons/60/stumbleupon.png +0 -0
- data/test/rails_root/public/images/service_icons/60/tag.png +0 -0
- data/test/rails_root/public/images/service_icons/60/technorati.png +0 -0
- data/test/rails_root/public/images/service_icons/60/tumblr.png +0 -0
- data/test/rails_root/public/images/service_icons/60/twine.png +0 -0
- data/test/rails_root/public/images/service_icons/60/twitter.png +0 -0
- data/test/rails_root/public/images/service_icons/60/vimeo.png +0 -0
- data/test/rails_root/public/images/service_icons/60/webshots.png +0 -0
- data/test/rails_root/public/images/service_icons/60/wordpress.png +0 -0
- data/test/rails_root/public/images/service_icons/60/xanga.png +0 -0
- data/test/rails_root/public/images/service_icons/60/yahoo.png +0 -0
- data/test/rails_root/public/images/service_icons/60/yelp.png +0 -0
- data/test/rails_root/public/images/service_icons/60/youtube.png +0 -0
- data/test/rails_root/public/images/service_icons/60/zooomr.png +0 -0
- data/test/rails_root/public/images/service_icons/60/zotero.png +0 -0
- data/test/rails_root/public/images/service_icons/facebook_friend_links.jpg +0 -0
- data/test/rails_root/public/images/service_icons/facebook_my_links.jpg +0 -0
- data/test/rails_root/public/images/service_icons/source/Aquaticus_Social_Icon_template_by_jwloh.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/Google.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/Quake 9 Design.webloc +0 -0
- data/test/rails_root/public/images/service_icons/source/ReadMe.rtf +52 -0
- data/test/rails_root/public/images/service_icons/source/amazon.png +0 -0
- data/test/rails_root/public/images/service_icons/source/aquaticus.social.png +0 -0
- data/test/rails_root/public/images/service_icons/source/ask.png +0 -0
- data/test/rails_root/public/images/service_icons/source/ask.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/bibsonomy.png +0 -0
- data/test/rails_root/public/images/service_icons/source/bibsonomy.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/bing.png +0 -0
- data/test/rails_root/public/images/service_icons/source/bing.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/blogger.png +0 -0
- data/test/rails_root/public/images/service_icons/source/bloglines.png +0 -0
- data/test/rails_root/public/images/service_icons/source/bloglines.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/citeulike.png +0 -0
- data/test/rails_root/public/images/service_icons/source/clipmarks.png +0 -0
- data/test/rails_root/public/images/service_icons/source/connotea.png +0 -0
- data/test/rails_root/public/images/service_icons/source/connotea.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/dailymotion.png +0 -0
- data/test/rails_root/public/images/service_icons/source/delicious.png +0 -0
- data/test/rails_root/public/images/service_icons/source/digg.png +0 -0
- data/test/rails_root/public/images/service_icons/source/diigo.png +0 -0
- data/test/rails_root/public/images/service_icons/source/facebook.png +0 -0
- data/test/rails_root/public/images/service_icons/source/feed.png +0 -0
- data/test/rails_root/public/images/service_icons/source/fireeagle.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/flickr.png +0 -0
- data/test/rails_root/public/images/service_icons/source/fotolog.png +0 -0
- data/test/rails_root/public/images/service_icons/source/friendfeed.png +0 -0
- data/test/rails_root/public/images/service_icons/source/friendster.png +0 -0
- data/test/rails_root/public/images/service_icons/source/furl.png +0 -0
- data/test/rails_root/public/images/service_icons/source/goodreads.png +0 -0
- data/test/rails_root/public/images/service_icons/source/google.png +0 -0
- data/test/rails_root/public/images/service_icons/source/googleblog.png +0 -0
- data/test/rails_root/public/images/service_icons/source/googlenews.png +0 -0
- data/test/rails_root/public/images/service_icons/source/icerocket.png +0 -0
- data/test/rails_root/public/images/service_icons/source/icerocket.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/identica.png +0 -0
- data/test/rails_root/public/images/service_icons/source/joost.png +0 -0
- data/test/rails_root/public/images/service_icons/source/lastfm.png +0 -0
- data/test/rails_root/public/images/service_icons/source/librarything.png +0 -0
- data/test/rails_root/public/images/service_icons/source/linkedin.png +0 -0
- data/test/rails_root/public/images/service_icons/source/livejournal.png +0 -0
- data/test/rails_root/public/images/service_icons/source/magnolia.png +0 -0
- data/test/rails_root/public/images/service_icons/source/mendeley.png +0 -0
- data/test/rails_root/public/images/service_icons/source/metacafe.png +0 -0
- data/test/rails_root/public/images/service_icons/source/metacafe.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/mixx.png +0 -0
- data/test/rails_root/public/images/service_icons/source/myspace.png +0 -0
- data/test/rails_root/public/images/service_icons/source/netflix.png +0 -0
- data/test/rails_root/public/images/service_icons/source/netvibes.png +0 -0
- data/test/rails_root/public/images/service_icons/source/newsvine.png +0 -0
- data/test/rails_root/public/images/service_icons/source/oai.png +0 -0
- data/test/rails_root/public/images/service_icons/source/odeo.png +0 -0
- data/test/rails_root/public/images/service_icons/source/opml.png +0 -0
- data/test/rails_root/public/images/service_icons/source/pandora.png +0 -0
- data/test/rails_root/public/images/service_icons/source/photobucket.png +0 -0
- data/test/rails_root/public/images/service_icons/source/picasa.png +0 -0
- data/test/rails_root/public/images/service_icons/source/polyvore.png +0 -0
- data/test/rails_root/public/images/service_icons/source/pownce.png +0 -0
- data/test/rails_root/public/images/service_icons/source/reddit.png +0 -0
- data/test/rails_root/public/images/service_icons/source/simpy.png +0 -0
- data/test/rails_root/public/images/service_icons/source/smugmug.png +0 -0
- data/test/rails_root/public/images/service_icons/source/stumbleupon.png +0 -0
- data/test/rails_root/public/images/service_icons/source/tag.png +0 -0
- data/test/rails_root/public/images/service_icons/source/technorati.png +0 -0
- data/test/rails_root/public/images/service_icons/source/template.png +0 -0
- data/test/rails_root/public/images/service_icons/source/tumblr.png +0 -0
- data/test/rails_root/public/images/service_icons/source/twine.png +0 -0
- data/test/rails_root/public/images/service_icons/source/twine.psd +0 -0
- data/test/rails_root/public/images/service_icons/source/twitter.png +0 -0
- data/test/rails_root/public/images/service_icons/source/vimeo.png +0 -0
- data/test/rails_root/public/images/service_icons/source/webshots.png +0 -0
- data/test/rails_root/public/images/service_icons/source/wordpress.png +0 -0
- data/test/rails_root/public/images/service_icons/source/xanga.png +0 -0
- data/test/rails_root/public/images/service_icons/source/yahoo.png +0 -0
- data/test/rails_root/public/images/service_icons/source/yelp.png +0 -0
- data/test/rails_root/public/images/service_icons/source/youtube.png +0 -0
- data/test/rails_root/public/images/service_icons/source/zooomr.png +0 -0
- data/test/rails_root/public/images/service_icons/source/zotero.png +0 -0
- data/test/rails_root/public/javascripts/jquery/colorpicker.js +450 -0
- data/test/rails_root/public/javascripts/jquery/jquery.autocomplete.js.readme +6 -0
- data/test/rails_root/public/javascripts/jquery/jquery.autocomplete.min.js +15 -0
- data/test/rails_root/public/javascripts/jquery/jquery.autocomplete.pack.js +767 -0
- data/test/rails_root/public/javascripts/jquery/jquery.easing.js +1 -0
- data/test/rails_root/public/javascripts/jquery/jquery.fancybox.js +16 -0
- data/test/rails_root/public/javascripts/jquery/jquery.metadata.min.js +13 -0
- data/test/rails_root/public/javascripts/jquery/jquery.queryString.js +33 -0
- data/test/rails_root/public/javascripts/jquery/jquery.swapimage.js +66 -0
- data/test/rails_root/public/javascripts/jquery/jquery.swapimage.min.js +11 -0
- data/test/rails_root/public/javascripts/jquery/jquery.tips.js +7 -6
- data/test/rails_root/public/javascripts/jquery/jrails.js +1 -0
- data/test/rails_root/public/javascripts/muck.js +57 -6
- data/test/rails_root/public/javascripts/muck_time/en.js +53 -0
- data/test/rails_root/public/javascripts/tree.js +107 -0
- data/test/rails_root/public/stylesheets/jquery/jquery.autocomplete.css +15 -0
- data/test/rails_root/public/stylesheets/jquery/jquery.fancybox.css +38 -0
- data/test/rails_root/public/stylesheets/styles.css +16 -2
- data/test/rails_root/test/functional/admin/users_controller_test.rb +9 -2
- metadata +407 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.2.
|
1
|
+
0.2.20
|
@@ -25,15 +25,17 @@ class Muck::UserSessionsController < ApplicationController
|
|
25
25
|
def create
|
26
26
|
@title = t('muck.users.sign_in_title')
|
27
27
|
@user_session = UserSession.new(params[:user_session])
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
28
|
+
@user_session.save do |result|
|
29
|
+
if result
|
30
|
+
flash[:notice] = t('muck.users.login_success')
|
31
|
+
respond_to do |format|
|
32
|
+
format.html { redirect_back_or_default user_path(@user_session.user) }
|
33
|
+
end
|
34
|
+
else
|
35
|
+
flash[:notice] = t('muck.users.login_fail')
|
36
|
+
respond_to do |format|
|
37
|
+
format.html { render :template => 'user_sessions/new' }
|
38
|
+
end
|
37
39
|
end
|
38
40
|
end
|
39
41
|
end
|
@@ -51,43 +51,10 @@ class Muck::UsersController < ApplicationController
|
|
51
51
|
@page_title = t('muck.users.register_account', :application_name => GlobalConfig.application_name)
|
52
52
|
cookies.delete :auth_token
|
53
53
|
@user = User.new(params[:user])
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
end
|
59
|
-
end
|
60
|
-
|
61
|
-
if GlobalConfig.automatically_activate
|
62
|
-
if GlobalConfig.automatically_login_after_account_create
|
63
|
-
if @user.save
|
64
|
-
@user.activate!
|
65
|
-
UserSession.create(@user)
|
66
|
-
send_welcome_email
|
67
|
-
flash[:notice] = t('muck.users.thanks_sign_up')
|
68
|
-
after_create_response(true, signup_complete_path(@user))
|
69
|
-
else
|
70
|
-
after_create_response(false)
|
71
|
-
end
|
72
|
-
else
|
73
|
-
if @user.save_without_session_maintenance
|
74
|
-
@user.activate!
|
75
|
-
send_welcome_email
|
76
|
-
flash[:notice] = t('muck.users.thanks_sign_up_login')
|
77
|
-
after_create_response(true, signup_complete_login_required_path(@user))
|
78
|
-
else
|
79
|
-
after_create_response(false)
|
80
|
-
end
|
81
|
-
end
|
82
|
-
else
|
83
|
-
if @user.save_without_session_maintenance
|
84
|
-
@user.deliver_activation_instructions!
|
85
|
-
flash[:notice] = t('muck.users.thanks_sign_up_check')
|
86
|
-
after_create_response(true, signup_complete_activation_required_path(@user))
|
87
|
-
else
|
88
|
-
after_create_response(false)
|
89
|
-
end
|
90
|
-
end
|
54
|
+
|
55
|
+
check_recaptcha
|
56
|
+
success, path = setup_user
|
57
|
+
after_create_response(success, path)
|
91
58
|
end
|
92
59
|
|
93
60
|
def update
|
@@ -159,15 +126,6 @@ class Muck::UsersController < ApplicationController
|
|
159
126
|
|
160
127
|
protected
|
161
128
|
|
162
|
-
def send_welcome_email
|
163
|
-
begin
|
164
|
-
@user.deliver_welcome_email
|
165
|
-
rescue Net::SMTPAuthenticationError => ex
|
166
|
-
# TODO figure out what to do when email fails
|
167
|
-
# @user.no_welcome_email =
|
168
|
-
end
|
169
|
-
end
|
170
|
-
|
171
129
|
def valid_email?(email)
|
172
130
|
user = User.new(:email => email)
|
173
131
|
user.valid?
|
@@ -199,6 +157,81 @@ class Muck::UsersController < ApplicationController
|
|
199
157
|
end
|
200
158
|
end
|
201
159
|
|
160
|
+
# Sign up methods
|
161
|
+
def check_recaptcha
|
162
|
+
if GlobalConfig.use_recaptcha
|
163
|
+
if !(verify_recaptcha(@user) && @user.valid?)
|
164
|
+
raise ActiveRecord::RecordInvalid, @user
|
165
|
+
end
|
166
|
+
end
|
167
|
+
end
|
168
|
+
|
169
|
+
def setup_user
|
170
|
+
if GlobalConfig.automatically_activate
|
171
|
+
if GlobalConfig.automatically_login_after_account_create
|
172
|
+
setup_user_login
|
173
|
+
else
|
174
|
+
setup_user_no_login
|
175
|
+
end
|
176
|
+
else
|
177
|
+
setup_user_no_activate
|
178
|
+
end
|
179
|
+
end
|
180
|
+
|
181
|
+
def setup_user_login
|
182
|
+
path = ''
|
183
|
+
success = false
|
184
|
+
if @user.save
|
185
|
+
@user.activate!
|
186
|
+
UserSession.create(@user)
|
187
|
+
send_welcome_email
|
188
|
+
flash[:notice] = t('muck.users.thanks_sign_up')
|
189
|
+
success = true
|
190
|
+
path = signup_complete_path(@user)
|
191
|
+
else
|
192
|
+
success = false
|
193
|
+
end
|
194
|
+
[success, path]
|
195
|
+
end
|
196
|
+
|
197
|
+
def setup_user_no_login
|
198
|
+
path = ''
|
199
|
+
success = false
|
200
|
+
if @user.save_without_session_maintenance
|
201
|
+
@user.activate!
|
202
|
+
send_welcome_email
|
203
|
+
flash[:notice] = t('muck.users.thanks_sign_up_login')
|
204
|
+
success = true
|
205
|
+
path = signup_complete_login_required_path(@user)
|
206
|
+
else
|
207
|
+
success = false
|
208
|
+
end
|
209
|
+
[success, path]
|
210
|
+
end
|
211
|
+
|
212
|
+
def setup_user_no_activate
|
213
|
+
path = ''
|
214
|
+
success = false
|
215
|
+
if @user.save_without_session_maintenance
|
216
|
+
@user.deliver_activation_instructions!
|
217
|
+
flash[:notice] = t('muck.users.thanks_sign_up_check')
|
218
|
+
success = true
|
219
|
+
path = signup_complete_activation_required_path(@user)
|
220
|
+
else
|
221
|
+
success = false
|
222
|
+
end
|
223
|
+
[success, path]
|
224
|
+
end
|
225
|
+
|
226
|
+
def send_welcome_email
|
227
|
+
begin
|
228
|
+
@user.deliver_welcome_email
|
229
|
+
rescue Net::SMTPAuthenticationError => ex
|
230
|
+
# TODO figure out what to do when email fails
|
231
|
+
# @user.no_welcome_email =
|
232
|
+
end
|
233
|
+
end
|
234
|
+
|
202
235
|
# override redirect by adding :redirect_to as a hidden field in your form or as a url param
|
203
236
|
def after_update_response(success)
|
204
237
|
if success
|
@@ -1,7 +1,7 @@
|
|
1
1
|
نرحب <%= h(@user.login) %>،
|
2
2
|
|
3
|
-
|
3
|
+
حسابك قد تم تفعيلها.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
إذا كان العنوان أعلاه لا يعمل محاولة
|
7
|
+
إذا كان العنوان أعلاه لا يعمل محاولة نسخه ولصقه في المستعرض. اذا كنت لا تزال تواجه المشكلة ، فلا تتردد في الاتصال بنا.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Добре дошли <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
|
3
|
+
Вашата сметка е активирана.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Ако URL-горе не
|
7
|
+
Ако URL-горе не работи опитвам да го копирате и поставите във вашия браузър. Ако продължите да имате проблем, моля не се колебайте да се свържете с нас.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Benvingut <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
El
|
3
|
+
El seu compte ha estat activat.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Si
|
7
|
+
Si l'URL anterior no funciona, tracti de copiar-lo i enganxar-lo al navegador. Si continueu tenint problemes, si us plau, no dubti en contactar amb nosaltres.
|
@@ -4,4 +4,4 @@ Vítejte <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
|
7
|
+
Je-li výše uvedenou adresu URL nefunguje, zkuste zkopírovat a vložit do prohlížeče. Máte-li mít i nadále problémy, neváhejte a kontaktujte nás.
|
@@ -4,4 +4,4 @@ Velkommen <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Hvis ovenstående
|
7
|
+
Hvis ovenstående webadresse virker ikke prøve at kopiere og indsætte den i din browser. Hvis du fortsat har problemer, er du velkommen til at kontakte os.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Willkommen <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
Ihr Konto aktiviert
|
3
|
+
Ihr Konto wurde aktiviert.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Wenn
|
7
|
+
Wenn das oben genannte URL nicht funktioniert, versuchen das Kopieren und Einfügen in Ihrem Browser. Wenn Sie das Problem auch weiterhin, zögern Sie nicht uns zu kontaktieren.
|
@@ -1,7 +1,7 @@
|
|
1
|
-
Καλώς
|
1
|
+
Καλώς <%= h(@user.login) %>,
|
2
2
|
|
3
3
|
Ο λογαριασμός σας έχει ενεργοποιηθεί.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Εάν το παραπάνω URL δεν λειτουργεί δοκιμάστε αντιγραφή και
|
7
|
+
Εάν το παραπάνω URL δεν λειτουργεί δοκιμάστε αντιγραφή και επικολλήσετε στο πρόγραμμα περιήγησης σας. Αν συνεχίσετε να έχετε πρόβλημα, παρακαλούμε να επικοινωνήσετε μαζί μας.
|
@@ -4,4 +4,4 @@ Bienvenido <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Si la
|
7
|
+
Si la URL anterior no funciona, trate de copiarlo y pegarlo en tu navegador. Si continúa teniendo problemas, por favor, no dude en contactar con nosotros.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Tere <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
|
3
|
+
Sinu konto on aktiveeritud.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Kui
|
7
|
+
Kui eespool toodud URL ei tööta proovige kopeerige see oma brauserisse. Kui teil on jätkuvalt probleeme, võtke meiega ühendust.
|
@@ -1,4 +1,4 @@
|
|
1
1
|
<p style=";text-align:right;direction:rtl"> خوش آمدید <%= h(@user.login) %>، </p>
|
2
2
|
|
3
|
-
<p style=";text-align:right;direction:rtl"> حساب شما فعال شده است.
|
3
|
+
<p style=";text-align:right;direction:rtl"> حساب شما فعال شده است. سایت دفعات مشاهده شده : </p>
|
4
4
|
|
@@ -4,4 +4,4 @@ Tervetuloa <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Jos edellä mainittu osoite ei toimi, yritä kopioida ja liittää se selaimen
|
7
|
+
Jos edellä mainittu osoite ei toimi, yritä kopioida ja liittää se selaimen. Jos sinulla on edelleen ongelmia, ota meihin yhteyttä.
|
@@ -4,4 +4,4 @@ Bienvenue <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Si l'URL ci-dessus ne fonctionne pas
|
7
|
+
Si l'URL ci-dessus ne fonctionne pas essayez de le copier et le coller dans votre navigateur. Si vous avez encore des problèmes, s'il vous plaît n'hésitez pas à nous contacter.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Benvido <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
A
|
3
|
+
A túa conta foi activada.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Se o URL enriba non
|
7
|
+
Se o URL enriba non funcionar, probe copiar e pegar no seu navegador. Se segue a ter problema, non dubide en contactar connosco.
|
@@ -4,4 +4,4 @@
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
यदि
|
7
|
+
यदि यूआरएल की कोशिश काम नहीं करता इसके बाद के संस्करण को कॉपी करने और अपने ब्राउज़र में चिपकाने के. यदि आप समस्या जारी रहती है, मुफ्त के लिए हमसे संपर्क करें लगता है कृपया.
|
@@ -4,4 +4,4 @@ Dobrodošli <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Ako gore navedeni URL ne radi
|
7
|
+
Ako gore navedeni URL ne radi pokušati kopirati i zalijepiti u svoj preglednik. Ako i dalje imate problem, slobodno nas kontaktirajte.
|
@@ -1,7 +1,7 @@
|
|
1
|
-
|
1
|
+
Welcome <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
|
3
|
+
Az Ön számlája nem aktív.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Ha a fenti URL-cím nem működik,
|
7
|
+
Ha a fenti URL-cím nem működik, próbáld másolja be a böngésző. Ha továbbra is probléma, kérjük lépjen kapcsolatba velünk.
|
@@ -1,7 +1,7 @@
|
|
1
|
-
Selamat
|
1
|
+
Selamat <%= h(@user.login) %>,
|
2
2
|
|
3
3
|
Account Anda telah diaktifkan.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Jika URL di atas tidak bekerja coba salin dan sisipkan ke browser Anda. Jika Anda
|
7
|
+
Jika URL di atas tidak bekerja coba salin dan sisipkan ke browser Anda. Jika Anda tetap mengalami masalah, jangan ragu untuk menghubungi kami.
|
@@ -1,7 +1,7 @@
|
|
1
|
-
|
1
|
+
Benvenuto <%= h(@user.login) %>,
|
2
2
|
|
3
3
|
Il tuo account è stato attivato.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Se l'URL sopra indicato non funziona provare a copiare e incollare nel
|
7
|
+
Se l'URL sopra indicato non funziona provare a copiare e incollare nel vostro browser. Se si continua ad avere problemi, non esitate a contattarci.
|
@@ -1,7 +1,7 @@
|
|
1
|
-
<%= h(@user.login)
|
1
|
+
<%= h(@user.login) %>, 오신 것을 환영합니다
|
2
2
|
|
3
3
|
귀하의 계정이 활성화되었습니다.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
시도가 작동하지 않는
|
7
|
+
만약 URL이 시도가 작동하지 않는 이상 복사하여 브라우저에 붙여 넣어보세요. 만약 문제가 계속 발생하면, 저희에게 연락 주시기 바랍니다.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Sveiki <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
Jūsų sąskaita
|
3
|
+
Jūsų sąskaita buvo aktyvuota.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Jei
|
7
|
+
Jei pirmiau nurodytu URL neveikia, nukopijuokite ir įklijuokite jį į savo naršyklę. Jei jums vis dar kyla problemų, nedvejodami susisiekite su mumis.
|
@@ -4,4 +4,4 @@ Welcome <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Ja iepriekš URL nestrādā, mēģiniet
|
7
|
+
Ja iepriekš URL nestrādā, mēģiniet kopējot un ielīmējot to savā pārlūkprogrammā. Ja jums joprojām ir problēmas, lūdzu, nekautrējieties sazināties ar mums.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Merħba <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
Kont tiegħek
|
3
|
+
Kont tiegħek ġie attivat.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Jekk il-URL t'hawn fuq ma taħdimx
|
7
|
+
Jekk il-URL t'hawn fuq ma taħdimx tipprova tikkopja u pasta huwa fil-browser tiegħek. Jekk inti tkompli jkollha problema, jekk jogħġbok tħossok liberu li tikkuntattjana.
|
@@ -4,4 +4,4 @@ Welkom <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Als de bovenstaande URL werkt
|
7
|
+
Als de bovenstaande URL niet werkt probeer te kopiëren en te plakken in uw browser. Als u nog steeds problemen hebben, neem dan gerust contact met ons op.
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Velkommen <%= h(@user.login) %>,
|
2
2
|
|
3
|
-
|
3
|
+
Din konto har blitt aktivert.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Hvis
|
7
|
+
Hvis nettadressen ovenfor virker ikke prøve å kopiere og lime den inn i nettleseren. Hvis du fortsatt har problemer, kan du gjerne kontakte oss.
|
@@ -4,4 +4,4 @@ Witamy <%= h(@user.login) %>,
|
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
|
7
|
+
Jeżeli do powyższego adresu URL nie działa, spróbuj skopiować i wkleić go do przeglądarki. Jeśli nadal masz problem, prosimy o kontakt.
|
@@ -1,7 +1,7 @@
|
|
1
|
-
Bine
|
1
|
+
Bine aţi venit <%= h(@user.login) %>,
|
2
2
|
|
3
3
|
Contul dvs. a fost activat.
|
4
4
|
|
5
5
|
<%= root_url %>
|
6
6
|
|
7
|
-
Dacă URL-ul de mai sus nu funcţionează, încercaţi să copiaţi şi să inseraţi
|
7
|
+
Dacă URL-ul de mai sus nu funcţionează, încercaţi să copiaţi şi să îl inseraţi în browser. Dacă aveţi în continuare probleme, vă rugăm să nu ezitaţi să ne contactaţi.
|