scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
866 commits 70 branches 179 tags 165 MiB
Commit graph

693 commits

Author SHA1 Message Date
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
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 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
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
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 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
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
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
Matej Zrimšek 76ff34a8a9 URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring. 2016-09-13 18:56:47 +02:00
Mojca Lorber 36378d03e2 fixes links and missing experiment level in search results 2016-09-13 17:13:58 +02:00
zmagod d5c5c55bf2 refactor 2016-09-13 16:32:33 +02:00
Zmago Devetak b26bf7b183 Merge pull request #136 from ZmagoD/zd_SCI_370 
Enabled to delete results in task archive [fixes SCI-370]
 2016-09-13 15:22:08 +02:00
zmagod 29a2904513 fixed moving action of workflows and tasks 2016-09-13 14:51:53 +02:00
zmagod 7c363d5ade fixed security issue 2016-09-13 13:57:31 +02:00
Zmago Devetak 319893bf81 Merge pull request #143 from ZmagoD/zd_SCI_372 
Set move and clone permissions
 2016-09-13 13:37:23 +02:00
zmagod 3d5a42cc27 refactor results controller 2016-09-13 13:26:04 +02:00
zmagod 222ddf7438 fixed houd error 2016-09-13 13:26:04 +02:00
zmagod 691ae94d2c enabled to delete results in task archive [fixes SCI-370] 2016-09-13 13:26:04 +02:00
zmagod 65383f1824 fixes sidebar expanded elements when adding new experiments [fixes SCI-342] 2016-09-13 13:09:57 +02:00
Pavel Maslov 15ea8fc0dc Bug fixed: comments in results have no error message if the text exceeds 1000 characters. 2016-09-13 12:01:56 +02:00
Zmago Devetak d37c7b853b Merge pull request #140 from ZmagoD/zd_SCI_341 
adds label to current project in clone experiment modal [fixes SCI-341]
 2016-09-13 11:59:01 +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 6519e8dbb1 Add e-notation preprocessing to formulas 
SCI-350 #close
 2016-09-13 09:46:22 +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
Jure Grabnar 5c88bdeeae Add formulas for readonly results tables 2016-09-13 09:44:17 +02:00
Jure Grabnar e096f936f9 Add formulas to results 2016-09-13 09:44:17 +02:00
Matej Zrimšek af8ab3e081 Fixed step's checklist items editing (items not multiplying and new item insertion always at bottom) [fixes SCI-427]. Improved step/result comment GUI [SCI-446]. 2016-09-12 16:55:46 +02:00
zmagod 1b31f8827d set experiment description to 255 2016-09-08 14:35:52 +02:00
Zmago Devetak 1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
mlorb f4029a04fd Merge pull request #142 from mlorb/ml_sci_415 
fixes navbar size when resizing window [SCI-415]
 2016-09-08 12:46:36 +02:00
Matej Zrimšek 6eca3661bf Some JS error refactoring and accordingly updated error rendering when experiment description is too long. 2016-09-08 12:43:31 +02:00
Mojca Lorber 0435011fee fixes hound 2016-09-08 12:43:30 +02:00
Mojca Lorber 302a777615 fixes button collision 2016-09-08 12:37:06 +02:00
zmagod faed0500c7 set move and clone permissions to also validate the user on the organizational level [fixes SCI-372] 2016-09-08 09:23:29 +02:00
Mojca Lorber 4c66ca6f80 fixes navbar size when resizing window 2016-09-08 09:17:58 +02:00
Matej Zrimšek 40355dcc97 If file is recognized as office file, it's allowed to be any office file type. 2016-09-07 14:04:11 +02:00
Luka Murn 0c1759c15a Merge pull request #135 from Ducz0r/lm-sci-397 
Resize archived experiment panels
 2016-09-07 11:14:53 +02:00
mz3944 d3a3dd4428 Merge pull request #138 from mz3944/mz_result_edit_and_name_length_check_fix 
Fixed result file deletion and result name updating [fixes SCI-409]. …
 2016-09-07 11:07:23 +02:00
mz3944 5f446ab1f0 Merge pull request #134 from mz3944/mz_delete_step_file_fix 
Fixes files deletion when rails worker is running [fixes SCI-411] and…
 2016-09-07 11:00:50 +02:00
