Commit graph

16 commits

Author SHA1 Message Date
zmagod
b9b466cd8e Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas 2016-09-16 09:28:19 +02:00
zmagod
c4fabdb67a clean unneeded Observer configurations 2016-09-14 11:16:42 +02:00
zmagod
e1d871dcdb clear undefind from experiment name and refactor sidebar in reports [fixes SCI-448] 2016-09-14 11:11:35 +02:00
Jure Grabnar
fa3515d2eb Add formulas to reports 2016-09-13 09:46:21 +02:00
zmagod
a7b6135b2f cleared console.log 2016-09-06 10:08:32 +02:00
zmagod
28fa00c30c trim long words in reports [fixes SCI-105] 2016-09-01 15:45:39 +02:00
zmagod
5518d1cd1e fixed 16 step of tutorial 2016-08-30 08:52:44 +02:00
Matej Zrimšek
e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
mlorb
b1218cb3d6 Merge pull request #59 from biosistemika/ml_sci_244
fixes tutorial bug of inappropriate window [SCI-244]
2016-08-25 17:16:45 +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
Mojca Lorber
e6f205368b fixes tutorial bug of inappropriate window 2016-08-12 11:33:27 +02:00
Jure Grabnar
cafec6a1b4 Fix controls on experiment contents
Also fix bug with adjencent elements not updating controls.

Fixes SCI-35.
2016-08-04 16:05:03 +02:00
Jure Grabnar
da2a06c999 Fix global sort to work with experiments 2016-08-03 14:59:53 +02:00
Jure Grabnar
acc41dae40 Add experiment content report dialog
Adding still has to be implemented
2016-08-03 12:52:51 +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