scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-08 16:40:16 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app/assets/javascripts/projects
History
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
..
canvas.js Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
index.js Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
introdutory_popup.js uncomment js file 2016-08-25 18:49:49 +02:00
show.js set ajax loading of experiments images [fixes SCI-349] 2016-08-22 11:29:19 +02:00