Commit Graph
111 Commits
Author SHA1 Message Date
Eric Rasche ab5504547b Moved more configuration into ie base module 2014-10-18 18:38:04 -04:00
Eric Rasche 8c8ec8aa68 Added hex gen stmt 2014-10-18 18:38:04 -04:00
Eric Rasche c1fc6db957 Remove pointless statement 2014-10-18 18:38:04 -04:00
Eric Rasche 9c6b9bec6f Copy imports 2014-10-18 18:38:04 -04:00
Eric Rasche a4dd555ea3 More progress refactoring 2014-10-18 18:38:04 -04:00
Eric Rasche 183da2abc0 Moved more functions over 2014-10-18 18:38:04 -04:00
Eric Rasche 9201ccdd27 First function refactored
This looks like it will definitely work, could be the start of a base IE template
2014-10-18 18:38:04 -04:00
Eric Rasche 044cefde29 Removed deprecated docs 2014-10-18 18:38:04 -04:00
Bjoern Gruening 336f2bc6c3 simplify code 2014-10-18 18:38:04 -04:00
Eric Rasche 7a30335a6b Typo/bug fixes 2014-10-18 18:38:04 -04:00
Eric Rasche 827cce2a67 Move notebook generation to more sensible place 2014-10-18 18:38:04 -04:00
Eric Rasche 91562ed2d0 Random seeding no longer necessary 2014-10-18 18:38:04 -04:00
Eric Rasche 866c1b51a1 Move functions to more appropriate code section 2014-10-18 18:38:04 -04:00
Eric Rasche f25e51e678 Building on b366b0c and eb1c487, cleanup js-var stuff 2014-10-18 18:38:04 -04:00
Eric Rasche 2443e1adda Exchanged conf calls for static variables 2014-10-18 18:38:04 -04:00
Eric Rasche fc1f466c21 Added js-bool function 2014-10-18 18:38:04 -04:00
Eric Rasche 52f878f507 Changed login URLs
The current login URL automatically redirects. Lest bad things happen, and we make extraneous
requests, we just login at the "/login" route without the automatic redirect
2014-10-18 18:38:04 -04:00
Eric Rasche eeea31047a Refactor password generation 2014-10-18 18:38:04 -04:00
Eric Rasche 123a8e94ea Simplification due to tying to galaxy release 2014-10-18 18:38:04 -04:00
Eric Rasche 901ca52aec Refactor to function which will eventually be API call 2014-10-18 18:38:04 -04:00
Eric Rasche e980278b45 Refactor to function 2014-10-18 18:38:04 -04:00
Eric Rasche faf5afe320 Seed more randomly
Originally this was intended to make sure re-clicking a dataset would open the same port+IE, however
that's not a supported behaviour and there's no reason to keep that functionality around.
2014-10-18 18:38:04 -04:00
Eric Rasche d5f141b7eb plugin_path now available
As of https://bitbucket.org/galaxy/galaxy-central/commits/ddc9a669d53aa259d38efc882c890503444daaf5
2014-10-18 18:38:04 -04:00
Eric Rasche 1173909ee9 Refactor into function 2014-10-18 18:38:04 -04:00
Eric Rasche d977726642 added comment 2014-10-18 18:38:04 -04:00
Eric Rasche 9e47db52bc Unused variable 2014-10-18 18:38:04 -04:00
Bjoern Gruening e2bf4ccb15 Migrate from <object> to <iframe>. Objects seems to have some bugs in FF32. 2014-10-18 18:38:04 -04:00
Eric Rasche ffd3b10d5e Added CORS required parameter to conf 2014-10-18 18:38:04 -04:00
Eric Rasche beb0cb57e9 Possible fix for CORS/cookie issue.
I noticed that the cookie was indeed being set by the POST request. However, that cookie was
essentially ignored in the subsequent requests.

