scinote-web/app/controllers/users
Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master'
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
2017-01-18 11:29:40 +01:00
..
confirmations_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00
invitations_controller.rb Fix inviting users not working 2016-12-01 15:46:37 +01:00
omniauth_callbacks_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00
passwords_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00
registrations_controller.rb Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
sessions_controller.rb Some token authentication refactoring and error handilng fixes. [closes SCI-689] 2016-12-01 15:38:56 +01:00
settings_controller.rb Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
unlocks_controller.rb Initial commit. 2016-02-12 16:52:43 +01:00