Commit graph

2384 commits

Author SHA1 Message Date
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
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
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
7835753d3c Add atwho-users URL to <body> 2017-01-06 12:48:37 +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
488613afcc Add index to users' full name attribute 2017-01-05 16:26:49 +01:00
Oleksii Kriuchykhin
4fe3030ad4 Freeze WHITELISTED_ATTRIBUTES constatnt [SCI-102] 2017-01-05 16:13:00 +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