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
689 commits 70 branches 179 tags 165 MiB
Commit graph

261 commits

Author SHA1 Message Date
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
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
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
zmagod 667fb67052 sets front end validation for experiment move action [fixes SCI-400] 2016-09-02 16:31: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
zmagod 28fa00c30c trim long words in reports [fixes SCI-105] 2016-09-01 15:45:39 +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 b05c3df4d3 adds toggle id only to elements with modules 2016-08-31 10:25:40 +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
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
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 77ec5bcff9 Reposition comment dropdowns horizontally if needed 
Closes SCI-258
 2016-08-30 11:39:50 +02:00
Luka Murn 4ee4c6caba Remove JS validator from step comments 2016-08-30 11:06:30 +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
zmagod 57c1707e81 fixes secondary navigation [fixes SCI-338] 2016-08-30 09:53:56 +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
Mojca Lorber 53cdbc2638 fixes notification when adding new sample 2016-08-29 13:45:54 +02:00
zmagod 5af9d10c6a fixes new task button after tutorial ends 2016-08-29 11:46:45 +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
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
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 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 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 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
zmagod f515366d91 fixes workflowing after updating description, fixes canvas bug 2016-08-25 09:11:42 +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
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 d04df349d5 fixes medium and small zoom 2016-08-24 14:18:12 +02:00
zmagod 9393a96302 adds edit workflow link if no workflow [fixes SCI-374] 2016-08-24 14:10:50 +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 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 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
Mojca Lorber 126cf0c210 fixes drag connections area 2016-08-23 16:08:05 +02:00
Mojca Lorber 86ed4c18d8 fixes hound 2016-08-23 13:51:20 +02:00
Mojca Lorber ac68db97b9 fixes tile size in edit canvas 2016-08-23 13:33:10 +02:00
Jure Grabnar 027193f937 Add links for moving module groups 2016-08-23 10:09:25 +02:00
Jure Grabnar 358f2b1c47 Add moving for newly created modules 2016-08-23 10:00:34 +02:00
zmagod 03a3759cf5 fixes project overview style and add no description link [fixes SCI-360] 2016-08-23 08:52:53 +02:00
Jure Grabnar 667b7671a6 Add connections for moved workflows 2016-08-22 17:26:21 +02:00
zmagod 8c592753e4 fixes hound 2016-08-22 15:27:11 +02:00
zmagod bb11999566 adds plus button at the bottom of project overview page [fixes SCI-359] 2016-08-22 15:22:05 +02:00
zmagod eab05eb9db adds font-awesome to pdf [fixes SCI-345] 2016-08-22 14:40:09 +02:00
zmagod d38f29d207 set ajax loading of experiments images [fixes SCI-349] 2016-08-22 11:29:19 +02:00
mlorb ed1cd193ac Merge pull request #77 from mlorb/ml_sci_357 
fixes warning messages when loading a new protocol that is linked with repository [SCI-357]
 2016-08-22 08:56:36 +02:00
Jure Grabnar 5bb99adb25 Add frontend logic for moving workflows from canvas 2016-08-19 17:11:17 +02:00
zmagod b86e67a0d6 refactor initProjectExperiment 2016-08-19 16:38:34 +02:00
Mojca Lorber fb081be682 fixes warning messages when loading a new protocol that is linked with repository 2016-08-19 16:03:10 +02:00
zmagod cac5033eba set ajax for workflow img 2016-08-19 15:36:12 +02:00
Jure Grabnar 80498260e5 Add backend for moving task from canvas 2016-08-19 13:53:43 +02:00
Mojca Lorber 51e0d53b12 remove code duplication 2016-08-19 13:08:35 +02:00
Mojca Lorber 571f5b60f3 fixes notifications appearance and disappearance and content adjustment 2016-08-19 10:48:43 +02:00
Mojca Lorber 5c77167388 update buttons 2016-08-18 16:47:16 +02:00
Mojca Lorber 5695842fe3 fixes notifications when creating sample types and groups 2016-08-18 16:05:15 +02:00
zmagod 072f816286 refactor restore_after_tutorial function 2016-08-18 08:55:40 +02:00
zmagod f2ee5d73a0 fixed project tutorial bug 2016-08-18 08:53:34 +02:00
mlorb 36d24523b4 Merge pull request #61 from biosistemika/ml_sci_291 
fixes dissapearance of sample type/group when editing samlpe or adding new sample [SCI-291]
 2016-08-18 08:25:31 +02:00