I looked for places to interrupt it, could I just stop after the POST and not execute any redirects.
That did not appear to be an option due to HTTP/XHR spec. After a bit of searching I came up with
this link: http://stackoverflow.com/a/14462615 which seems to solve the issue. Mentioned here:
https://api.jquery.com/jQuery.ajax/
2014-10-18 18:38:04 -04:00
Eric Rasche c185c6e556 Center the spinner 2014-10-18 18:38:04 -04:00
Eric Rasche 64bff1a7f5 Fixes #15 2014-10-18 18:38:04 -04:00
Eric Rasche c72cc47fdb Finished work on spinning
- Removed a statically set port during testing
 - Made variables local so we can be sure they aren't being mis-used
 - Removed sleep
 - New parameters needed in notebook load call
 - Added main div to use for images/etc. Probably not necessary.
2014-10-18 18:38:04 -04:00
Eric Rasche 8ec2033302 Refactored JS code to wait on page load
See linked SO question in source for information on the type of JS delay loop
we're doing.
2014-10-18 18:38:04 -04:00
Eric Rasche ec2da64444 Removed docker delay with spinning 2014-10-18 18:38:04 -04:00
Eric Rasche 9256fe1c60 Error message is only relevant in specific circumstance, other circumstances are likely more serious errors 2014-10-18 18:38:04 -04:00
Eric Rasche fb9cf86ceb JS refactor 2014-10-18 18:38:04 -04:00
Eric Rasche 43304a2325 Modified error message to be more human-friendly
Many people will be intially overwhelmed by the stack trace they see within galaxy in
the even of a missing API key. Hopefully, hopefully, they'll be able to read the bold
portion at the bottom with instructions on generating one. It's mostly a measure to
decrease support tickets/requests
2014-10-18 18:38:04 -04:00
Eric Rasche c296f7883e Removed unnecessary quotes 2014-10-18 18:38:04 -04:00
Eric Rasche d32e61eca0 Moved docker delay to conf variable
Users may want to modify this variable, so I've moved it to the conf file.
2014-10-18 18:38:04 -04:00
John Chilton 048834a4a2 Use get_api_key() to fetch Galaxy API key...
This is a more appropriate abstraction layer to work at and provides the added benefit of auto-generating the key if it doesn't exist.
2014-10-18 18:38:04 -04:00
John Chilton 2cd37cc658 Use plugin_path to improve path logic...
Added in Galaxy commit https://bitbucket.org/galaxy/galaxy-central/commits/ddc9a669d53aa259d38efc882c890503444daaf5. Added it to Galaxy cleanup the code and this is the result - oh well :) - it is at least more techically correct.
2014-10-18 18:38:04 -04:00
Eric Rasche b4d641b013 Added documentation for each error message, fixed typo
Wiki pages were added for each of the error messages with a Cause and Solution.
This should be helpful to end users deploying our software
2014-10-18 18:38:04 -04:00
John Chilton ea6bc7be5d Bugfix: Do not hard code 'main' as Galaxy server name.
Determine correct server name corresponding to at least a web request at runtime.
2014-10-18 18:38:04 -04:00
Eric Rasche f8ad738b90 Fixes #7 2014-10-18 18:38:04 -04:00
Eric Rasche 88ce41f0de Fixes #6 2014-10-18 18:38:04 -04:00
Eric Rasche adb7f5eb8f Added SSL option 2014-10-18 18:38:04 -04:00
Bjoern Gruening d8aa2b73da Add "how does it work" section to the readme 2014-10-18 18:38:04 -04:00
Eric Rasche 3718bb1fa3 Fixed URL for easier install 2014-10-18 18:38:04 -04:00
Bjoern Gruening 4b679ae598 Added the initial release date!
Yeah, we are ready to release!
Thanks so much @erasche it is a pleasure to work with you!
2014-10-18 18:38:04 -04:00
Eric Rasche de2c843c06 Bumped timeout
I've found in opera that copy+paste doesn't work, so I have to drag and drop. Additionally, we need
the user to have time to read and comprehend what we're telling them before this notification
disappears forever.

Despite the fact that this is technically a configuration bug on the sys admin's part, for a future
release, we should switch to a different type of notification, probably like a banner with an X that
they can close once they're done reading it. That way we know it'll be there as long as they need it
to be.
2014-10-18 18:38:04 -04:00