Commit graph

224 commits

Author SHA1 Message Date
Mojca Lorber f4345f3aef fixes hound 2016-09-28 16:09:39 +02:00
Mojca Lorber efa7a1d7b5 add sample information in pop-up 2016-09-28 15:46:41 +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
Mojca Lorber c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
Matej Zrimšek fc86b7b1fd Added help dropdown. [SCI-13] 2016-09-23 12:52:38 +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
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
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
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
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
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 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
zmagod 0ca65aeca5 fixed step comment sorting 2016-09-20 13:31:50 +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
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 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
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
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
zmagod 0a2ab57e28 styled new comments layout 2016-09-15 11:45:51 +02:00
zmagod e3ae22763e removed comments tab in protocol step 2016-09-15 08:46:14 +02:00
Zmago Devetak d0a180a1e8 Merge pull request #148 from ZmagoD/zd_SCI_342
fixes sidebar expanded elements when adding new experiments
2016-09-14 13:48:34 +02:00
Mojca Lorber 65415415b6 fixes hound again again 2016-09-14 11:37:17 +02:00
Mojca Lorber 386cedda71 fixes hound again 2016-09-14 11:34:24 +02:00
Mojca Lorber aba5305cd6 fixes hound 2016-09-14 11:24:19 +02:00
zmagod c4fabdb67a clean unneeded Observer configurations 2016-09-14 11:16:42 +02:00
zmagod e1d871dcdb clear undefind from experiment name and refactor sidebar in reports [fixes SCI-448] 2016-09-14 11:11:35 +02:00
Mojca Lorber a9029e0928 fixes responsiveness on mobile phone for sample view 2016-09-14 11:08:40 +02:00
mz3944 ea898ed3ce Merge pull request #145 from mz3944/mz_checklists_items_move_and_step/result_comment_fix
Fixed step's checklist items editing (items not multiplying and new i…
2016-09-13 19:05:10 +02:00
zmagod 65383f1824 fixes sidebar expanded elements when adding new experiments [fixes SCI-342] 2016-09-13 13:09:57 +02:00
Zmago Devetak f86c6b954e Merge pull request #141 from ZmagoD/zd_SCI_340
styled dottel line in sidebar [fixes SCI-340]
2016-09-13 11:58:26 +02:00
Jure Grabnar fa3515d2eb Add formulas to reports 2016-09-13 09:46:21 +02:00
Jure Grabnar 3b364be70b Add formulas to steps tables 2016-09-13 09:44:17 +02:00