15 commits

Author	SHA1	Message	Date
Zmago Devetak	00be4460cc	Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step ... Fixes bug with embedded images [SCI-1624]	2017-12-12 09:53:24 +01:00
zmagod	7442684846	fix protocol preview, remove unneeded functions, fix copy paste tokens	2017-11-28 14:16:20 +01:00
zmagod	e233fbe1d8	fix image removing from tinymce	2017-11-28 11:01:07 +01:00
zmagod	e69e9f6794	remove unneeded comment and add tiny_mce_asset regex in a constant	2017-11-24 17:04:01 +01:00
zmagod	066c782cd2	Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step	2017-11-24 16:29:32 +01:00
Mojca Lorber	fe5828fa97	add copying of TinyMce assets when cloning the protocol	2017-11-22 16:47:21 +01:00
zmagod	ef1025e0ee	fixes hound	2017-10-02 18:11:54 +02:00
zmagod	3dc3ed906f	fixes bug with embedded images [fixes SCI.1624]	2017-10-02 18:06:42 +02:00
Luka Murn	f298ec54e7	Code beautification per @zmagod's request ... Closes SCI-1321.	2017-06-06 07:58:46 +02:00
Luka Murn	8c7aebbb88	Fix bug with TinyMCE not working for steps with nil description ... Closes SCI-1321.	2017-06-05 17:43:03 +02:00
zmagod	2d69896897	fixes pdf export and image size [fixes SCI-1247]	2017-05-09 13:59:59 +02:00
zmagod	d6f303581f	refactor	2017-05-08 12:56:33 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +02:00
zmagod	55c8c498e2	add image upload functionality to result text	2017-04-24 12:28:27 +02:00
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00