scinote-web/app/views/users
Luka Murn 26d04b1f3c Merge branch 'rich-text-formatting' into 'master'
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
2016-11-17 16:39:33 +01:00
..
confirmations Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
invitations Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
mailer Bugfix for notification emails 2016-10-13 12:12:28 +02:00
passwords Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
registrations Merge branch 'gamification' into 'master' 2016-11-17 16:30:18 +01:00
sessions Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
settings Merge branch 'rich-text-formatting' into 'master' 2016-11-17 16:39:33 +01:00
shared Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
unlocks Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00