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 |
|
zmagod
|
f560a9999a
|
adds rake task for repocess file thumbnails [fixes SCI-831]
|
2017-01-13 15:06:20 +01:00 |
|
Oleksii Kriuchykhin
|
a190ef36ff
|
Extend comment to make more clear [SCI-855]
|
2017-01-13 12:43:43 +01:00 |
|
mlorb
|
db4af3fc15
|
Merge pull request #404 from mlorb/ml-sci-fix-284-881-843
Fix broken scrolling functionality in samples table [SCI-284-881-843]
|
2017-01-13 11:58:55 +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 |
|
Zmago Devetak
|
e6a8f46139
|
Merge pull request #393 from ZmagoD/zd_SCI_834
Smart annotations for Samples, Tasks, Experiments and Projects
|
2017-01-12 11:03:38 +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 |
|
okriuchykhin
|
f3b462bccb
|
Merge pull request #397 from okriuchykhin/ok_SCI_868
Enable image preview after editing protocol and disable preview modal animation [SCI-868]
|
2017-01-11 11:21:34 +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
|
ccdb7729d8
|
removed xregxep
|
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 |
|