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 |
|
zmagod
|
1840fdb7e5
|
cleanup js
|
2017-01-12 09:52:29 +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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Luka Murn
|
7835753d3c
|
Add atwho-users URL to <body>
|
2017-01-06 12:48:37 +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 |
|
Luka Murn
|
b614ce714b
|
Restyle atwho dropdown
|
2017-01-05 14:06:48 +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
|
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
|
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 |
|
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
|
a0704cd873
|
remove duplicated includes of css and js
|
2017-01-03 17:33:01 +01:00 |
|
Mojca Lorber
|
c476faca30
|
fix hound
|
2017-01-03 11:04:09 +01:00 |
|
Mojca Lorber
|
e555535dfb
|
add edit button to protocol preview modal
|
2017-01-03 10:04:14 +01:00 |
|
Oleksii Kriuchykhin
|
0d01a4b2bd
|
Remove unneeded function from utils.js [SCI-819]
|
2016-12-30 15:50:43 +01:00 |
|
Oleksii Kriuchykhin
|
4065be9e4e
|
Fix marking of selected option [SCI-819]
|
2016-12-30 15:50:43 +01:00 |
|
Oleksii Kriuchykhin
|
e22ff6f8bb
|
Fix an issue with sample editing and type/group dropdowns [SCI-819]
|
2016-12-30 15:50:43 +01:00 |
|
okriuchykhin
|
2474eac37d
|
Merge pull request #367 from okriuchykhin/ok_SCI_818
Fix sample info popup [SCI-818]
|
2016-12-30 15:43:28 +01:00 |
|
okriuchykhin
|
e826791429
|
Merge pull request #365 from okriuchykhin/ok_SCI_807
Fix buttons disappear when deleting columns in samples [SCI-807]
|
2016-12-30 15:43:13 +01:00 |
|
okriuchykhin
|
73478d7b5e
|
Merge pull request #372 from okriuchykhin/ok_SCI_816
Fix flash message display in samples table [SCI-816]
|
2016-12-30 15:30:14 +01:00 |
|
Oleksii Kriuchykhin
|
e156dbc987
|
Implement flash message hiding through module pattern [SCI-816]
|
2016-12-28 14:52:03 +01:00 |
|
Luka Murn
|
2304742d87
|
Add tooltips to samples column dropdown
Closes SCI-802.
|
2016-12-27 08:45:23 +01:00 |
|
Luka Murn
|
b931b20f02
|
Fix 2 bugs with comments editing
Closes SCI-820.
|
2016-12-23 20:41:23 +01:00 |
|
Luka Murn
|
fbc2be890c
|
Fix search on hidden columns in samples table
Closes SCI-813.
|
2016-12-23 19:56:54 +01:00 |
|
Luka Murn
|
87d8fece46
|
Fix bug on edit/cancel sample group page
Closes SCI-814.
|
2016-12-23 12:50:49 +01:00 |
|
mlorb
|
876ce37a96
|
Merge pull request #366 from mlorb/ml-sci-284
Samples - freeze header row and edit button... [SCI-284]
|
2016-12-23 12:29:41 +01:00 |
|
Mojca Lorber
|
40e3240a99
|
add content to preview modal
|
2016-12-22 11:43:11 +01:00 |
|
Luka Murn
|
5beaa26224
|
Update utils.js
Closes SCI-811.
|
2016-12-22 10:03:00 +01:00 |
|
Oleksii Kriuchykhin
|
ee5e0ad455
|
Fix flash message display in samples table [SCI-816]
|
2016-12-21 17:26:33 +01:00 |
|
Luka Murn
|
af6bf2aee1
|
Fix jQuery selector, make it work for new samples
|
2016-12-21 16:23:09 +01:00 |
|
Luka Murn
|
e52277bdad
|
Fix sample types & groups when editing sample in samples table
Closes SCI-811.
|
2016-12-21 13:15:55 +01:00 |
|
Oleksii Kriuchykhin
|
034976a709
|
Fix sample info popup [SCI-818]
|
2016-12-20 17:21:17 +01:00 |
|
Oleksii Kriuchykhin
|
00ea3a027c
|
Fix generation of preview url for new steps and results [SCI-694]
|
2016-12-20 16:10:53 +01:00 |
|
Oleksii Kriuchykhin
|
cbef971d85
|
Fix timeouts when fetching images from S3 [SCI-694]
|
2016-12-20 15:36:07 +01:00 |
|
Mojca Lorber
|
ba0214d1ff
|
staying on same page after saving a sample; fix button disappearance when adding new column
|
2016-12-20 15:19:31 +01:00 |
|
Mojca Lorber
|
165ec6144c
|
adjust columns width in table header when editing or adding new sample; and fix horizontal scrolling
|
2016-12-20 13:41:19 +01:00 |
|
Oleksii Kriuchykhin
|
42f71f4da8
|
Fix buttons disappear when deleting columns in samples datatable [SCI-807]
|
2016-12-20 09:49:21 +01:00 |
|
Oleksii Kriuchykhin
|
d2b76d8385
|
Improved image preview modal [SCI-694]
|
2016-12-19 17:36:18 +01:00 |
|
Mojca Lorber
|
d1e2354f4e
|
add scrolling functionality and remove bug with adding new column
|
2016-12-19 16:59:09 +01:00 |
|
zmagod
|
6f7f6a8b7f
|
removes dropdown sorting [fixes SCI-811]
|
2016-12-19 16:41:14 +01:00 |
|
zmagod
|
efe41817f2
|
removes sample group/type link in new sample form [fixes SCI-809]
|
2016-12-19 10:49:21 +01:00 |
|
Oleksii Kriuchykhin
|
b537feb8a0
|
Added large preview [SCI-694]
|
2016-12-16 17:07:08 +01:00 |
|
Oleksii Kriuchykhin
|
0541253ffa
|
Added modal for images preview [SCI-694]
|
2016-12-16 15:53:16 +01:00 |
|
Zmago Devetak
|
90a115fff3
|
Merge pull request #342 from ZmagoD/zd_SCI_758
Generate png preview images for uploaded TIFF images
|
2016-12-16 15:39:07 +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 |
|
Zmago Devetak
|
c9d38a5454
|
Merge pull request #359 from ZmagoD/zd_SCI_804
disables sorting and columns dropdown when editing or adding new samp…
|
2016-12-16 12:56:11 +01:00 |
|
Zmago Devetak
|
601594fdb9
|
Merge pull request #355 from ZmagoD/zd_fix_mozilla_compatibility_issue
fixes compatibility issue on mozilla firefox
|
2016-12-16 11:57:18 +01:00 |
|
Zmago Devetak
|
b35744d18e
|
Merge pull request #360 from ZmagoD/zd_update_gemfile
updated gemfile
|
2016-12-16 11:53:05 +01:00 |
|
zmagod
|
897e34a23b
|
reinitialize highlight.js after ajax call
|
2016-12-16 11:44:42 +01:00 |
|
zmagod
|
b87246c8c2
|
cleanup spinner after edit step
|
2016-12-16 11:10:03 +01:00 |
|
Zmago Devetak
|
ad9b25ba44
|
Merge pull request #356 from ZmagoD/zd_SCI_803
fixes bug with long column names in edit mode [fixes SCI-803]
|
2016-12-16 11:02:42 +01:00 |
|
Zmago Devetak
|
3d500800cd
|
Merge pull request #358 from ZmagoD/zd_SCI_805_801
removes error message from new type/group form [fixes SCI-805]
|
2016-12-16 10:54:23 +01:00 |
|
zmagod
|
25671c744a
|
disables sorting and columns dropdown when editing or adding new sampe [fixes SCI-804]
|
2016-12-16 09:50:45 +01:00 |
|
zmagod
|
fffa0d91da
|
removes error message from new type/group form [fixes SCI-805]
|
2016-12-15 16:17:34 +01:00 |
|
zmagod
|
7c88f3e0aa
|
fixed empty name error
|
2016-12-15 15:50:07 +01:00 |
|
zmagod
|
6755ebcbf8
|
fixes bug with long column names in edit mode [fixes SCI-803]
|
2016-12-15 15:26:51 +01:00 |
|
Zmago Devetak
|
daee14bed5
|
Merge pull request #343 from ZmagoD/zd_SCI_780
fixed step description links [fixes SCI-780]
|
2016-12-15 13:12:25 +01:00 |
|
zmagod
|
dc6e9dcbd8
|
fixes compatibility issue on mozilla firefox
|
2016-12-15 11:57:17 +01:00 |
|
Mojca Lorber
|
69d164da68
|
add new column on first position
|
2016-12-15 11:20:40 +01:00 |
|
zmagod
|
9083f84396
|
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_789
|
2016-12-15 11:03:19 +01:00 |
|
zmagod
|
3e31f114d4
|
app/assets/javascripts/samples/sample_datatable.js
|
2016-12-15 10:51:17 +01:00 |
|
zmagod
|
b164886270
|
fixed error mesage scroll
|
2016-12-15 10:44:23 +01:00 |
|
zmagod
|
b003d192c3
|
fixed edit mode
|
2016-12-15 09:54:38 +01:00 |
|
zmagod
|
ba58ac2a77
|
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796
|
2016-12-15 09:26:12 +01:00 |
|
zmagod
|
54fee339f8
|
cleanup unneeded code
|
2016-12-15 09:23:38 +01:00 |
|
zmagod
|
4d6a85ed7c
|
fixed sample groups colorpicker [fixes SCI-781]
|
2016-12-15 09:23:38 +01:00 |
|