scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 10:56:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
5794 commits 69 branches 179 tags 165 MiB
Commit graph

5794 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zanz2 08d72fc7d8 made everything more robust, so that if something does break (exception) it reverts back to how it used to calculate 2018-07-04 14:45:57 +02:00
Zanz2 6b0d0eeaca saving debug code 2018-07-04 14:11:57 +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
Zanz2 f73d63579a changed ruleJS formula parser to use big.js library for decimal calculations, since numeral.js had a few issues of its own for big decimals 2018-07-04 13:38:49 +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
Zanz2 7aff38f6b9 made comments clear to what issue the changes are related to 2018-07-03 15:35:37 +02:00
zmagod 8b86891177 fixes file destroy button [fixes SCI-2546] 2018-07-03 15:25:37 +02:00
Zanz2 1a263e995b A fix that involves changind handsontable library 2018-07-03 14:52:12 +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
Zanz2 8e42dba7de Found the fix 2018-07-03 08:20:56 +02:00
ZmagoD 1e66d25578 refactor list item dropdown 2018-07-02 17:05:52 +02:00
Oleksii Kriuchykhin 42ce72170c Fix inventory cell copy with file attached [SCI-2585] 2018-07-02 12:58:49 +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
Oleksii Kriuchykhin 6660b240c8 Fix rendering permissions of inventory annotations [SCI-2534] 2018-06-28 15:30:32 +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 1a15ac7acf fixes setting sidebar teams link[fixes SCI-2429] 2018-06-26 13:09:56 +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