scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 23:21:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
4262 commits 31 branches 181 tags 166 MiB
Commit graph

41 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
mz3944
bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011 
Wrapping up the permissions [SCI-2011]
 2018-03-06 07:10:40 +01:00
Matej Zrimšek
c5b0a6525b Some additional permission calls fixes, minor refactoring. 2018-03-06 06:56:35 +01:00
Oleksii Kriuchykhin
aa933ad1f4 Add extendable file types mappings for icons [PIP-46] 2018-02-26 14:23:02 +01:00
Matej Zrimšek
8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +01:00
zmagod
3dc3ed906f fixes bug with embedded images [fixes SCI.1624] 2017-10-02 18:06:42 +02:00
zmagod
55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod
c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
zmagod
7b16e5643e fix assets preprocesor for wopi files 2017-03-13 13:20:49 +01:00
zmagod
0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
Luka Murn
86a800a84e Open edit/view Office files in new browser tab/window 
Closes SCI-838.
 2017-03-06 14:12:18 +01:00
Oleksii Kriuchykhin
c55f3cb99c Add flag to disable simple_format in custom_auto_link [SCI-940] 2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin
310d8c1920 Refactor smart annotation/auto_link/simple_format rendering [SCI-940] 2017-01-25 17:18:19 +01:00
Luka Murn
53699193a2 Merge branch 'smart-annotations' 
Conflicts:
	app/assets/javascripts/comments.js.erb
	app/assets/javascripts/protocols/index.js
	app/assets/javascripts/protocols/steps.js.erb
	app/assets/javascripts/samples/sample_datatable.js.erb
	app/controllers/my_module_comments_controller.rb
	app/controllers/project_comments_controller.rb
	app/controllers/result_comments_controller.rb
	app/controllers/step_comments_controller.rb
	app/datatables/sample_datatable.rb
	app/views/my_module_comments/_comment.html.erb
	app/views/project_comments/_comment.html.erb
	app/views/projects/show/_experiment.html.erb
	app/views/reports/elements/_experiment_element.html.erb
	app/views/reports/elements/_result_comments_element.html.erb
	app/views/reports/elements/_result_text_element.html.erb
	app/views/reports/elements/_step_checklist_element.html.erb
	app/views/reports/elements/_step_comments_element.html.erb
	app/views/reports/elements/_step_element.html.erb
	app/views/result_comments/_comment.html.erb
	app/views/results/_result_text.html.erb
	app/views/step_comments/_comment.html.erb
	app/views/steps/_step.html.erb
	db/schema.rb
 2017-01-24 14:33:23 +01:00
Mojca Lorber
4ea154410a add to fields with rich text formatting 2017-01-19 15:27:24 +01:00
zmagod
65fa631b1c adding tinyMce first run 2017-01-18 22:40:08 +01:00
Oleksii Kriuchykhin
a490a12fb1 Add truncation of image description in the preview [SCI-873] 2017-01-18 13:28:56 +01:00
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
d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +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
Oleksii Kriuchykhin
cd3924afd3 Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +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
Oleksii Kriuchykhin
00ea3a027c Fix generation of preview url for new steps and results [SCI-694] 2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin
d2b76d8385 Improved image preview modal [SCI-694] 2016-12-19 17:36:18 +01:00
Oleksii Kriuchykhin
b537feb8a0 Added large preview [SCI-694] 2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin
8738b3e09d Added image preview to Results [SCI-694] 2016-12-16 15:55:46 +01:00
zmagod
de3099e4d1 removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository 2016-12-09 13:59:49 +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