Commit graph

5757 commits

Author SHA1 Message Date
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
zmagod
da86208441 styled step comments 2016-09-20 14:13:40 +02:00
Oleksii Kriuchykhin
9b7360eebf Fixes issue with import of empty protocol [fixes SCI-314] 2016-09-20 13:41:29 +02:00
zmagod
0ca65aeca5 fixed step comment sorting 2016-09-20 13:31:50 +02:00
Oleksii Kriuchykhin
411ee4ee77 Fixes issue with unneeded sort icon [fixes SCI-430] 2016-09-20 11:30:11 +02:00
zmagod
cd64e035c0 set form validations 2016-09-20 09:50:03 +02:00
zmagod
f48553e807 fixed ajax call 2016-09-19 16:12:07 +02:00
Oleksii Kriuchykhin
3f0a2c7dfc Fixes issue with too many " | " signs in error message [fixes SCI-459] 2016-09-19 13:53:24 +02:00
Oleksii Kriuchykhin
a3b00d0ff8 Fixes issue with zoom buttons on canvas [fixes SCI-451] 2016-09-16 16:27:54 +02:00
mz3944
57563b9a18 Merge pull request #154 from mz3944/mz_replace_hardcoded_values_with_constants
Mz replace hardcoded values with constants
2016-09-16 16:03:19 +02:00
Matej Zrimšek
ffe6799313 Fixed hound alerts. 2016-09-16 15:57:54 +02:00
Matej Zrimšek
dd6e8a3a9a Added step name word wrapping (needs to be improved). 2016-09-16 15:57:54 +02:00
Matej Zrimšek
20ca37f185 Readded client-side result's comment validation. 2016-09-16 15:57:54 +02:00
Matej Zrimšek
c2f0106993 Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
zmagod
938aa32190 js tweaks 2016-09-16 15:22:24 +02:00
zmagod
635f6b92d6 fixed comments display 2016-09-16 11:55:10 +02:00
Zmago Devetak
431227c0a4 Merge pull request #147 from maslick/resultCommentsError1000Chars
Fixed: Comments in results have no error message if the text exceeds 1000 characters
2016-09-16 09:38:38 +02:00
zmagod
571db3e30e Merge branch 'jbargu-jg_sci_350_formulas' 2016-09-16 09:28:53 +02:00
zmagod
b9b466cd8e Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas 2016-09-16 09:28:19 +02:00
mz3944
556238f39f Merge pull request #150 from mz3944/mz_local_file_upload_fix
URL presigning is now used only when using S3 file uploading (caused …
2016-09-16 09:17:23 +02:00
zmagod
e90f0bd3d5 refactor step view 2016-09-16 09:04:21 +02:00
Zmago Devetak
01656c1018 Merge pull request #153 from ZmagoD/zd_SCI_448
Wrong name of experiment and task - gets undefined as prefix
2016-09-15 15:00:34 +02:00
mlorb
587369e7a6 Merge pull request #152 from mlorb/ml_sci_428
fixes responsiveness on mobile phone for sample view [SCI-428]
2016-09-15 12:11:48 +02:00
Zmago Devetak
7c4a62d138 Merge pull request #139 from ZmagoD/zd_SCI_410
fixed moved experiment thumbnail [fixes SCI-410]
2016-09-15 11:58:48 +02:00
zmagod
779b713148 refactor code 2016-09-15 11:55:02 +02:00
zmagod
0a2ab57e28 styled new comments layout 2016-09-15 11:45:51 +02:00
mz3944
e68cdfb9ac Merge pull request #151 from mz3944/mz_add_smart_code_search_gem
Added gem for smart code searching
2016-09-15 10:30:52 +02:00
zmagod
d146970f6b add generate workflow image method for moved modules 2016-09-15 09:32:29 +02:00
zmagod
e3ae22763e removed comments tab in protocol step 2016-09-15 08:46:14 +02:00
mlorb
098e17c0d8 Merge pull request #149 from mlorb/ml_sci_420
fixes links and missing experiment level in search results [SCI-420]
2016-09-14 15:42:16 +02:00