zmagod d92597ac30 styled dottel line in sidebar [fixes SCI-340] 2016-09-07 09:01:40 +02:00
zmagod d482dff2e6 adds label to current project in clone experiment modal [fixes SCI-341] 2016-09-07 08:26:36 +02:00
zmagod 487d3e18f4 fixed moved experiment thumbnail [fixes SCI-410] 2016-09-07 07:55:45 +02:00
Matej Zrimšek b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +02:00
zmagod daa144ce7c added missing bracket 2016-09-06 11:57:03 +02:00
zmagod 856d226946 fixed move experiment form error duplication 2016-09-06 11:48:56 +02:00
zmagod a5a24c7610 clear unused variable 2016-09-06 11:46:28 +02:00
zmagod b672d85405 fixed error message duplication 2016-09-06 11:46:28 +02:00
zmagod b44a284b54 sets edit experiment validation 2016-09-06 11:46:28 +02:00
zmagod 9d469f9092 sets front end validation for new experiment modal [fixes SCI-348] 2016-09-06 11:44:03 +02:00
zmagod de6c03a73b setup experiment modal input validation 2016-09-06 11:44:03 +02:00
Zmago Devetak 9440371f3f Merge pull request #131 from ZmagoD/zd_SCI_400 
Sets front end validation for experiment move action [fixes SCI-400]
 2016-09-06 11:39:38 +02:00
zmagod c526cab498 removed commented code 2016-09-06 11:38:02 +02:00
mlorb f0e28b90a0 Merge pull request #133 from mlorb/ml_sci_415 
minimize buttons on mobile phone [SCI-415]
 2016-09-06 11:26:32 +02:00
Luka Murn bda5120548 Resize archived experiment panels 
Closes SCI-397.
 2016-09-06 10:55:05 +02:00
Matej Zrimšek 9fb30c7661 Fixes files deletion when rails worker is running [fixes SCI-411] and fixes picture's style files deletion. 2016-09-06 10:40:01 +02:00
Mojca Lorber 47983812e7 minimize buttons on mobile phone 2016-09-06 10:10:49 +02:00
Zmago Devetak 1a19753df9 Merge pull request #128 from ZmagoD/zd_SCI_105 
Trim long words in reports [fixes SCI-105]
 2016-09-06 10:10:06 +02:00
zmagod a7b6135b2f cleared console.log 2016-09-06 10:08:32 +02:00
Luka Murn 81883911c4 Merge pull request #132 from Ducz0r/lm-sci-228 
Updates to invite users to team modal window
 2016-09-05 15:53:15 +02:00
mlorb aea288371f Merge pull request #129 from mlorb/ml_sci_310 
adds tasks, experiment and project category in protocol search results [SCI-310]
 2016-09-05 15:31:35 +02:00
Luka Murn 1d8600b39f Fix bug when inviting existing users onto teams 
Closes SCI-228
 2016-09-05 14:52:56 +02:00
mz3944 50e0c26e89 Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399 
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
 2016-09-05 11:49:04 +02:00
Mojca Lorber 6a802e9fa7 fixes redirection to project page for all categories in search results 2016-09-05 11:40:49 +02:00
Mojca Lorber 740392c687 optimization 2016-09-05 10:58:37 +02:00
zmagod 667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31:17 +02:00
Zmago Devetak fb6bc31bec Merge pull request #127 from ZmagoD/zd_SCI_247_again 
Table from step stays in report, although it is deleted from step.
 2016-09-02 15:59:17 +02:00
Zmago Devetak ea26a532e4 Merge pull request #126 from ZmagoD/zd_SCI_332 
By default all experiments should be collapsed
 2016-09-02 15:58:03 +02:00