Matej Zrimšek 4ad384df5a Fixed hound alerts. 2016-08-17 21:02:05 +02:00
Matej Zrimšek e4a6a3944e Added deleting of files on S3 server when editing/removing a file. Some refactoring. 2016-08-17 18:13:35 +02:00
Matej Zrimšek ccdccc5cf1 Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring. 2016-08-17 18:11:13 +02:00
Matej Zrimšek c87ba5b45c Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page. 2016-08-17 18:10:32 +02:00
Matej Zrimšek 951cf67b3d A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring. 2016-08-17 18:08:21 +02:00
Matej Zrimšek b70f49f4e0 Some additional refinements. 2016-08-17 18:00:04 +02:00
Matej Zrimšek 86880f0299 Additional changes, refactoring and improvements. 2016-08-17 17:57:54 +02:00
Matej Zrimšek 01aad1764c Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring. 2016-08-17 17:54:45 +02:00
Matej Zrimšek e2f94caa96 Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done. 2016-08-17 17:54:06 +02:00
Jure Grabnar 77f75fdeb6 Delete module from canvas when moving 2016-08-17 15:46:30 +02:00
Jure Grabnar 0cdea0b51a Add modal for moving task on canvas 2016-08-17 15:46:30 +02:00
zmagod ca0ba1403d set flask icon to experiment [fixes SCI-330] 2016-08-17 14:17:29 +02:00
Zmago Devetak da735a51f4 Merge pull request #62 from ZmagoD/zd_SCI_318 
Zd sci 318
 2016-08-17 10:01:10 +02:00
zmagod 4293f9c267 Merge branch 'zd_SCI_271' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_271 2016-08-17 09:58:29 +02:00
zmagod 850f5d8dad fixing hound alerts 2016-08-17 09:44:23 +02:00
zmagod 7abc8f3a90 Merge branch 'master' into experiment-level 2016-08-17 09:28:35 +02:00
zmagod 76dd4bc90a fixed protocol status bar [fixes SCI-318] 2016-08-16 10:47:23 +02:00
Mojca Lorber 7dc0c3672a fixes dissapearance of sample type/group when adding/editing new sample 2016-08-16 10:17:29 +02:00
Jure Grabnar c16eed5e63 Add missing dropdown_actions.js 2016-08-16 09:48:19 +02:00
zmagod 5e647f62d5 changed import label [fixes SCI-317] 2016-08-16 09:34:04 +02:00
zmagod 852fe499fb clean up linked protocol 2016-08-12 16:31:40 +02:00
Mojca Lorber e6f205368b fixes tutorial bug of inappropriate window 2016-08-12 11:33:27 +02:00
Jure Grabnar 555ed05ae6 Refactor/DRY dropdown actions code for experiment 2016-08-12 10:18:35 +02:00
mlorb 6b17385f3a Merge pull request #56 from biosistemika/ml_sci_302 
fixes problem with split table when generating pdf report [SCI-302]
 2016-08-12 08:55:10 +02:00
mlorb f3163ea7ce visual corrections 2016-08-12 08:54:14 +02:00
zmagod 701c26a2dd fixed canvas edit and samples tutorial [fixes: SCI-271] 2016-08-11 16:21:55 +02:00
zmagod a128815122 fixed tutorial tasks on canvas 2016-08-11 16:06:51 +02:00
Mojca Lorber 94915a9ba7 fixes problem with splitted table when generating pdf report [SCI-302] 2016-08-11 15:24:18 +02:00
zmagod 2e1d81a985 fixed project archive in tutorial 2016-08-11 12:40:16 +02:00
Mojca Lorber b350dff826 fixes problem with splitted table when generating pdf report [SCI-302] 2016-08-11 10:42:36 +02:00
Jure Grabnar 7f21ae138a Set clone actions/routes/view 
DRY code for showing AJAX on project#show page
 2016-08-11 09:46:15 +02:00
scibb 32699578ed Merge pull request #52 from biosistemika/bb_canvas_fixes 
Bb canvas fixes
 2016-08-11 09:29:21 +02:00
zmagod 5583105d8a fixed hound alert 2016-08-09 14:28:55 +02:00
zmagod 5f3a5cb845 fixed project overview 2016-08-09 14:26:08 +02:00
scibb 696075bf0f smaller grid steps set. In addition enddpoint bug was fixed 
SCI 170, SCI 292'
 2016-08-08 15:18:38 +02:00
Zmago Devetak 4bd489d29c Merge pull request #46 from ZmagoD/zd_SCI_303 
update sidebar v2 [fixes SCI-303]
 2016-08-08 08:56:01 +02:00
jbargu 3f91e7a476 Merge pull request #47 from biosistemika/jg_explvl_reports 
Update reports with experiment level

[Fixes SCI-35].
 2016-08-08 08:51:23 +02:00
zmagod 520cf2e0cf hound.... 2016-08-08 08:40:24 +02:00
zmagod e16abe486c fix hound alert 2016-08-08 08:37:22 +02:00
zmagod 756c3c777e styled workflow dots 2016-08-08 08:33:18 +02:00
Mojca Lorber c691ca63e2 fixing houndci-bot comment 2016-08-05 09:47:06 +02:00
Mojca Lorber 5d137324bc moving and targeting .label class 2016-08-05 09:12:17 +02:00
Jure Grabnar 2f0dc57ea6 Fix Hounds warning 2016-08-05 08:29:49 +02:00
Jure Grabnar a25a4354c6 Fix css, #hound. 2016-08-05 08:05:14 +02:00
Jure Grabnar cafec6a1b4 Fix controls on experiment contents 
Also fix bug with adjencent elements not updating controls.

Fixes SCI-35.
 2016-08-04 16:05:03 +02:00
zmagod a4ec558596 start to implement project overview page 2016-08-04 12:57:33 +02:00