Oleksii Kriuchykhin
96a9857dec
Add handling of popups in the end of the table [SCI-855]
2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin
fb49ce8be2
Improved tooltip handling in samples datatable [SCI-855]
2017-01-25 13:47:01 +01:00
Mojca Lorber
6905fc8c08
remove letter f
2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin
90e4b26c69
Fix openning of protocol preview with images [SCI-945]
2017-01-25 13:06:12 +01:00
zmagod
f04a2f663a
renamed organizations in config/
2017-01-25 12:30:11 +01:00
zmagod
8c035a1981
renames organization in assets
2017-01-25 12:12:27 +01:00
okriuchykhin
35b8638598
Merge pull request #446 from okriuchykhin/ok_SCI_902_v2
...
Add sanitization of group/type to sample edit [SCI-902]
2017-01-25 12:05:30 +01:00
zmagod
72e13beee3
renamed organizations in views
2017-01-25 12:01:23 +01:00
Mojca Lorber
2277af534c
fix table titles
2017-01-25 11:01:35 +01:00
zmagod
a6285f0431
renamed utilities
2017-01-25 10:24:50 +01:00
zmagod
9ae799d52c
rename organization/org/Organization to Team in datatables
2017-01-25 09:48:49 +01:00
zmagod
9d90b9b42a
rename Organization to Team in models
2017-01-24 17:08:48 +01:00
zmagod
c2c5616078
rename Organization to Team in controllers
2017-01-24 17:06:51 +01:00
Oleksii Kriuchykhin
fe6d6842c2
Add sanitization of group/type to sample edit [SCI-902]
2017-01-24 16:58:03 +01:00
zmagod
21c2f82582
rename controllers where org/organization
2017-01-24 16:57:14 +01:00
zmagod
a193850ae6
rename models where org/organization
2017-01-24 16:34:21 +01:00
Oleksii Kriuchykhin
365eef506c
Fixes merge conflicts with smart-annotations branch
2017-01-24 15:20:50 +01:00
okriuchykhin
f1483e4cad
Merge pull request #444 from okriuchykhin/ok_SCI_902_v2
...
Add sanitization to sample groups/types [SCI-902]
2017-01-24 14:44:55 +01:00
Oleksii Kriuchykhin
a04f05eeb3
Add sanitization to sample groups/types [SCI-902]
2017-01-24 14:39:54 +01:00
mlorb
02f314ce60
Merge pull request #443 from mlorb/ml_sci_919_v2
...
Remove table of content and customize link target [SCI-919]
2017-01-24 14:39:47 +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
4dc7998fdd
Remove table of content and customize link target
2017-01-24 13:10:01 +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
mlorb
4253e3de2b
Merge pull request #439 from mlorb/ml_sci_919
...
Remove functionalities from rich text formatting [SCI-919]
2017-01-24 11:03:34 +01:00
mz3944
34f832d123
Merge pull request #437 from mz3944/mz-sci-913
...
Added smart annotations when adding new sample in samples table [SCI-913]
2017-01-24 11:03:00 +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
Matej Zrimšek
b48e48e100
Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913]
2017-01-24 10:56:10 +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
Matej Zrimšek
2e041d9e81
Added smart annotations when adding new sample in samples table. [SCI-913]
2017-01-24 10:23:26 +01:00
Oleksii Kriuchykhin
2434c73a0c
Remove unneeded HTML scrabber in protocol importer [SCI-921]
2017-01-24 09:52:38 +01:00
Mojca Lorber
eb40513ada
remove functionalities from rich text formatting
2017-01-24 09:44:37 +01:00
Oleksii Kriuchykhin
401b37956b
Simplify protocol export start [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
d555ba7905
Add export to protocol management page and code style improvements [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
14a6705b55
Implemented protocol export through Zip::OutputStream [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
1abd7fc574
Added xml schemas and zip gem [SCI-742]
2017-01-23 17:34:02 +01:00
Oleksii Kriuchykhin
69f31a62e7
Initial code commit [SCI-742]
2017-01-23 17:33:10 +01:00
Zmago Devetak
674999f987
Merge pull request #436 from ZmagoD/zd_SCI_922
...
fixed user without permissions bug [fixes SCI-922]
2017-01-23 17:25:07 +01:00
zmagod
20cde2654b
fixed user without permissions bug [fixes SCI-922]
2017-01-23 10:53:42 +01:00
zmagod
9c3bc8dac7
fixes checklist item user popover bug [fixes SCI-907]
2017-01-23 09:47:04 +01:00
mz3944
fd63a1de12
Merge pull request #432 from mlorb/ml-sci-fix-847
...
Add dynamic length for sample type/group field when adding new sample [SCI-847]
2017-01-20 15:46:34 +01:00
mlorb
2d073c8c04
Merge pull request #430 from mlorb/ml_sci_826
...
Display smart annotations in reports [SCi-826]
2017-01-20 13:49:40 +01:00
Mojca Lorber
8e02c2e025
add locale - fix
2017-01-20 13:37:07 +01:00
mz3944
18a2e4c423
Merge pull request #433 from mz3944/mz-sci-914
...
Edit of a sample in sample table does not work
2017-01-20 13:02:05 +01:00
Zmago Devetak
c1e7cc83a7
Merge pull request #434 from ZmagoD/zd_SCI_915
...
Text is deleted when entering smart annotation in rich text editor
2017-01-20 13:01:29 +01:00
Zmago Devetak
7bd368e002
Merge pull request #431 from ZmagoD/zd_add_code_highlight
...
Fixes code highlight and smart annotations experiments bug
2017-01-20 12:59:21 +01:00
mlorb
9a3c56de97
Merge pull request #421 from mlorb/ml_sci_540
...
Protocol steps/results - adding titles for tables [SCI-540]
2017-01-20 11:41:49 +01:00
zmagod
71453398b1
bugfix
2017-01-20 11:33:49 +01:00
zmagod
4f7d62e79d
removes unneeded annotations [fixes SCI-915]
2017-01-20 11:33:10 +01:00
Matej Zrimšek
5d65627808
Fixed sample editing in samples table. [SCI-914]
2017-01-20 11:10:17 +01:00
Mojca Lorber
3789769af3
add dynamic length for sample type/group field when adding new sample
2017-01-20 09:53:44 +01:00
zmagod
9550c6dd35
fixes highlight.js
2017-01-19 17:09:25 +01:00
Mojca Lorber
6653f0d4c1
small fixes
2017-01-19 16:42:14 +01:00
Mojca Lorber
6de83ff53b
fix hound
2017-01-19 15:58:40 +01:00
Mojca Lorber
4ea154410a
add to fields with rich text formatting
2017-01-19 15:27:24 +01:00
Matej Zrimšek
54f8b01341
Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894]
2017-01-19 15:26:28 +01:00
Mojca Lorber
44de927cf4
display smart annotations in reports - without rich text fields
2017-01-19 14:22:54 +01:00
Oleksii Kriuchykhin
890c5e3c3d
Add “no results found” message in smart annotation [SCI-886]
2017-01-19 13:42:58 +01:00
Zmago Devetak
039a8d7da6
Merge pull request #426 from ZmagoD/zd_add_tinyMCE
...
Add tiny mce
2017-01-19 12:57:55 +01:00
zmagod
2cbb8ba41a
removed unneeded comments
2017-01-19 12:54:48 +01:00
mz3944
da604d2619
Merge pull request #427 from mz3944/mz-sci-908
...
Some smart annotations refactoring [SCI-908]
2017-01-19 12:15:20 +01:00
zmagod
f2d5066dc7
fix some bugs
2017-01-19 11:37:59 +01:00
Matej Zrimšek
5d86bbb812
Smart annotations improved documentation. [SCI-908]
2017-01-19 10:56:02 +01:00
Matej Zrimšek
fec83e8c45
Smart annotations refactoring. [SCI-908]
2017-01-19 10:55:43 +01:00
zmagod
2ccafdd670
bug fix
2017-01-19 10:12:01 +01:00
zmagod
27d3868f37
fix bugs
2017-01-19 09:40:39 +01:00
zmagod
88d7cb200e
removed quill
2017-01-18 23:06:14 +01:00
zmagod
65fa631b1c
adding tinyMce first run
2017-01-18 22:40:08 +01:00
okriuchykhin
18d329fb42
Merge pull request #423 from okriuchykhin/ok_SCI_896
...
Make search work for full names in smart annotations [SCI-896]
2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin
6555fd02b6
Make search work for full names in smart annotations [SCI-896]
2017-01-18 16:57:51 +01:00
okriuchykhin
7f6ceef9e9
Merge pull request #422 from okriuchykhin/ok_SCI_897
...
Remove sample type and group from smart annotation [SCI-897]
2017-01-18 16:26:25 +01:00
mz3944
b5e38afb64
Merge pull request #416 from mz3944/mz-sci-884
...
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
2017-01-18 16:13:19 +01:00
Matej Zrimšek
dbbb709bf2
Smart annotations minor refactoring. [SCI-884, SCI-889]
2017-01-18 16:04:39 +01:00
Matej Zrimšek
24458fe590
Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889]
2017-01-18 15:29:48 +01:00
Oleksii Kriuchykhin
e45749d3b2
Remove sample type and group from smart annotation [SCI-897]
2017-01-18 14:46:53 +01:00
Mojca Lorber
f656a1093d
fix hound
2017-01-18 14:40:24 +01:00
Mojca Lorber
6155a458e7
update search
2017-01-18 14:22:19 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22:19 +01:00
Mojca Lorber
3b92ab9f36
add names to tables from protocol steps in reports
2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
okriuchykhin
8a220c2351
Merge pull request #414 from okriuchykhin/ok_SCI_887
...
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
2017-01-18 13:50:22 +01:00
Oleksii Kriuchykhin
55d0e82fcd
Change If statement to ternary operator [SCI-887]
2017-01-18 13:43:21 +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
okriuchykhin
9dfa30fbb4
Merge pull request #418 from okriuchykhin/ok_SCI_855_v2
...
Remove previous fix for popups [SCI-855]
2017-01-18 11:00:54 +01:00
Oleksii Kriuchykhin
12eb1df69f
Remove previous fix for popups [SCI-855]
2017-01-18 10:59:00 +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
Matej Zrimšek
3085452ec9
Fixed some hound alerts. [SCI-884]
2017-01-17 11:04:16 +01:00
Matej Zrimšek
d3c33c9dca
Refactored smart annotation JS. [SCI-884]
2017-01-17 10:05:41 +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
Oleksii Kriuchykhin
0ce71884a5
Add missed space in the string [SCI-888]
2017-01-16 17:09:41 +01:00
Oleksii Kriuchykhin
50edaef4ff
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
2017-01-16 16:55:10 +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
Matej Zrimšek
2877126dc6
Fixed selected search filter button style. [SCI-884]
2017-01-16 12:52:03 +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
mlorb
88cc87d168
Merge pull request #408 from mlorb/ml-sci-847-v2
...
Adjust columns width in samples table header after selecting sample group [SCI-847]
2017-01-16 10:52:00 +01:00
Luka Murn
a0e9e5afa8
Merge pull request #402 from mz3944/mz-sci-848-v2
...
Unable to delete samples [SCI-848]
2017-01-16 10:47:13 +01:00
Luka Murn
0fd9660eb7
Merge pull request #403 from Ducz0r/lm-sci-876-fix
...
Year difference problems with notifications [SCI-876]
2017-01-14 10:01:38 +01:00
Luka Murn
1acf258c70
Fix minor Zmagohound comment
2017-01-14 10:00:52 +01:00
Mojca Lorber
9f1a49847e
fix table header again
2017-01-13 18:54:43 +01:00
Matej Zrimšek
15d7944302
Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889]
2017-01-13 18:51:05 +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
Mojca Lorber
5f7e0b2227
adjust columns width in samples table header after selecting sample group
2017-01-13 15:59:47 +01:00
okriuchykhin
1ae5e6f8a7
Merge pull request #406 from okriuchykhin/ok_SCI_855
...
Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]
2017-01-13 15:56:37 +01:00
Oleksii Kriuchykhin
a190ef36ff
Extend comment to make more clear [SCI-855]
2017-01-13 12:43:43 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin
097209bd9d
Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]
2017-01-13 11:34:05 +01:00
Mojca Lorber
bc6fbc5f91
fix hound
2017-01-13 11:18:44 +01:00
Mojca Lorber
4250088447
fix broken scrolling functionality in samples table
2017-01-13 11:07:33 +01:00
Oleksii Kriuchykhin
f567d0307e
Fix includes [SCI-102]
2017-01-12 17:02:01 +01:00
Oleksii Kriuchykhin
75031e17b9
Remove double sanitization from views [SCI-102]
2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin
69b65c27f8
Remove input sanitization in the models [SCI-102]
2017-01-12 16:20:37 +01:00
Luka Murn
bc03a26d4b
Also fix this new year issue on comments display
2017-01-12 15:06:12 +01:00
Luka Murn
8b01f912a0
Fix new year problems with activities
...
Closes SCI-876.
2017-01-12 14:47:15 +01:00
Matej Zrimšek
93a8e0bdae
Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848]
2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin
0350f2f792
Add html escaping to name filelds in the views [SCI-102]
2017-01-12 11:03:14 +01:00
zmagod
1840fdb7e5
cleanup js
2017-01-12 09:52:29 +01:00
Oleksii Kriuchykhin
d05c16b0ba
Added auto_link wrapper with custom sanitization [SCI-102]
2017-01-11 17:02:17 +01:00
mz3944
aba12b9b2c
Merge pull request #401 from mz3944/mz-sci-878
...
Protocol repository - user cannot download files
2017-01-11 16:25:45 +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
mlorb
fe1ef97523
Merge pull request #398 from mlorb/ml_sci_843
...
Adjust samples tables height when in edit mode selecting sample type/group [SCI-843]
2017-01-11 15:33:52 +01:00
Mojca Lorber
3a3f20a215
fix bug with different approach
2017-01-11 15:25:10 +01:00
zmagod
065e1a7120
fix hound
2017-01-11 15:06:00 +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
Matej Zrimšek
30a9c283fb
Added back bullets to images in protocol preview in protocol repository.
2017-01-11 14:15:07 +01:00
Matej Zrimšek
852dc2eb7e
Added file downloading to protocol preview in protocol repository. [SCI-878]
2017-01-11 14:14:12 +01:00
Oleksii Kriuchykhin
094d0f0f71
Fixes sorting of custom columns in samples datatable [SCI-846]
2017-01-11 13:21:38 +01:00
okriuchykhin
8d4b2d7373
Merge pull request #399 from okriuchykhin/ok_SCI_811_v2
...
Fix changed sample type and sample group in sample edit [SCI-811]
2017-01-11 11:37:38 +01:00
mlorb
90e644ddd9
Merge branch 'master' into ml_sci_843
2017-01-11 11:35:41 +01:00
mlorb
f0842389b2
Merge pull request #396 from mlorb/ml_sci_851
...
Change color of clickable names when row is selected in datatables [SCI-851]
2017-01-11 11:21:31 +01:00
mlorb
b898c792c4
Merge pull request #395 from mlorb/ml_sci_847
...
Adjust columns width in table header after selecting sample type/group [SCI-847]
2017-01-11 10:43:12 +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
Oleksii Kriuchykhin
a3d9e25feb
Fix changed sample type and sample group in sample edit [SCI-811]
2017-01-10 16:51:51 +01:00
Mojca Lorber
577e526fec
adjust samples tables height when in edit mode selecting sample type or group
2017-01-10 16:31:20 +01:00
zmagod
fc76a4ae6d
Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834
2017-01-10 14:22:04 +01:00
zmagod
89e8946a47
expand smart annotation
2017-01-10 14:14:21 +01:00
zmagod
e0e998a0d8
add smart annotation parser helper
2017-01-10 14:14:21 +01:00
zmagod
6efcf49927
working version of dropdown filter
2017-01-10 14:14:21 +01:00
zmagod
53d20df449
added xregexp
2017-01-10 14:14:21 +01:00
zmagod
94262b56ef
prepare data for atwho
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
Luka Murn
05be1e862f
Update filter after toggling visibility (if neccesary)
2017-01-10 11:26:12 +01:00
okriuchykhin
f8237e025a
Merge pull request #394 from okriuchykhin/ok_SCI_853
...
Fix non removable error messages in samples [SCI-853]
2017-01-10 11:00:01 +01:00
Luka Murn
5873eea994
We serve to please the Hound
2017-01-10 10:42:52 +01:00
Oleksii Kriuchykhin
4c9c9037ed
Enable image preview after editing protocol and disable preview modal animation [SCI-868]
2017-01-09 17:19:46 +01:00
Mojca Lorber
510731bd4e
change color of clickable nameswhen row is selected in datatables
2017-01-09 15:51:21 +01:00
Mojca Lorber
a0a7f35d44
adjust columns width in table header after selecting sample type/group
2017-01-09 15:00:07 +01:00
Oleksii Kriuchykhin
773b00933a
Improve multiple messages handling in samples [SCI-853]
2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin
0fd7688427
Fix hiding of error messages in the samples datatable [SCI-853]
2017-01-09 13:34:23 +01:00
okriuchykhin
3f930ccfce
Merge pull request #392 from okriuchykhin/ok_SCI_858
...
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 12:49:38 +01:00
mz3944
54ef2be94b
Merge pull request #383 from mz3944/mz-sci-845
...
Fixed samples table all rows un/checking. [SCI-845]
2017-01-09 11:58:44 +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
okriuchykhin
3c47d17019
Merge pull request #386 from okriuchykhin/ok_SCI_815
...
Improve error message when importing CSV files with incorrect character encoding [SCI-815]
2017-01-09 11:54:28 +01:00
zmagod
226d5d8247
added blank string to wopi-lock header param
2017-01-09 11:51:18 +01:00
mlorb
006db01b11
Merge pull request #390 from mlorb/ml_sci_850
...
Fix samples info popup error [SCI-850]
2017-01-09 11:38:50 +01:00
mlorb
f14ad0f762
Merge pull request #387 from mlorb/ml_sci_732
...
Add protocol preview to search results [SCI-732]
2017-01-09 11:28:04 +01:00
Oleksii Kriuchykhin
bc8db28746
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 09:38:42 +01:00
Luka Murn
0ee5b98977
Refactor code a bit, add dismiss button to header
2017-01-07 09:59:52 +01:00
Matej Zrimšek
72df48500d
Fixed samples table all rows un/checking. [SCI-845]
2017-01-06 18:19:20 +01:00
Mojca Lorber
6f7c08fa63
fix samples info popup error
2017-01-06 17:31:17 +01:00
Oleksii Kriuchykhin
89710d8782
Enable image preview for newly uploaded images [SCI-694]
2017-01-06 16:41:24 +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
mz3944
1b56e9d07c
Merge pull request #384 from mz3944/mz-sci-849
...
Fixes experiment button not being clicable in project overview page. …
2017-01-06 14:26:37 +01:00
Matej Zrimšek
ec7a1cb4c0
Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848]
2017-01-06 14:23:20 +01:00
Matej Zrimšek
5d104981fd
Fixed sample deletion on experiments level. Minor refactoring. [SCI-848]
2017-01-06 14:23:20 +01:00
Luka Murn
7835753d3c
Add atwho-users URL to <body>
2017-01-06 12:48:37 +01:00
Luka Murn
3cdd375a2d
Merge pull request #388 from biosistemika/hotfix-1.6.1
...
Hotfix 1.6.1
2017-01-06 11:23:16 +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
Mojca Lorber
356edba1b3
add protocol preview to search results
2017-01-05 18:08:59 +01:00
Oleksii Kriuchykhin
cba064dfcc
Improve error message whan importing CSV files with incorrect character encoding [SCI-815]
2017-01-05 17:00:21 +01:00
Luka Murn
488613afcc
Add index to users' full name attribute
2017-01-05 16:26:49 +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
Luka Murn
ef688feb4e
Hotfix 1.6.1
...
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
2017-01-05 15:27:18 +01:00
Matej Zrimšek
4b0f47675a
Fixes experiment button not being clicable in project overview page. [SCI-849]
2017-01-05 14:42:52 +01:00
Luka Murn
b614ce714b
Restyle atwho dropdown
2017-01-05 14:06:48 +01:00
Oleksii Kriuchykhin
0ecb6904d4
Add user input sanitizing in the models [SCI-102]
2017-01-05 13:31:35 +01:00
Oleksii Kriuchykhin
835e982292
SAnitize AJAX calls in controllers and datatables [SCI-102]
2017-01-05 13:12:22 +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
a78bb79618
Temp commit
2017-01-05 12:07:17 +01:00
Luka Murn
eb64162633
Remove Gem dependency, add atwho as regular vendor/js
2017-01-05 12:06:59 +01:00
Luka Murn
e12907c9b9
Remove original atwho css, apply our own
2017-01-05 10:52:28 +01:00
Luka Murn
09ef3b3ad5
Merge pull request #378 from Ducz0r/lm-sci-802-fix
...
Add tooltips to samples column dropdown [SCI-802]
2017-01-04 11:30:04 +01:00
Luka Murn
2c5b27ce81
Change "Update" to "Save"
...
Closes SCI-802.
2017-01-04 11:29:34 +01:00
mlorb
59751ec41e
Merge pull request #373 from mlorb/ml_sci_709
...
Add Protocol Preview to Protocol repository [SCI-709]
2017-01-04 11:28:55 +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
Luka Murn
23e60e0d01
Add Gems for smart annotations (atwho)
2017-01-04 10:51:55 +01:00
Luka Murn
cedc6c5074
Merge pull request #382 from Ducz0r/lm-sci-166-fix
...
Re-add tags index controller action to render tags [SCI-166]
2017-01-04 10:48:09 +01:00
Luka Murn
6402acc102
Merge pull request #377 from Ducz0r/lm-sci-820-fix
...
Fix 2 bugs with comments editing [SCI-820]
2017-01-04 10:47:29 +01:00
zmagod
87ffa7f03b
fixes X-WOPI-ServerVersion bug
2017-01-04 10:02:08 +01:00
Luka Murn
37cd6417c8
Merge pull request #374 from Ducz0r/lm-sci-808-814-fix
...
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
2017-01-04 09:50:26 +01:00
Mojca Lorber
fe37ac3b6d
fix hound 2
2017-01-03 17:46:30 +01:00