Commit graph

5 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
zmagod 59f7bdb54e hide flash after 5 sec [fixes SCI-660] 2016-11-11 12:30:48 +01:00
Luka Murn 55f9633d1d Add jQuery.autosize plugin 2016-11-11 09:09:41 +01:00
Mojca Lorber ab0879e8d6 Integrate library with default settings 2016-11-09 13:09:53 +01:00
Matej Zrimšek ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Renamed from app/assets/javascripts/application.js (Browse further)