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
|
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 |
|
Luka Murn
|
b614ce714b
|
Restyle atwho dropdown
|
2017-01-05 14:06:48 +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
|
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
|
e12907c9b9
|
Remove original atwho css, apply our own
|
2017-01-05 10:52:28 +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
|
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 |
|
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 |
|
zmagod
|
b07f9fae59
|
fixes new sample group/type link in sample row [fixes SCI-796]
|
2016-12-15 09:23:38 +01:00 |
|
zmagod
|
6d2fb3b02c
|
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790
|
2016-12-14 17:05:00 +01:00 |
|
zmagod
|
dfd472d37d
|
fixed column name after edit
|
2016-12-14 16:47:39 +01:00 |
|
zmagod
|
a9f8239516
|
fixed edit action
|
2016-12-14 16:37:44 +01:00 |
|
okriuchykhin
|
c4ff12be51
|
Merge pull request #349 from okriuchykhin/ok_SCI_783
Fix columns ordering when deleting custom fields [SCI-783]
|
2016-12-14 16:19:20 +01:00 |
|
Oleksii Kriuchykhin
|
de8eed0a19
|
Fix hound warning [SCI-783]
|
2016-12-14 15:27:24 +01:00 |
|
Oleksii Kriuchykhin
|
fa1cf1f04d
|
Better handling of columns deleting with fixing columns ordering [SCI-783]
|
2016-12-14 15:23:00 +01:00 |
|
zmagod
|
50c9dd3f59
|
fixed typo
|
2016-12-14 14:40:56 +01:00 |
|
okriuchykhin
|
2fd7536039
|
Merge pull request #352 from okriuchykhin/ok_SCI_793
Hide dropdown when user interacts with samples table [SCI-793]
|
2016-12-14 14:19:38 +01:00 |
|
okriuchykhin
|
6381166eb1
|
Merge pull request #346 from okriuchykhin/ok_SCI_788
Preserve scroll position in the samples columns dropdown when reordering [SCI-788]
|
2016-12-14 14:19:15 +01:00 |
|
Zmago Devetak
|
ef4ae1abcb
|
Merge pull request #348 from ZmagoD/zd_SCI_785
fixes samples table dropdown edit mode [fixes SCI-785]
|
2016-12-14 13:37:09 +01:00 |
|
zmagod
|
1ff98bb6df
|
adds tooltip to samples dropdown and column names
|
2016-12-14 13:36:10 +01:00 |
|
zmagod
|
9037ab3f48
|
fixed navigation link
|
2016-12-14 10:35:48 +01:00 |
|
Oleksii Kriuchykhin
|
9f439cf183
|
Hide dropdown when user interacts with samples table [SCI-793]
|
2016-12-13 17:25:01 +01:00 |
|
zmagod
|
d9971b4502
|
adds error message in samples table dropdown [fixes SCI-789]
|
2016-12-13 17:08:19 +01:00 |
|
Oleksii Kriuchykhin
|
e414af2fc3
|
Fix columns ordering when deleting custom fields [SCI-783]
|
2016-12-13 16:21:17 +01:00 |
|
zmagod
|
fa19bf1de7
|
fixes samples table dropdown edit mode [fixes SCI-785]
|
2016-12-13 15:43:31 +01:00 |
|
zmagod
|
2426539715
|
fixes long names in columns dropdown [fixes SCI-784]
|
2016-12-13 14:54:37 +01:00 |
|
zmagod
|
c960230bf0
|
fixes dropdown height bug [fixes SCI-787]
|
2016-12-13 11:35:50 +01:00 |
|
Oleksii Kriuchykhin
|
de12fac767
|
Preserve scroll position in the samples coluns dropdown when reordering [SCI_788]
|
2016-12-13 11:25:35 +01:00 |
|
zmagod
|
3c1a275510
|
fixes invited user samples table [fixes SCI-790]
|
2016-12-13 10:56:13 +01:00 |
|
Mojca Lorber
|
2cfcba0ceb
|
add protocol preview modal
|
2016-12-13 10:39:18 +01:00 |
|
Zmago Devetak
|
d54007f69c
|
Merge pull request #337 from ZmagoD/zd_SCI_740
limits max size of all uploaded files at the one time
|
2016-12-13 09:04:14 +01:00 |
|
zmagod
|
b56913cc87
|
refactor
|
2016-12-12 16:21:38 +01:00 |
|
zmagod
|
4b0e2baa3f
|
fixes breadcrumbs in secondary nav
|
2016-12-12 16:03:14 +01:00 |
|
zmagod
|
8dd8a7e7cd
|
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777
|
2016-12-12 15:52:25 +01:00 |
|
zmagod
|
5176f8b459
|
clean unneeded code [fixes SCI-778] refactor js
|
2016-12-12 15:40:13 +01:00 |
|
zmagod
|
d9025a9601
|
changes create/edit mode buttons [fixes SCI-777]
|
2016-12-12 14:42:06 +01:00 |
|
zmagod
|
8bb452e4f7
|
trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]
|
2016-12-12 10:30:03 +01:00 |
|
Luka Murn
|
d30a9780f4
|
Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
|
2016-12-12 09:57:37 +01:00 |
|
okriuchykhin
|
420daf3a6a
|
Merge pull request #344 from okriuchykhin/ok_SCI_779
Fix adding new samples columns [SCI-779]
|
2016-12-12 09:29:27 +01:00 |
|
Oleksii Kriuchykhin
|
435a8d20bb
|
Fix columns visability and reordering bug [SCI-779]
|
2016-12-09 17:37:22 +01:00 |
|
Matej Zrimšek
|
54de13de82
|
Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701]
|
2016-12-09 17:22:09 +01:00 |
|
Matej Zrimšek
|
0b12c87b09
|
Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701]
|
2016-12-09 16:44:50 +01:00 |
|
Oleksii Kriuchykhin
|
460ca067a2
|
Fix adding new samples columns [SCI-779]
|
2016-12-09 16:07:41 +01:00 |
|
zmagod
|
e23be6cc0e
|
fixed step description links [fixes SCI-780]
|
2016-12-09 15:26:41 +01:00 |
|
Oleksii Kriuchykhin
|
274fd63a41
|
Initial code commit [SCI-779]
|
2016-12-09 15:21:26 +01:00 |
|
zmagod
|
8b0dab624d
|
clear unneeded css, change processing image [fixes SCI-758]
|
2016-12-09 14:24:20 +01:00 |
|
zmagod
|
de3099e4d1
|
removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository
|
2016-12-09 13:59:49 +01:00 |
|
Luka Murn
|
8a55ef29e4
|
Remove unused code
Closes SCI-711.
|
2016-12-09 13:49:19 +01:00 |
|
Luka Murn
|
1a8b141b95
|
Add delete custom field functionality
|
2016-12-09 13:49:19 +01:00 |
|
Luka Murn
|
7e32c13d27
|
Fix edit & delete functionality so it works with draggable
|
2016-12-09 13:18:59 +01:00 |
|
Luka Murn
|
754c90b612
|
Edit functionality now works
|
2016-12-09 13:18:59 +01:00 |
|
Luka Murn
|
54ebdbb06c
|
Update edit mode JS & CSS
|
2016-12-09 13:18:59 +01:00 |
|
Luka Murn
|
da630ac2cb
|
Make edit, delete buttons clickable & hide them if neccesary
|
2016-12-09 13:18:59 +01:00 |
|
Matej Zrimšek
|
aea679ec11
|
Added links for creating new sample type and group when creating new sample. [fixes SCI-701]
|
2016-12-09 11:39:12 +01:00 |
|
Mojca Lorber
|
0e3526c9ad
|
Merge branch 'mlorb-ml-sci-696' into improved-sample-table
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
|
2016-12-08 15:44:50 +01:00 |
|
Mojca Lorber
|
1b2a438ed4
|
remove fixed columns
|
2016-12-08 15:24:54 +01:00 |
|
zmagod
|
40fdfef67f
|
setup delayed_paperclip gem
|
2016-12-08 15:24:14 +01:00 |
|
Mojca Lorber
|
7d88e247fc
|
refactoring
|
2016-12-08 14:41:35 +01:00 |
|
zmagod
|
ac52e643be
|
cleanup direct upload
|
2016-12-08 11:26:13 +01:00 |
|
Mojca Lorber
|
227fe9c284
|
change to after_create
|
2016-12-07 17:43:00 +01:00 |
|
Mojca Lorber
|
87dc76f4e3
|
change to update samples table state after initialize
|
2016-12-07 17:25:42 +01:00 |
|
Mojca Lorber
|
114a17ff0f
|
change to create
|
2016-12-07 16:57:17 +01:00 |
|
Mojca Lorber
|
228990f9da
|
fix samples table state, when adding new custom column
|
2016-12-07 16:37:16 +01:00 |
|
Mojca Lorber
|
5b5342de6f
|
make first column fixed
|
2016-12-07 15:02:18 +01:00 |
|
Mojca Lorber
|
195055f9cf
|
change SAMPLES_TABLE_DEFAULT_STATE
|
2016-12-07 14:51:34 +01:00 |
|
Mojca Lorber
|
39b6fa66fe
|
add SamplesTable for new users
|
2016-12-07 14:14:32 +01:00 |
|
zmagod
|
9f1e436623
|
limits max size of all uploaded files at the one time [fixes SCI-740]
|
2016-12-07 09:02:04 +01:00 |
|
Zmago Devetak
|
310b61ec12
|
Merge pull request #335 from ZmagoD/zd_SCI_752
fixes inport eln error message and spinner [fixes SCI-752]
|
2016-12-06 15:11:34 +01:00 |
|
okriuchykhin
|
cb2abfa7a9
|
Merge pull request #325 from okriuchykhin/ok_SCI_712
Added form for adding new columns to samples table into dropdown [SCI-712]
|
2016-12-06 15:00:01 +01:00 |
|
Zmago Devetak
|
49f9e64171
|
Merge pull request #333 from ZmagoD/zd_SCI_700
Managing sample groups tab
|
2016-12-06 14:51:09 +01:00 |
|
zmagod
|
dd85b128d2
|
fixed glyphicon-ok position
|
2016-12-06 14:47:16 +01:00 |
|
zmagod
|
8ca7151df4
|
added constant to load_from_file_size_error local
|
2016-12-06 13:52:07 +01:00 |
|
Oleksii Kriuchykhin
|
e02d780e44
|
Added Enter key handling and fixed error reporting [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
da7e86c7c2
|
Fix save/delete buttons after updating datatable and added permissions check [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
f6dd64772a
|
Add columns to samples table without page reload [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
40db8310fd
|
Move code to sample_datatable.js and removed unused modal [SCI-712]
|
2016-12-06 13:22:26 +01:00 |
|
Oleksii Kriuchykhin
|
22dabd2177
|
Added form for adding new columns to samples table into dropdown [SCI-712]
|
2016-12-06 13:17:05 +01:00 |
|
Oleksii Kriuchykhin
|
94866e8994
|
Initial code commit for samples columns dropdown [SCI-712]
|
2016-12-06 13:16:05 +01:00 |
|
Mojca Lorber
|
1bc0ca9e75
|
fix bug with first time load
|
2016-12-06 13:14:29 +01:00 |
|
zmagod
|
787b8b1600
|
fixed new sample type/group form
|
2016-12-06 12:01:02 +01:00 |
|
Mojca Lorber
|
12088ebfd3
|
add visibility functionality after refresh
|
2016-12-06 09:40:28 +01:00 |
|
Mojca Lorber
|
849f78b4df
|
implement reordering of columns in the samples table and change from local to database storage
|
2016-12-05 11:34:36 +01:00 |
|
Mojca Lorber
|
01e75fbbcc
|
create samples table model and migration
|
2016-12-05 11:08:33 +01:00 |
|
Zmago Devetak
|
a376118cd8
|
Merge pull request #334 from ZmagoD/zd_SCI_746
fixes bug with deleted team name
|
2016-12-05 10:47:39 +01:00 |
|
Zmago Devetak
|
91f29745c4
|
Merge pull request #314 from ZmagoD/zd_SCI_643
adds autolink
|
2016-12-05 10:47:23 +01:00 |
|
zmagod
|
ef2471d3f7
|
fixes inport eln error message and spinner [fixes SCI-752]
|
2016-12-05 10:44:58 +01:00 |
|
zmagod
|
6274cd413e
|
fixes bug with deleted team name [fixes SCI-746]
|
2016-12-02 16:07:00 +01:00 |
|
zmagod
|
7725374c42
|
refactor sample types/groups [fixes SCI-700]
|
2016-12-02 09:58:35 +01:00 |
|
zmagod
|
83aae59eed
|
adds sample groups index page
|
2016-12-02 09:33:09 +01:00 |
|
Luka Murn
|
372b455d7d
|
Merge pull request #332 from Ducz0r/lm-sci-750-751
Fix inviting users not working
|
2016-12-01 15:52:40 +01:00 |
|
Luka Murn
|
6a770f6a7e
|
Fix inviting users not working
Closes SCI-750, SCI-751.
Probably reopens parts of SCI-746.
|
2016-12-01 15:46:37 +01:00 |
|
Matej Zrimšek
|
3bdaa4bcef
|
Some token authentication refactoring and error handilng fixes. [closes SCI-689]
|
2016-12-01 15:38:56 +01:00 |
|
Matej Zrimšek
|
46465060d0
|
Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]
|
2016-11-30 16:56:56 +01:00 |
|
Zmago Devetak
|
33adb58950
|
Merge pull request #328 from ZmagoD/zd_SCI_699
Managing sample types tab
|
2016-11-30 16:14:13 +01:00 |
|
Oleksii Kriuchykhin
|
2a27c8e6b3
|
Fix hound warning [SCI-695]
|
2016-11-30 11:52:07 +01:00 |
|
Oleksii Kriuchykhin
|
f51f33ec25
|
Added sorting functionality to samples colunmns dropdown [SCI-695]
|
2016-11-30 11:42:05 +01:00 |
|
Luka Murn
|
680f443e31
|
Merge pull request #323 from Ducz0r/lm-sci-733-fix
Fix task comments not properly showing in reports
|
2016-11-30 09:51:59 +01:00 |
|
Luka Murn
|
c0a03d9f2d
|
Merge pull request #322 from Ducz0r/lm-add-show-version-var
Add an environmental variable to toggle version display in navbar
|
2016-11-30 09:49:40 +01:00 |
|
Luka Murn
|
84d0cf4620
|
Use rails helpers as per @ZmagoD's request
|
2016-11-30 09:48:57 +01:00 |
|
Luka Murn
|
76ec77fce4
|
Merge pull request #329 from biosistemika/simplify-signup
Merge simplify-signup into master
|
2016-11-30 09:41:20 +01:00 |
|
Luka Murn
|
d685ac939b
|
Merge pull request #326 from Ducz0r/lm-sci-746-fix
Fix some recaptcha form submit errors for signup pages
|
2016-11-30 09:35:16 +01:00 |
|
zmagod
|
a2e13441e5
|
removes create_sample_type modal and related js actions
|
2016-11-30 09:02:34 +01:00 |
|