Commit graph

16 commits

Author SHA1 Message Date
Robert Waltemath
7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
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
wvengen
9ba425aafa fallback for when nick is nil 2013-10-29 19:05:24 +01:00
wvengen
78c81b194c i18n simple_form move of foodcoop 2013-10-09 23:00:07 +02:00
wvengen
1870276cd2 show user name with use_nick is false 2013-10-02 23:43:09 +02:00
wvengen
e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
Manuel Wiedenmann
0061e45198 removes routes locale constrain and fixes some bugs 2013-06-06 04:29:53 +02:00
wvengen
8043fd2164 finish foodcoop i18n + controller + model 2013-02-22 00:19:22 +01:00
benni
552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni
c0c41a7752 Fixed foodcoop/ordergroups and workgroups views. 2012-10-08 16:20:24 +02:00
benni
ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
benni
ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni
1e33411516 refactored some js stuff. Fixed forms in article modul. 2011-05-19 19:49:37 +02:00
benni
d5552059ce Refactored messages modul, but refactoring is still neccessary. 2011-05-18 14:47:17 +02:00
benni
c87ead8da9 Added meta where and jquery observe field. Fixed members view. 2011-05-15 23:43:23 +02:00
Benjamin Meichsner
5cf75ee32a Moved foodcoop/members into new foodcoop/users restful controller. 2009-08-02 19:01:45 +02:00