Commit Graph

18 Commits

Author SHA1 Message Date
Patrick Gansterer e16a0fb336 Add config option to disable the invites
Some foodcoops require that an admin adds all users to have more control
over the users.
2016-03-06 13:56:33 +01:00
Patrick Gansterer 1efd3745df Replace "count > 0" with "any?" 2016-03-04 20:01:56 +01:00
wvengen 1c0db4374f Merge pull request #332 from foodcoops/feature/edit-address
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
wvengen bf6a31a032 Cleanup groups view on profile page 2014-12-16 21:14:20 +01:00
wvengen 56f6efa590 Allow to edit address from user profile 2014-12-10 21:27:53 +01:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
	Gemfile.lock
2014-02-24 12:46:28 +01:00
Julius ed228c4bd7 Allow control of password autocomplete by flag 2013-12-22 23:21:14 +01:00
wvengen 3e1d561a5e fix user form field order and autocompletion 2013-12-22 13:28:33 +01:00
wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
wvengen de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
wvengen f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen 2b11549d33 finished home i18n 2013-02-04 00:46:22 +01:00
benni 1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni 6f7682d6a0 Fixed new user invite. 2012-08-06 12:00:40 +02:00
benni f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni c173cf4a6a my_profile and admin/ordergroups. 2011-06-10 01:36:04 +02:00