scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
scinote-web/app/views/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
..
confirmations Remove link to "Resend confirmation instructions" if not neccesary 2016-11-29 16:12:35 +01:00
invitations adds environment variable that disables/enables the creation of new team when user sign up 2017-10-25 15:29:04 +02:00
mailer fixes email link [fixes SCI-765] 2017-03-24 12:10:07 +01:00
passwords integration tests for forgot_password [fixes SCI-1576] 2017-11-08 16:23:52 +01:00
registrations refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
sessions Remove link to "Resend confirmation instructions" if not neccesary 2016-11-29 16:12:35 +01: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
shared refactor 2018-03-01 17:52:24 +01:00
unlocks Remove link to "Resend confirmation instructions" if not neccesary 2016-11-29 16:12:35 +01:00