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 |
|
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
|
859bf562ad
|
Merge pull request #391 from Ducz0r/lm-sci-290
Add mention system for users to step comments
|
2017-01-10 10:44:06 +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 |
|
okriuchykhin
|
57e1e1ec90
|
Merge pull request #364 from okriuchykhin/ok_SCI_694
Added modal for images preview [SCI-694]
|
2017-01-09 11:46:16 +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 |
|