Commit graph

16 commits

Author SHA1 Message Date
Luka Murn 86a800a84e Open edit/view Office files in new browser tab/window
Closes SCI-838.
2017-03-06 14:12:18 +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
zmagod e554fdf805 code refactor 2016-12-21 16:52:15 +01:00
zmagod fafecce264 adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643] 2016-11-23 14:18:50 +01:00
zmagod b781db9667 fixed bullets 2016-11-16 15:30:14 +01:00
Mojca Lorber 456c6d1ad6 Copy rich text functionality to text results 2016-11-10 12:19:59 +01:00
Matej Zrimšek 0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
Jure Grabnar 0c7cd52dba Add WOPI icons/buttons to files 2016-10-04 12:34:43 +02:00
Jure Grabnar 03567d6208 Prevent archive of locked result asset 2016-10-03 17:07:57 +02:00
Jure Grabnar a2d6d9a29a Add WOPI controlls to result 2016-10-01 11:23:32 +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
zmagod 6bb8d075e0 truncate asset name in task step and result [fixes SCI-294] 2016-08-18 09:22:12 +02:00
Matej Zrimšek 27a9dac412 File permissions corrected, with some refactoring. 2016-08-17 18:23:24 +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