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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
Mojca Lorber
|
0011474ea3
|
fix hound
|
2017-01-03 17:43:55 +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 |
|
Luka Murn
|
af9e272b2a
|
Re-add tags index controller action to render tags
Closes SCI-166.
|
2017-01-03 09:39:41 +01:00 |
|
Zmago Devetak
|
5d0e80a5e1
|
Merge pull request #369 from ZmagoD/zd_SCI_812
fixes bug with samples sorting [fixes SCI-812]
|
2017-01-03 08:56:59 +01:00 |
|
Oleksii Kriuchykhin
|
c77c83752e
|
Remove unused css class link-look [SCI-819]
|
2016-12-30 15:50:43 +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
|
68ac3486c7
|
Merge pull request #381 from okriuchykhin/ok_SCI_275
Add task name to project activity [SCI-275]
|
2016-12-30 15:32:08 +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 |
|
okriuchykhin
|
cce57d066c
|
Merge pull request #370 from okriuchykhin/ok_SCI_817
Fix issue with long samples column names in import modal [SCI-817]
|
2016-12-30 15:29:32 +01:00 |
|
okriuchykhin
|
e8955b0304
|
Merge pull request #375 from okriuchykhin/ok_SCI_361
Add sorting to Project's experiments overview [SCI-361]
|
2016-12-30 15:28:53 +01:00 |
|
Oleksii Kriuchykhin
|
f076226b3f
|
Add task name to project activity [SCI-275]
|
2016-12-29 16:31:48 +01:00 |
|
Oleksii Kriuchykhin
|
d798f1b120
|
Fix XSS vulnerability in protocol keywords [SCI-632]
|
2016-12-29 15:15:29 +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 |
|
Oleksii Kriuchykhin
|
4d3e002c81
|
Add sorting to Project's experiments overview [SCI-361]
|
2016-12-23 15:40:01 +01:00 |
|
Luka Murn
|
4b50c73474
|
Merge pull request #363 from Ducz0r/lm-sci-546-fix
Restyle step table display in reports [SCI-546]
|
2016-12-23 12:57: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 |
|
Luka Murn
|
3922be2b17
|
Change String in sample types & groups
Closes SCI-808.
|
2016-12-23 11:48:57 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
53ea09c3de
|
Fix issue with long samples column names in import modal [SCI-817]
|
2016-12-21 14:34:53 +01:00 |
|
zmagod
|
e2723a288c
|
fixes bug with samples sorting [fixes SCI-812]
|
2016-12-21 14:32:28 +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 |
|
Luka Murn
|
a48eaf662e
|
Restyle step table display in reports so
Closes SCI-546.
|
2016-12-19 15:09:49 +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
|
8738b3e09d
|
Added image preview to Results [SCI-694]
|
2016-12-16 15:55:46 +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 |
|