25 Commits

Author SHA1 Message Date
Nishanth Vijayan
1c1e56ed46 Change update/save failures to use flash type :error instead of :alert 2016-03-16 11:20:56 +05:30
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
Stella Rouzi
bc2b262510 add username and nickname in user#show and styling changes 2015-06-11 15:13:03 +03:00
Stella
80fbc144ac remove user deletion until further notice 2015-01-18 22:01:05 +02:00
Stella
2b749fb1c5 Add clarification when updating user's email 2014-11-12 13:20:51 +02:00
Stella Rouzi
17ebad413e base controller
Conflicts:
	app/controllers/admin/commercials_controller.rb
	app/controllers/admin/questions_controller.rb
	app/controllers/admin/users_controller.rb
2014-08-14 11:36:07 +03:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
f169049003 write in 1 single line actions with no body
Conflicts:
	app/controllers/admin/contacts_controller.rb
2014-08-13 22:53:14 +03:00
Stella Rouzi
ed11253d4f fix style 2014-08-13 22:53:14 +03:00
Stella Rouzi
71dfb3b7e4 fix conflicts 2014-08-13 22:53:13 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
9dd866f17d Adds 'new' method to admin/users controller, to render new user template, fixes #380 2014-08-01 14:35:25 +05:30
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Gopesh Tulsyan
f84f3b97a7 some basic tests for admin/users controller, fixed bug in admin/users controller for displaying users
Fixes by hounci violations
2014-06-02 18:22:55 +05:30
alterpub
d2ac8a30c0 redesigned fix 2014-05-12 17:53:07 +04:00
alter
42d65aef23 Update users_controller.rb 2014-05-05 02:49:35 +04:00
alter
7c57675693 Update users_controller.rb 2014-05-05 02:44:08 +04:00
alterpub
0eb82bb11f Fixed /admin/users
ArgumentError in Admin::UsersController#index
wrong number of arguments (1 for 0)

Rails 4 has depricated "all" method, now it's default behaviour
2014-05-05 02:28:46 +04:00
Gopesh Tulsyan
481fcc9f60 Admin able to delete users except admins 2014-03-27 20:14:52 +05:30
differentreality
4532ad8c0a new registration 2013-07-12 19:29:48 +03:00
differentreality
5437cd5226 attended field as true in new registrations created by admin 2013-07-12 13:37:29 +03:00
differentreality
949cbd6a6c error messages 2013-07-12 13:31:42 +03:00
differentreality
d2709f0570 admin adds new user/person and registration 2013-07-12 13:31:41 +03:00
Henne Vogelsang
252e1fe544 Completely rework the navigation
Get rid of the admin layout
Get rid of the navbar custom style, use bootstrap-sass variables instead
Get rid of all the scaffold files
2013-06-27 16:58:20 +02:00
Matt Barringer
90b30db9e8 First checkin 2013-01-07 09:04:09 +01:00