Mojca Lorber 6763d8e7a1 fixes hound again 2016-09-02 11:56:32 +02:00
Mojca Lorber 4bce00ac61 fixes hound 2016-09-02 11:54:20 +02:00
Mojca Lorber 83034f705d adds tasks, experiment and project category in protocol search results 2016-09-02 11:45:54 +02:00
zmagod 28fa00c30c trim long words in reports [fixes SCI-105] 2016-09-01 15:45:39 +02:00
zmagod 4afaa50ce0 fixed multiple tables check 2016-09-01 13:49:12 +02:00
zmagod 111cb81d08 clear tables from report [fixes SCI-247] again 2016-09-01 13:38:09 +02:00
Luka Murn 61f4fbd1d4 Remove warning info when removing pending user from organization 2016-09-01 13:23:53 +02:00
zmagod ac7ac95da8 [fixes SCI-332] 2016-09-01 10:38:20 +02:00
Matej Zrimšek 4fdf478426 Minor refactoring. 2016-08-31 17:57:06 +02:00
Matej Zrimšek 828eebeb16 Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399] 2016-08-31 17:21:17 +02:00
zmagod 55ba2de41f fixes object duplication 2016-08-31 16:34:08 +02:00
zmagod fabfa83171 introdutory popup cookie 2016-08-31 15:18:21 +02:00
zmagod e8f971829a added project to session storage 2016-08-31 15:13:17 +02:00
Luka Murn 5cb79f6282 Fix the default parameters in JS 
This was causing major issues in IE.
 2016-08-31 14:04:45 +02:00
zmagod eb394ce209 fixes searching tables bug [fixes SCI-402] 2016-08-31 11:01:10 +02:00
zmagod b05c3df4d3 adds toggle id only to elements with modules 2016-08-31 10:25:40 +02:00
zmagod eb39eedfdf [fixes SCI-398] again 2016-08-31 08:46:51 +02:00
zmagod 21f84bacb6 set sidebar collapsed elements 2016-08-31 08:24:59 +02:00
jbargu 2cd5d85d68 Merge pull request #120 from jbargu/jg_SCI_328_move_experiment_reconnect 
When moving a task, it should connect the source and destination
 2016-08-30 18:01:38 +02:00
mlorb 905acfd43d Merge pull request #109 from mlorb/ml_sci_286 
fixes notification when adding new sample [SCI-286]
 2016-08-30 17:54:45 +02:00
Mojca Lorber dd8e5d5e12 fixes hound 2016-08-30 17:12:26 +02:00
Mojca Lorber 1b1e6daa21 fixes notification disappearance and error notifications 2016-08-30 16:55:59 +02:00
Jure Grabnar 9a82e7d72b Connect tasks on moving 
SCI-328 #close
 2016-08-30 15:57:27 +02:00
mlorb 8fc29248b3 Merge pull request #119 from mlorb/ml_sci_396 
fixes missing experiment name in side bar [SCI-396]
 2016-08-30 15:05:04 +02:00
Zmago Devetak 11b314fa20 Merge pull request #107 from ZmagoD/zd_bug_fix 
fixes new task button after tutorial ends
 2016-08-30 15:04:11 +02:00
Zmago Devetak 375a72db18 Merge pull request #114 from ZmagoD/zd_SCI_294_vol2 
fixes reports file name [fixes SCI-294]
 2016-08-30 14:59:07 +02:00
Zmago Devetak 5b4eb07960 Merge pull request #118 from ZmagoD/zd_SCI_398 
fixes workflow img bug [fixes SCI-398]
 2016-08-30 14:55:33 +02:00
Mojca Lorber 52f228725a fixes hound 2016-08-30 14:04:47 +02:00
Mojca Lorber aeda6f77d2 fixes missing experiment name in side bar 2016-08-30 13:51:16 +02:00
zmagod a947354fb5 fixes update times [fixes SCI-398] 2016-08-30 13:23:48 +02:00
Luka Murn c6e575bd2a Merge pull request #115 from Ducz0r/lm-deleting-comments-fix 
Fix for deleting comments
 2016-08-30 13:15:35 +02:00
Luka Murn 2b382fee0f Merge pull request #113 from Ducz0r/lm-add-first-time-activities 
Fix first time data generator & fake data generator
 2016-08-30 13:07:52 +02:00
Luka Murn 0e0228cb8c Codestyle fixes 2016-08-30 13:06:49 +02:00
zmagod 95ab35e3d6 cleanup update timestamp 2016-08-30 12:58:52 +02:00
Mojca Lorber 43c3a0bb81 fixes merge again 2016-08-30 12:54:08 +02:00
Mojca Lorber 81f9e59dcd fixes merge 2016-08-30 12:14:15 +02:00
Mojca Lorber e8d187b5f6 Merge branch 'ml_sci_395' 
Conflicts:
	app/views/canvas/edit/modal/_move_module.html.erb
	app/views/canvas/edit/modal/_move_module_group.html.erb
 2016-08-30 11:41:25 +02:00
