scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
1548 commits 70 branches 179 tags 165 MiB
Commit graph

131 commits

Author SHA1 Message Date
zmagod e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Luka Murn 3bf447b0f4 Fix bug where reCaptcha form wasn't working 2017-01-26 16:06:29 +01:00
Luka Murn 0baaf12de3 Re-display images & checkboxes in PDF reports 
Closes SCI-953.
 2017-01-26 10:46:58 +01:00
Luka Murn 8c5a52417c Merge pull request #445 from okriuchykhin/ok_SCI_940 
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
 2017-01-25 17:49:38 +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
Oleksii Kriuchykhin 5fe9261595 Fix error when referencing deleted sample in SA [SCI-949] 2017-01-25 15:54:12 +01:00
zmagod a507bb4d1f hound 2017-01-25 15:40:35 +01:00
zmagod f04a2f663a renamed organizations in config/ 2017-01-25 12:30:11 +01:00
zmagod 9ae799d52c rename organization/org/Organization to Team in datatables 2017-01-25 09:48:49 +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
Zmago Devetak 40bf293ec7 Merge pull request #441 from ZmagoD/zd_SCI_924 
adds smart annotation in task comments, refactor smart_annotation_par…
 2017-01-24 11:18:41 +01:00
okriuchykhin 7fa1f3d966 Merge pull request #438 from okriuchykhin/ok_SCI_921 
Remove unneeded HTML scrubber in protocol importer [SCI-921]
 2017-01-24 11:02:43 +01:00
zmagod 6e7fa21dd3 adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924] 2017-01-24 10:51:12 +01:00
Oleksii Kriuchykhin 2434c73a0c Remove unneeded HTML scrabber in protocol importer [SCI-921] 2017-01-24 09:52:38 +01:00
zmagod 20cde2654b fixed user without permissions bug [fixes SCI-922] 2017-01-23 10:53:42 +01:00
zmagod 9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +01:00
zmagod f2d5066dc7 fix some bugs 2017-01-19 11:37:59 +01:00
zmagod 65fa631b1c adding tinyMce first run 2017-01-18 22:40:08 +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
Zmago Devetak 1b9f7db385 Merge pull request #405 from ZmagoD/zd_SCI_832 
Visualization of User smart annotation after saving the field
 2017-01-18 09:36:42 +01:00
okriuchykhin 781a68e0d5 Merge pull request #415 from okriuchykhin/ok_SCI_888 
Add missed space in the string [SCI-888]
 2017-01-18 09:34:51 +01:00
zmagod cb0483a6e6 refactor 2017-01-18 08:34:29 +01:00
Oleksii Kriuchykhin ea8f6a8c6b Fix issue in report editor [SCI-102] 2017-01-17 14:21:59 +01:00
Oleksii Kriuchykhin 0ce71884a5 Add missed space in the string [SCI-888] 2017-01-16 17:09:41 +01:00
Luka Murn a2935c6620 Add sample info modal popup to sample smart annotations 
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').

Closes SCI-892.
 2017-01-16 15:52:02 +01:00
okriuchykhin 02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
zmagod 1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
Luka Murn 8b01f912a0 Fix new year problems with activities 
Closes SCI-876.
 2017-01-12 14:47:15 +01:00
Oleksii Kriuchykhin d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin 0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
zmagod 3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
zmagod a4aa933151 refactor smart annotation parser helper 2017-01-11 10:34:14 +01:00
zmagod a903772de8 style dropdown 2017-01-10 17:05:32 +01:00
zmagod e0e998a0d8 add smart annotation parser helper 2017-01-10 14:14:21 +01:00
mz3944 ef431da2db Merge pull request #389 from mz3944/mz-sci-848 
Unable to delete samples [SCI-848]
 2017-01-09 11:57:48 +01:00
Matej Zrimšek 5d104981fd Fixed sample deletion on experiments level. Minor refactoring. [SCI-848] 2017-01-06 14:23:20 +01:00
Mojca Lorber aad2eadeae syntax fix 2017-01-06 10:46:36 +01:00
Mojca Lorber 4e7e261225 fix protocol preview 2017-01-06 10:10:33 +01:00
Oleksii Kriuchykhin 9987993ce0 Avoid sanitizing of data attributes [SCI-102] 2017-01-05 16:05:48 +01:00
Oleksii Kriuchykhin 1009347026 Add list of whitelisted attributes [SCI-102] 2017-01-05 15:33:41 +01:00
Oleksii Kriuchykhin 0ecb6904d4 Add user input sanitizing in the models [SCI-102] 2017-01-05 13:31:35 +01:00
Oleksii Kriuchykhin cd3924afd3 Sanitize .html_safe marked strings which contain tags [SCI-102] 2017-01-05 13:04:19 +01:00
Oleksii Kriuchykhin 9c4191a1e0 Initial code commit [SCI-102] 2017-01-05 13:04:19 +01:00
Luka Murn 3bee9d2e12 Save an (yet unworking) version of user smart annotations 
Used so other devs can start working on smart annotations.
 2017-01-04 10:54:02 +01:00
Zmago Devetak c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +01:00
zmagod 6d2fb3b02c Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790 2016-12-14 17:05:00 +01:00
zmagod 1ff98bb6df adds tooltip to samples dropdown and column names 2016-12-14 13:36:10 +01:00
zmagod 9037ab3f48 fixed navigation link 2016-12-14 10:35:48 +01:00
zmagod 8dd8a7e7cd Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777 2016-12-12 15:52:25 +01:00