Commit graph

14986 commits

Author SHA1 Message Date
zmagod
1cdfde827f fixes protocol and results comments 2016-09-27 09:26:25 +02:00
zmagod
980ff63104 fixed task comments 2016-09-27 09:18:46 +02:00
Oleksii Kriuchykhin
792f949a61 Fix issue with spinner in avatar upload [SCI-423] 2016-09-27 09:12:31 +02:00
zmagod
02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
Oleksii Kriuchykhin
908ee05a23 Fix issue with words break in task description and comments [SCI-477] 2016-09-26 16:03:22 +02:00
Oleksii Kriuchykhin
8a3a9451e9 Fix issue with duplicate error messages in experiments modal [SCI-484] 2016-09-26 12:58:22 +02:00
zmagod
30a8f52216 generate new experiment img after task restored [fixes SCI-465] 2016-09-26 09:48:49 +02:00
Mojca Lorber
cc5cdf2577 Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321 2016-09-26 09:39:05 +02:00
Oleksii Kriuchykhin
db1e24202a Minor code cleanup [fixes SCI-463] 2016-09-26 09:08:38 +02:00
Mojca Lorber
c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
Jure Grabnar
9cad6ce4f5 Don't include NaNs in some formula calculations
SCI-485 #close
2016-09-23 16:38:51 +02:00
Jure Grabnar
89c19b9bbd Add dot aliases for STDEV/VAR 2016-09-23 16:17:33 +02:00
mz3944
1c1a7c231e Merge pull request #169 from mz3944/mz_help_button_SCI_13
Added help dropdown. [SCI-13]
2016-09-23 13:04:38 +02:00
okriuchykhin
4f0fb7074b Merge pull request #167 from okriuchykhin/ok_SCI-470
Fix issue with long tags in dropdown list [fixes SCI-470]
2016-09-23 13:00:06 +02:00
Matej Zrimšek
fc86b7b1fd Added help dropdown. [SCI-13] 2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin
2c144aa2f3 Fix issue with unexpected notification windows appearing after report editor exit [fixes SCI-463] 2016-09-23 11:56:13 +02:00
Oleksii Kriuchykhin
e8ac754829 Fix issue with long tags in dropdown list [fixes SCI-470] 2016-09-23 11:05:17 +02:00
okriuchykhin
a7f3f793c8 Merge pull request #161 from okriuchykhin/ok_SCI-380
Fixes issue with reordering of checklist items [fixes SCI-380]
2016-09-23 10:37:56 +02:00
okriuchykhin
5896cdc4bc Merge pull request #158 from okriuchykhin/ok_SCI_314
Fixes issue with import of empty protocol [fixes SCI-314]
2016-09-23 10:37:35 +02:00
Zmago Devetak
2b678998d3 Merge pull request #166 from ZmagoD/zd_SCI_471
fixes load comments [fixes SCI-471]
2016-09-23 09:17:27 +02:00
Zmago Devetak
e1cf66f02a Merge pull request #163 from ZmagoD/zd_SCI_467
fixes edit modal [fixes SCI-467]
2016-09-23 08:57:33 +02:00
zmagod
4f2df691ba add error validations 2016-09-23 08:34:39 +02:00
zmagod
6143b257d0 fixes edit modal [fixes SCI-467] 2016-09-23 08:32:46 +02:00
Matej Zrimšek
0317872bc0 Added check if no comments are present for file result, which caused JS error. 2016-09-22 18:12:35 +02:00
mz3944
cde7f3805f Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2
Added missing validation for protocol description.
2016-09-22 17:36:18 +02:00
Matej Zrimšek
13e886f7a9 Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408] 2016-09-22 17:35:23 +02:00
okriuchykhin
087ee08976 Merge pull request #164 from okriuchykhin/ok_SCI-400
Fixes issue with new experiment modal and with move of experiments [fixes SCI-400]
2016-09-22 17:01:58 +02:00
Oleksii Kriuchykhin
841e495234 Fix brace position [fixes SCI-380] 2016-09-22 16:48:15 +02:00
okriuchykhin
b5c861583d Merge pull request #157 from okriuchykhin/ok_SCI_430
Fixes issue with unneeded sort icon [fixes SCI-430]
2016-09-22 16:39:26 +02:00
Oleksii Kriuchykhin
28ab599373 Change double quotes to single [fixes SCI-314] 2016-09-22 16:36:37 +02:00
okriuchykhin
729cbef27b Merge pull request #156 from okriuchykhin/ok_SCI-459
Fixes issue with too many " | " signs in error message [fixes SCI-459]
2016-09-22 16:12:17 +02:00
okriuchykhin
37eedf17a0 Merge pull request #155 from okriuchykhin/ok_SCI-451
Fixes issue with zoom buttons on canvas [fixes SCI-451]
2016-09-22 16:11:45 +02:00
Matej Zrimšek
09405c667e Added missing validation for protocol description. [SCI-408] 2016-09-22 15:52:12 +02:00
Oleksii Kriuchykhin
0dd1196ae5 Fixes issue with move of experiments between projects [fixes SCI-400] 2016-09-22 15:10:15 +02:00
zmagod
303cb4308a fixes load comments [fixes SCI-471] 2016-09-22 13:46:27 +02:00
Oleksii Kriuchykhin
b334b037f8 Fixes issue with old data in modal fields [fixes SCI-400] 2016-09-22 10:54:03 +02:00
mz3944
c6c169f744 Merge pull request #162 from mz3944/mz_replace_hardcoded_values_with_constants
Mz replace hardcoded values with constants
2016-09-21 19:50:41 +02:00
Matej Zrimšek
c614843044 Minor refactoring with hound alert fixes. 2016-09-21 19:48:18 +02:00
Matej Zrimšek
234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
Matej Zrimšek
c6a23aab98 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +02:00
Zmago Devetak
5fedcb4be2 Merge pull request #160 from ZmagoD/zd_SCI_464
Fixes restore experiment error [fixes SCI-464]
2016-09-21 19:24:33 +02:00
zmagod
ba59d1f3f7 Merge branch 'ZmagoD-zd_SCI_436' 2016-09-21 19:21:46 +02:00
zmagod
06b1992e94 Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436 2016-09-21 19:20:55 +02:00
zmagod
8a8bf10f08 clean up flash label 2016-09-21 19:09:57 +02:00
zmagod
971da78a11 fixed flash label 2016-09-21 18:19:04 +02:00
Oleksii Kriuchykhin
011bb2d910 Fixes issue with reordering of checklist items [fixes SCI-380] 2016-09-21 14:06:47 +02:00
zmagod
bf8e2a208f fixes restore experiment error [fixes SCI-464] 2016-09-21 08:34:32 +02:00
zmagod
2bfe8f0636 fixing hound 2016-09-21 08:16:23 +02:00
zmagod
9f56df02d2 removes comment tab and add comment in the info tab [fixes SCI-436] 2016-09-20 18:53:51 +02:00
zmagod
42bbc47f5f first working version 2016-09-20 17:06:07 +02:00