Luka Murn 77ec5bcff9 Reposition comment dropdowns horizontally if needed 
Closes SCI-258
 2016-08-30 11:39:50 +02:00
zmagod f356acb882 fixes reports file name [fixes SCI-294] 2016-08-30 11:36:39 +02:00
Zmago Devetak 6878adda46 Merge pull request #112 from ZmagoD/zd_SCI_338_vol2 
Tutorial
 2016-08-30 11:07:51 +02:00
Luka Murn 4ee4c6caba Remove JS validator from step comments 2016-08-30 11:06:30 +02:00
jbargu fa357dd54f Merge pull request #110 from jbargu/jg_SCI_328_move_task_no_experiment 
Remove move on empty experiments
 2016-08-30 11:06:16 +02:00
zmagod 4b6567e488 fixed workflowimg link 2016-08-30 11:03:33 +02:00
zmagod 6f1c4df942 fixed new task button in canvas 2016-08-30 10:48:28 +02:00
Zmago Devetak e96429409e Merge pull request #108 from ZmagoD/zd_SCI_247_vol2 
Fixes step destroing bug and fixes reports [fixes SCI-247]
 2016-08-30 09:57:56 +02:00
zmagod 57c1707e81 fixes secondary navigation [fixes SCI-338] 2016-08-30 09:53:56 +02:00
Luka Murn c86d21d689 Fix bug in organization.rb 
Bug was related to introduction of experiment level.
 2016-08-30 09:46:54 +02:00
Mojca Lorber a35bf7182f fixes troubles 2016-08-30 09:43:39 +02:00
Mojca Lorber 596d403d5f change position of buttons 2016-08-30 09:16:53 +02:00
zmagod d33bb50519 disabled secondary navigation in samples tutorial 2016-08-30 08:57:05 +02:00
zmagod 5518d1cd1e fixed 16 step of tutorial 2016-08-30 08:52:44 +02:00
Jure Grabnar 0c184dcdcf Remove Move button on empty experiments 
SCI-328 #close.
 2016-08-30 08:26:59 +02:00
Luka Murn 30e8e33774 Add comment activities to first time data generator 2016-08-30 08:19:35 +02:00
Mojca Lorber b07f1af90f fixes hound again again 2016-08-29 17:08:00 +02:00
Mojca Lorber 7f8bb9be53 fixes hound again 2016-08-29 13:59:51 +02:00
Mojca Lorber 60b0d69a72 fixes hound 2016-08-29 13:56:05 +02:00
Mojca Lorber 53cdbc2638 fixes notification when adding new sample 2016-08-29 13:45:54 +02:00
zmagod 17aacc8ff5 fixes step destroing bug and fixes reports [fixes SCI-247] 2016-08-29 12:04:46 +02:00
zmagod 5af9d10c6a fixes new task button after tutorial ends 2016-08-29 11:46:45 +02:00
zmagod 2ac20d1af1 adds new image + new panel title [fixes SCI-336] 2016-08-29 09:28:29 +02:00
Luka Murn a0311970f8 Add missing commits for showing image and not able to preview 2016-08-26 16:49:32 +02:00
zmagod d886d05ccb Merge branch 'zd_SCI_338' 2016-08-26 16:32:49 +02:00
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade 
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
 2016-08-26 11:13:40 +02:00
Zmago Devetak 0cfc758f43 Merge pull request #102 from ZmagoD/zd_SCI_336 
implement first time popup logic
 2016-08-26 09:19:36 +02:00
zmagod b0bd92e3f4 fixed edit action 2016-08-26 09:17:55 +02:00
zmagod 2031c42920 fixed confirmation text 2016-08-26 09:13:45 +02:00
Matej Zrimšek 782d384e26 Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
Matej Zrimšek 04d9163ff6 Paperclip file spoofing corrected/modified. 2016-08-25 18:57:06 +02:00
zmagod 99976722a8 uncomment js file 2016-08-25 18:49:49 +02:00
zmagod 1738ca66d2 one-time introductory popup [fixes SCI-336] 2016-08-25 18:44:21 +02:00
Luka Murn 8018cff02e Merge pull request #103 from Ducz0r/bb_edit_delete_comments 
Edit&delete comments
 2016-08-25 17:18:48 +02:00
