66 commits

Author	SHA1	Message	Date
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
Oleksii Kriuchykhin	aa2b573278	Enable image preview while editing steps and code style improvements [SCI-694]	2017-01-06 15:58:23 +01:00
zmagod	a434649f42	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-01-03 16:35:25 +01:00
Oleksii Kriuchykhin	d2b76d8385	Improved image preview modal [SCI-694]	2016-12-19 17:36:18 +01:00
zmagod	897e34a23b	reinitialize highlight.js after ajax call	2016-12-16 11:44:42 +01:00
Luka Murn	f5795f5516	Remove unused assets & helpers	2016-11-18 11:30:03 +01:00
Matej Zrimšek	a6a2a237aa	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02:00
zmagod	d90f17d1eb	clean comments date duplication [fixes SCI-469]	2016-10-05 08:42:32 +02:00
Jure Grabnar	f727289935	Add lock check for editing result	2016-10-03 13:43:35 +02:00
Jure Grabnar	e096f936f9	Add formulas to results	2016-09-13 09:44:17 +02:00
Matej Zrimšek	e4a6a3944e	Added deleting of files on S3 server when editing/removing a file. Some refactoring.	2016-08-17 18:13:35 +02:00
Matej Zrimšek	ccdccc5cf1	Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.	2016-08-17 18:11:13 +02:00
Matej Zrimšek	951cf67b3d	A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.	2016-08-17 18:08:21 +02:00
Matej Zrimšek	86880f0299	Additional changes, refactoring and improvements.	2016-08-17 17:57:54 +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