scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-06 15:40:31 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/controllers/users
History
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
2018-04-12 13:16:46 +02:00
..
settings Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 2018-04-12 13:16:46 +02:00
confirmations_controller.rb
invitations_controller.rb Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960 2018-02-01 16:04:05 +01:00
omniauth_callbacks_controller.rb sign up with linkedIn account 2018-02-28 18:12:21 +01:00
passwords_controller.rb
registrations_controller.rb fix travis 2018-04-06 17:16:04 +02: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 byTheWay fix of Rails 5.1 bug 2017-12-14 14:18:17 +01:00
unlocks_controller.rb