mlorb b1218cb3d6 Merge pull request #59 from biosistemika/ml_sci_244 
fixes tutorial bug of inappropriate window [SCI-244]
 2016-08-25 17:16:45 +02:00
Luka Murn b533b0aca6 Fix another minor bug 2016-08-25 17:15:53 +02:00
Luka Murn 7cd94e8b0d Fix a minor bug on canvas 2016-08-25 17:09:55 +02:00
Luka Murn 9cd99fc532 Display "no comments" if you delete the last comment 2016-08-25 17:01:30 +02:00
Zmago Devetak 1b21e55fea Merge pull request #100 from ZmagoD/zd_SCI_381 
Adds experiment and team to tag search resuls [fixes SCI-381]
 2016-08-25 15:43:50 +02:00
zmagod 7a47ff6bc5 fixed new task error 2016-08-25 15:30:32 +02:00
zmagod 8ff645fb89 disabled experiment dropdown actions 2016-08-25 15:16:51 +02:00
Zmago Devetak b090fd8d5b Merge pull request #95 from ZmagoD/zd_SCI_374 
adds edit workflow link if no workflow [fixes SCI-374]
 2016-08-25 14:07:33 +02:00
Luka Murn a480c8d403 Styling fixes 2016-08-25 13:59:50 +02:00
Luka Murn 6d86a02d7c Add individual permission checks in dropdowns 
Closes SCI-258.
 2016-08-25 13:51:50 +02:00
Luka Murn 8592c13ed4 Remove now obsolote controller actions 2016-08-25 13:51:31 +02:00
Luka Murn b0d7b9dc75 Generate activities when editing/deleting comments 2016-08-25 13:51:31 +02:00
Luka Murn 24dd25d9f5 Add edit/delete result comment functionality 
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
 2016-08-25 13:51:31 +02:00
Luka Murn bac0455435 Add edit&delete functionality to step comments 
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
 2016-08-25 13:51:31 +02:00
Luka Murn 512efd3812 Fix 2 lines that were too long 2016-08-25 13:51:31 +02:00
Luka Murn c92d016f65 Add edit&delete module/task comments functionality 
This required a minor fix of comments.js.
 2016-08-25 13:51:31 +02:00
Luka Murn f0d9cb96fa Add edit project comments functionality 2016-08-25 13:51:30 +02:00
Luka Murn 15c0baeee8 Add delete project comment functionality 
This commit also removes the old code from @bberic.
 2016-08-25 13:51:30 +02:00
Luka Murn 9e3bb8edb7 Add dependant: :destroy to comments 2016-08-25 13:51:30 +02:00
Luka Murn 8a73a3ab5c Update permission_helper.rb and routes.rb 2016-08-25 13:51:30 +02:00
Luka Murn 319bcc7850 Add permissions for comments to permission_helper.rb 2016-08-25 13:51:30 +02:00
Luka Murn 5569a1e6d2 Revert 2 files that contained no changes 2016-08-25 13:51:30 +02:00
scibb a76d82d188 delete and edit comments for projects, protocols, results, and workflow elements 2016-08-25 13:51:30 +02:00
zmagod 5fabe06b8d implement first time popup logic 2016-08-25 11:44:49 +02:00
Mojca Lorber 4a5d720724 change position of overview and samples 2016-08-25 11:19:53 +02:00
zmagod 1120ef1407 adds experiment and team to tag search resuls [fixes SCI-381] 2016-08-25 10:40:03 +02:00
mlorb c38a4e2614 Merge pull request #94 from mlorb/ml_sci_375 
add move experiment instructions [SCI-375]
 2016-08-25 09:45:16 +02:00
Luka Murn c082bceafc Merge pull request #98 from Ducz0r/lm-sci-385 
Fix bug with linked tasks
 2016-08-25 09:29:50 +02:00
zmagod f515366d91 fixes workflowing after updating description, fixes canvas bug 2016-08-25 09:11:42 +02:00
mlorb 0a066f436f Merge pull request #96 from mlorb/ml_sci_369 
buttons update on experiment overview [SCI-369]
 2016-08-25 08:54:16 +02:00
zmagod 92bb3dda99 hide last next button 2016-08-25 08:46:11 +02:00
zmagod dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Luka Murn 3dddffaa34 Fix bug with linked tasks 
This bug was a legacy of experiment level introduction.
Closes SCI-385, SCI-366.
 2016-08-24 17:22:16 +02:00
