Commit graph

17 commits

Author SHA1 Message Date
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
Luka Murn a3bbf94643 Add a smart_text_area tag & implement it throughout application
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
2016-11-16 17:57:01 +01:00
Luka Murn 0ab62576a2 Add new modal to organization page, remove old modal code 2016-11-07 09:43:10 +01:00
Matej Zrimšek 21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Mojca Lorber 8f783f87f7 fixes hound 2016-10-12 15:32:40 +02:00
Mojca Lorber 42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Mojca Lorber 6bea0a9e1a fixes merge conflicts 2016-10-12 10:55:40 +02:00
Mojca Lorber 4f1cbad7da adding update notifications in settings 2016-10-12 10:42:07 +02:00
Oleksii Kriuchykhin 5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
zmagod de00a19dd9 fixes styling in settings preferences [SCI-553] 2016-10-06 13:22:44 +02:00
zmagod 9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
zmagod 6229e6a3a1 styled notification settings button [fixes SCI-529] 2016-10-04 16:12:56 +02:00
zmagod a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Matej Zrimšek 234918a76d 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
Luka Murn 61f4fbd1d4 Remove warning info when removing pending user from organization 2016-09-01 13:23:53 +02:00
Luka Murn 076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn 055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00