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

507 commits

Author SHA1 Message Date
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