69 commits

Author	SHA1	Message	Date
zmagod	88d7cb200e	removed quill	2017-01-18 23:06:14 +01:00
zmagod	65fa631b1c	adding tinyMce first run	2017-01-18 22:40:08 +01:00
Luka Murn	cf72da5635	Merge branch 'improved-files-handling' into 'master' ... Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb	2017-01-18 11:29:40 +01:00
zmagod	3a1ec0eb5e	refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]	2017-01-11 14:56:47 +01:00
zmagod	89e8946a47	expand smart annotation	2017-01-10 14:14:21 +01:00
Oleksii Kriuchykhin	4c9c9037ed	Enable image preview after editing protocol and disable preview modal animation [SCI-868]	2017-01-09 17:19:46 +01:00
Oleksii Kriuchykhin	aa2b573278	Enable image preview while editing steps and code style improvements [SCI-694]	2017-01-06 15:58:23 +01:00
Oleksii Kriuchykhin	d2b76d8385	Improved image preview modal [SCI-694]	2016-12-19 17:36:18 +01:00
Zmago Devetak	c8631077df	Merge pull request #361 from biosistemika/improved-sample-table ... Improved sample table	2016-12-16 15:37:54 +01:00
zmagod	897e34a23b	reinitialize highlight.js after ajax call	2016-12-16 11:44:42 +01:00
zmagod	b87246c8c2	cleanup spinner after edit step	2016-12-16 11:10:03 +01:00
zmagod	50c9dd3f59	fixed typo	2016-12-14 14:40:56 +01:00
zmagod	e23be6cc0e	fixed step description links [fixes SCI-780]	2016-12-09 15:26:41 +01:00
zmagod	de3099e4d1	removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository	2016-12-09 13:59:49 +01:00
zmagod	40fdfef67f	setup delayed_paperclip gem	2016-12-08 15:24:14 +01:00
zmagod	ac52e643be	cleanup direct upload	2016-12-08 11:26:13 +01:00
zmagod	8d7285ce7c	load comments after edit step [fixes SCI-716]	2016-11-22 14:39:08 +01:00
Matej Zrimšek	a6a2a237aa	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02: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/protocols/steps.js (Browse further)