Commit graph

4138 commits

Author SHA1 Message Date
zmagod fdedfec7d3 fixes bug with bootstrap-select 2018-07-04 17:38:16 +02:00
Zmago Devetak eb61f728b4
Merge pull request #1227 from ZmagoD/zd_SCI_2546
Refactor inline row editing in repository
2018-07-04 15:28:08 +02:00
zmagod 5b9b86a2d4 fixes per @Ducz0r 's request 2018-07-04 15:23:41 +02:00
Zmago Devetak 4386f54787
Merge pull request #1226 from ZmagoD/zd_SCI_2578
fixes bug with checkAvailableColumns function [fixes SCI-2578]
2018-07-04 13:52:08 +02:00
zmagod c9dd8b356a fixes locale, fixes custom file upload style 2018-07-04 13:43:45 +02:00
zmagod 43903080ce code style fixes 2018-07-04 12:42:28 +02:00
zmagod 3eef4f87bf fixes hound alerts 2018-07-03 16:18:44 +02:00
zmagod 8b86891177 fixes file destroy button [fixes SCI-2546] 2018-07-03 15:25:37 +02:00
zmagod 28bac14667 first working version of the edit form object 2018-07-03 12:57:39 +02:00
zmagod c93e00b8c2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_2546 2018-07-03 09:13:54 +02:00
ZmagoD 1e66d25578 refactor list item dropdown 2018-07-02 17:05:52 +02:00
ZmagoD 23de3abd61 Fixes repository items edit action, adds additional event listener for file upload 2018-06-29 16:59:26 +02:00
nbernot 7aacc2b4a2 extract repository_item html form creation in to a separate 'class' 2018-06-29 14:28:06 +02:00
zmagod 0dbd2dc877 fixes typo 2018-06-29 10:29:39 +02:00
zmagod eb75f6c03d fixes bug with checkAvailableColumns function [fixes SCI-2578] 2018-06-29 10:28:46 +02:00
okriuchykhin 10554fecb4
Merge pull request #1223 from ZmagoD/zd_SCI_2566
fixes tagsinput text-area on long input [fixes SCI-2566]
2018-06-28 10:50:12 +02:00
Zmago Devetak 54a17e0574
Merge pull request #1209 from ZmagoD/zd_SCI_2165
Update team migration script to support "list of values" and "file" repository columns/cells [fixes SCI-2165]
2018-06-27 15:31:27 +02:00
Zmago Devetak 29c379dbae
add rep_item to update_annotation function 2018-06-27 15:17:02 +02:00
Zmago Devetak 7fd3eec195
Merge pull request #1219 from ZmagoD/zd_SCI_2415
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-26 18:43:16 +02:00
Luka Murn 9637af51e6
Merge pull request #1207 from Ducz0r/lm-fix-sign-in-halt-layout
Fix the sign in halt layout
2018-06-26 17:51:18 +02:00
zmagod 4b81c2c4db fixes tagsinput text-area on long input [fixes SCI-2566] 2018-06-26 09:52:07 +02:00
okriuchykhin d73b6146e8
Merge pull request #1221 from okriuchykhin/rails_update
Upgrade Rails to version 5.1.6, Sprockets to 3.7.2
2018-06-20 13:59:59 +02:00
Oleksii Kriuchykhin 78f44c48f8 Update bullet to version 5.7.5 2018-06-20 13:29:46 +02:00
Oleksii Kriuchykhin fb52236c14 Update Rubocop config file 2018-06-20 10:51:31 +02:00
Oleksii Kriuchykhin 6c914d2a73 Upgrade Rails to version 5.1.6, Sprockets to 3.7.2 2018-06-20 10:46:41 +02:00
mlorb 52f7d4075d
Merge pull request #1218 from mlorb/ml-sci-2406
Fix firefox bug with browse buttons position [SCI-2406]
2018-06-19 14:58:46 +02:00
okriuchykhin c9d32def4b
Merge pull request #1217 from okriuchykhin/ok_SCI_2505
Add report elements to samples migration [SCI-2505]
2018-06-19 14:42:37 +02:00
okriuchykhin c70b06cc52
Merge pull request #1220 from okriuchykhin/ok_SCI_2377
Add extend for task child elements in reports [SCI-2377]
2018-06-19 14:41:48 +02:00
Oleksii Kriuchykhin c0232d9eb2 Add extend for task child elements in reports [SCI-2377] 2018-06-19 14:34:36 +02:00
zmagod db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
mlorb 0792ce46af fix firefox bug with browse buttons position 2018-06-19 13:39:03 +02:00
zmagod d68ae63c40 adds repository_items to smart annotation import 2018-06-19 11:58:22 +02:00
Zmago Devetak 16bce8de60
Merge pull request #1215 from ZmagoD/zd_SCI_2294
removes duplicated keywords [fixes SCI-2294]
2018-06-18 16:36:09 +02:00
Oleksii Kriuchykhin e6671cf015 Add report elements to samples migration [SCI-2505] 2018-06-18 15:24:02 +02:00
Zmago Devetak be0429a084
Merge pull request #1216 from ZmagoD/zd_SCI_2408_v2
fix columns check [fixes SCI-2408]
2018-06-18 15:06:12 +02:00
zmagod fbcc788597 fixes per @duczOr request 2018-06-18 14:00:49 +02:00
zmagod 5f1489a100 fix columns check [fixes SCI-2408] 2018-06-18 13:36:56 +02:00
Zmago Devetak cb7023c18e
Merge pull request #1214 from ZmagoD/zd_SCI_2410
disable buttons on new/edit repository_item action [fixes SCI-2410]
2018-06-18 13:03:11 +02:00
zmagod ed39294733 removes duplicated keywords [fixes SCI-2294] 2018-06-18 12:15:52 +02:00
Zmago Devetak bed83ddac0
Merge pull request #1213 from ZmagoD/zd_SCI_2398
fixes import flash message [fixes SCI-2398]
2018-06-18 11:52:22 +02:00
zmagod 2f141e9217 disable buttons on new/edit repository_item action [fixes SCI-2410] 2018-06-15 11:37:01 +02:00
zmagod 6a6ff534c0 fixes import flash message [fixes SCI-2398] 2018-06-15 11:12:11 +02:00
okriuchykhin 801d0a4a22
Merge pull request #1212 from okriuchykhin/ok_SCI_2377
Add hooks to new report modal [SCI-2377]
2018-06-14 15:48:43 +02:00
Zmago Devetak 1b245716fb
Merge pull request #1211 from ZmagoD/zd_SCI_2246_v2
adds data-hook
2018-06-14 15:33:40 +02:00
Oleksii Kriuchykhin 13c374d9b3 Add hooks to new report modal [SCI-2377] 2018-06-14 15:26:06 +02:00
zmagod 3d7591100a adds repository row assets to team import/export [fixes SCI-2165] 2018-06-14 15:20:57 +02:00
zmagod 4a82d1e7ac fixes repository items import 2018-06-14 14:40:43 +02:00
zmagod bb62fc3715 adds data-hook 2018-06-14 12:42:49 +02:00
okriuchykhin 69c25f10e0
Merge pull request #1210 from okriuchykhin/ok_SCI_2376
Remove result validation [SCI-2376]
2018-06-13 16:09:41 +02:00
Oleksii Kriuchykhin e10ed86fa1 Remove result validation [SCI-2376] 2018-06-13 14:06:55 +02:00