Commit Graph

23 Commits

Author SHA1 Message Date
viehlieb 3ffdb424d5 replace deprecated update_attributes with update 2022-10-26 13:19:27 +02:00
Harald Reingruber 0a6345c60b
Make columns of user and ordergroup lists sortable
This commit implements the sort functionality for the user lists (by name, email, last_activity) and ordergroup lists (by name).
It is a first attempt addressing issue #560.
2022-05-27 17:06:25 +02:00
Patrick Gansterer 6d71bd2c2f Fix active ordergroup 2022-02-18 12:54:07 +01:00
Patrick Gansterer ea2862fdef Run rubocop --fix-layout and remove encoding comments 2021-03-02 09:12:19 +01:00
Patrick Gansterer 2100c738af Change deprecated *_filter methods to *_action 2019-10-29 09:41:01 +01:00
Patrick Gansterer b05ac2ab64 Add deleted_at for User
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
Patrick Gansterer 273969ac90 Change sort order of ordergroups to ascending
Since we sort usually sort list ascending it seams strange to do this
different for ordergroups. So align the sort order with the other lists.
2016-03-04 15:59:35 +01:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
	Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen 6d3db7636a make search work without nickname usage 2013-09-20 23:18:06 +02:00
wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
Benjamin Meichsner 07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
wvengen c693f697ff workgroups i18n 2013-02-13 01:34:58 +01: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 29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni 6ddef7267a Refactored items_per_page. Start on admin/workgroups. 2011-06-10 12:18:55 +02:00
benni a787b3cf24 Admin/users refactored. 2011-06-09 22:03:27 +02:00
benni 6ac04d5e19 Fixed foodcoop/ordergroups view. 2011-05-18 11:47:00 +02:00
benni 06f2cc2007 Fixed and refactored foodcoop/workgroups. 2011-05-16 00:34:43 +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
Benjamin Meichsner 0d910dfbbd Moved foodcoop/workgroups into new namespace foodcoop. Closes #20 2009-08-02 18:42:52 +02:00
Benjamin Meichsner 1a8026c5a7 Move foodcoop/ordergroups into nwe namespace foodcoop. Made it more restful. 2009-08-02 18:12:13 +02:00