ajugo
887d9a4f52
Samples - show all/show assigned [SCI-1277] ( #644 )
...
* Samples - show all/show assigned [SCI-1277]
* Some fixes in code
* Some minor fixes in code
* Omit present
* Correct missed present
* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Zmago Devetak
4b816f5322
Merge pull request #568 from ZmagoD/zd_SCI_1119
...
Add images to fields with rich text formatting
2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin
9055894d07
Add additional sanitization to search parameters in datatables [SCI-763]
2017-04-25 17:37:42 +02:00
zmagod
c25df63a14
add tinymce img importer and refactor input sanitize helper
2017-04-19 09:11:52 +02:00
zmagod
be5faad97c
fixes hound
2017-01-31 13:33:55 +01:00
zmagod
e59b2e039a
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939
2017-01-27 11:15:31 +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
zmagod
a507bb4d1f
hound
2017-01-25 15:40:35 +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
Matej Zrimšek
5d65627808
Fixed sample editing in samples table. [SCI-914]
2017-01-20 11:10:17 +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
Luka Murn
ffc2b56dff
Fix String quotes
2017-01-17 08:28:41 +01:00
Luka Murn
2f48409fdd
Merge pull request #409 from Ducz0r/lm-sci-813-fix-v2
...
Fix filter not working correctly with hidden custom columns [SCI-813]
2017-01-17 08:17:52 +01:00
Luka Murn
16955dcee6
Fix Hound errors.
2017-01-16 15:58:37 +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
Luka Murn
ba567284ed
Fix filter not working correctly with hidden custom columns
...
Closes SCI-813.
2017-01-13 17:03:19 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +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
okriuchykhin
404952336d
Merge pull request #400 from okriuchykhin/ok_SCI_846
...
Fixes sorting of custom columns in samples datatable [SCI-846]
2017-01-11 15:34:02 +01:00
Oleksii Kriuchykhin
094d0f0f71
Fixes sorting of custom columns in samples datatable [SCI-846]
2017-01-11 13:21:38 +01:00
zmagod
89e8946a47
expand smart annotation
2017-01-10 14:14:21 +01:00
Luka Murn
0cf5afa499
Merge pull request #376 from Ducz0r/lm-sci-813-fix
...
Fix search on hidden columns in samples table [SCI-813]
2017-01-10 11:27:56 +01:00
Oleksii Kriuchykhin
835e982292
SAnitize AJAX calls in controllers and datatables [SCI-102]
2017-01-05 13:12:22 +01:00
Luka Murn
fbc2be890c
Fix search on hidden columns in samples table
...
Closes SCI-813.
2016-12-23 19:56:54 +01:00
zmagod
01849a46db
removed unneeded lines
2016-12-21 15:40:07 +01:00
zmagod
a5a8bbf27a
fixed assigned column bug
2016-12-21 15:35:05 +01:00
zmagod
e2723a288c
fixes bug with samples sorting [fixes SCI-812]
2016-12-21 14:32:28 +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
Mojca Lorber
7d88e247fc
refactoring
2016-12-08 14:41:35 +01:00
Mojca Lorber
195055f9cf
change SAMPLES_TABLE_DEFAULT_STATE
2016-12-07 14:51:34 +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
Zmago Devetak
13697e8688
Merge pull request #58 from ZmagoD/zd_SCI_74
...
Filter search query for special chars [fixes SCI_74]
2016-08-17 10:00:47 +02:00
zmagod
c9ff249067
fixed hound alert
2016-08-12 11:11:52 +02:00
zmagod
6c7cfb4467
filter search query for special chars [fixes SCI_74]
2016-08-12 11:08:51 +02:00
zmagod
7653f2b9ec
fixed hound
2016-08-10 11:26:27 +02:00
zmagod
deb739efa6
fixes loading samples error in blank project
2016-08-10 09:13:12 +02:00
zmagod
fd8187370e
Feed the Hound part 3
2016-08-03 13:16:51 +02:00
zmagod
9d4a67a5b6
Feed the Hound 2
2016-08-03 13:11:46 +02:00
zmagod
57ac34e9f4
add samples to experiment page [fixes SCI-43]
2016-08-03 12:57:51 +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