mlorb 2d90ad1a65 Merge pull request #88 from mlorb/ml_sci_362 
fixes tile size in edit canvas [SCI-362]
 2016-08-24 17:07:11 +02:00
Mojca Lorber 2a897432e1 update buttons on canvas view 2016-08-24 17:00:27 +02:00
jbargu 5c104ac050 Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error 
Fix 404 move experiment error
 2016-08-24 16:35:29 +02:00
Mojca Lorber d04df349d5 fixes medium and small zoom 2016-08-24 14:18:12 +02:00
Zmago Devetak 0de7ea31ea Merge pull request #90 from ZmagoD/zd_SCI_376 
fixes cloned experiment protocol [fixes SCI-376]
 2016-08-24 14:12:19 +02:00
zmagod 9393a96302 adds edit workflow link if no workflow [fixes SCI-374] 2016-08-24 14:10:50 +02:00
Mojca Lorber 0558d49e26 buttons update on experiment overview 2016-08-24 13:50:25 +02:00
Jure Grabnar 00da7efb44 Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 
Conflicts:
	app/models/experiment.rb

SCI-328 #close
 2016-08-24 13:11:10 +02:00
Zmago Devetak afaeab492d Merge pull request #87 from ZmagoD/zd_SCI_371 
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
 2016-08-24 11:56:29 +02:00
jbargu 180efac87b Merge pull request #92 from jbargu/jg_exp_overview_navbar_sci_353 
Show whole tree structure for experiment in sidebar
 2016-08-24 11:50:39 +02:00
Jure Grabnar dff5abf3d9 Fix module moving position not being updated 2016-08-24 11:42:21 +02:00
Mojca Lorber f554dc6018 add move experiment instructions 2016-08-24 11:36:50 +02:00
Jure Grabnar 3e5e9aed22 Fix 404 on move experiment 
[fixes SCI-378]
 2016-08-24 11:09:03 +02:00
zmagod 27d77bc73f added new permission for dropdown actions 2016-08-24 10:56:30 +02:00
Jure Grabnar e60533af57 Add whole tree structure for experiment 
SCI-353 #close
 2016-08-24 10:47:30 +02:00
Jure Grabnar a091571d9c Add consistent links for archive for all entities 2016-08-24 09:14:29 +02:00
Jure Grabnar 0cdb18ffcd Update experiment links on sidebar between actions 2016-08-24 09:05:57 +02:00
Jure Grabnar a41d851830 Fix secondary navigation for experiment level (overview) 2016-08-24 08:54:02 +02:00
mlorb 5c8d669cac Merge pull request #81 from mlorb/ml_sci_364 
fixes edit experiment [SCI-364]
 2016-08-23 16:49:20 +02:00
Zmago Devetak 396325bd67 Merge pull request #86 from ZmagoD/zd_SCI_365 
changed experiment create redirection [fixes SCI-365]
 2016-08-23 16:30:48 +02:00
Zmago Devetak 9dc7708b73 Merge pull request #85 from ZmagoD/zd_SCI_360 
fixes project overview style and add no description link [fixes SCI-360]
 2016-08-23 16:24:22 +02:00
Zmago Devetak d67997fa8b Merge pull request #83 from ZmagoD/zd_SCI_347 
Fixes search result link for experiment [fixes SCI-347]
 2016-08-23 16:23:41 +02:00
Zmago Devetak aa650bbc65 Merge pull request #82 from ZmagoD/zd_SCI_359 
Add plus button at the bottom of project overview page [fixes SCI-359]
 2016-08-23 16:23:20 +02:00
Zmago Devetak 7e2db66f42 Merge pull request #79 from ZmagoD/zd_SCI_345 
Adds font-awesome to pdf [fixes SCI-345]
 2016-08-23 16:22:30 +02:00
Zmago Devetak 65049692ea Merge pull request #78 from ZmagoD/zd_SCI_349 
updating thumbnail
 2016-08-23 16:22:07 +02:00
zmagod 0429816154 deleted commented code 2016-08-23 16:21:11 +02:00
zmagod 2bbb439745 fixes cloned experiment protocol [fixes SCI-376] 2016-08-23 16:15:45 +02:00