Commit graph

1303 commits

Author SHA1 Message Date
Mojca Lorber
4250088447 fix broken scrolling functionality in samples table 2017-01-13 11:07:33 +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
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
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
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
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
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
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
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
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
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