scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
4262 commits 77 branches 180 tags 167 MiB
Commit graph

75 commits

Author SHA1 Message Date
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
Mojca Lorber
086f937fbb fix empty space and blockquote padding - rich text editing 2016-11-18 12:43:57 +01:00
zmagod
b781db9667 fixed bullets 2016-11-16 15:30:14 +01:00
zmagod
67c508a891 fixes description label [fixes SCI-662] 2016-11-14 13:47:20 +01:00
Mojca Lorber
ab0879e8d6 Integrate library with default settings 2016-11-09 13:09:53 +01:00
Matej Zrimšek
ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
zmagod
ea305b356a fixes protocol steps [fixes SCI-548] 2016-10-11 09:10:12 +02:00
Jure Grabnar
0c7cd52dba Add WOPI icons/buttons to files 2016-10-04 12:34:43 +02:00
Jure Grabnar
d9fa882d6a Add check for locked files on step delete 2016-10-01 14:51:55 +02:00
Mojca Lorber
c9fbf845f1 Remove Info tab and change comment title 2016-09-29 14:37:29 +02:00
Mojca Lorber
5d905f0094 refactoring 2016-09-29 14:18:04 +02:00
Jure Grabnar
e96e8486ea Add check file permissions to assets controller 
SCI-502 #close
 2016-09-28 09:33:44 +02:00
Jure Grabnar
0e9756ad94 Fix bad step view rebase 2016-09-28 09:33:44 +02:00
Nejc Bernot
1b260785ec First working version of office integration 
Only works on scinote-preview
 2016-09-28 09:33:44 +02:00
zmagod
9f56df02d2 removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
zmagod
cd64e035c0 set form validations 2016-09-20 09:50:03 +02:00
zmagod
f48553e807 fixed ajax call 2016-09-19 16:12:07 +02:00
zmagod
e90f0bd3d5 refactor step view 2016-09-16 09:04:21 +02:00
zmagod
0a2ab57e28 styled new comments layout 2016-09-15 11:45:51 +02:00
zmagod
e3ae22763e removed comments tab in protocol step 2016-09-15 08:46:14 +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