Commit Graph
353 Commits
Author SHA1 Message Date
Aysam Guerler bdff562a51 Charts: Use most recent select field style 2014-12-02 11:47:59 -05:00
Aysam Guerler 80c6aeaf93 Charts: Repack scripts 2014-11-13 16:40:59 -05:00
Aysam Guerler a946ebf66f Ui: Resize select fields 2014-11-13 16:38:49 -05:00
Aysam Guerler e02ae27ab2 ToolForm: Prevent redundant ajax requests 2014-11-04 15:28:58 -05:00
Aysam Guerler 8ef50622cc Charts: Fix storage call 2014-10-31 12:15:26 -04:00
Aysam Guerler 5d29c29cad Charts: Update query limits 2014-10-29 13:37:33 -04:00
Aysam Guerler 916c7b4cc1 ToolForm: Fix citations 2014-10-29 11:37:04 -04:00
John Chilton 5547bb7df5 Refactor interactive environment plugin framework out of IPython and into Galaxy.
Rely on more Python and less on mako, setup a small shared common mako file in config/plugins/interactive_environments/common/ie.mako. Move ie.js into client/galaxy/scripts/galaxy.interactive_environments.js and extract IPython's require config out so it doesn't have to directly reference client/galaxy/scripts/galaxy.interactive_environments.js (I doubt it is where that file actually should be).
2014-10-18 18:38:04 -04:00
John Chilton 06175f83f9 Update plugin framework to distinguish between viz and IE frameworks.
Update IPython accordingly.
2014-10-18 18:38:04 -04:00
John Chilton a52f4c21ee Split interactive_environments out into their own plugin directory.
Pragmatically this allows visualizations to be enabled by default but not IPython stuff and provides a spot to put a warning about security issues. More abstractly I think it provides a nice separation (initially though superficial) between these plugin types.
2014-10-18 18:38:04 -04:00
John Chilton 9969e10829 Update ie.mako to use galaxy_infrastructure_url if available...
Also use the method guess_galaxy_port on Galaxy's config object that was moved there from ie.mako in a previous Galaxy commit.
2014-10-18 18:38:04 -04:00
John Chilton eb5fb10726 Updated more correct discovery of Galaxy config file. 2014-10-18 18:38:04 -04:00
John Chilton 8ec1b636cd Adapt IPython/IE framework for dynamic Galaxy proxy. 2014-10-18 18:38:04 -04:00
John Chilton 07c2be2bae Fix conf -> config hack in IPython for history rewrite. 2014-10-18 18:38:04 -04:00
Eric Rasche 5f8e6a5397 Set timeout lower than time between requests 2014-10-18 18:38:04 -04:00
Eric Rasche 30cbb35f72 Fixes #27 2014-10-18 18:38:04 -04:00
Eric Rasche 73b9f8740c Missing URL on ajax request
This was causing serious havock with the RStudio version, not sure why the problems weren't
presenting as badly here. Without a URL, the ajax request requests the page you're on, spawning
dozens and dozens of docker containers.
2014-10-18 18:38:04 -04:00
Eric Rasche 6afc29358f Removed unused imports 2014-10-18 18:38:04 -04:00
Eric Rasche 0cf7450f0a Patch requested by Bjoern
Tested, works.
2014-10-18 18:38:04 -04:00
Bjoern Gruening e98a4479c7 Migrate from <object> to <iframe>. Objects seems to have some bugs in FF32.
Conflicts:
	static/js/ipython.js
2014-10-18 18:38:04 -04:00
Eric Rasche 87640a7166 Moved JS files to subdirectory 2014-10-18 18:38:04 -04:00
Eric Rasche 61062bc569 Fixes #25 2014-10-18 18:38:04 -04:00
Eric Rasche 028e8c852f Increasing delay removes multiple request issue
Apparently the GET requests weren't completing by the time the next was sent, leading to multiple
logins in short succession when the page started resolving properly.
2014-10-18 18:38:04 -04:00
Eric Rasche 82153c4f25 Code reorg mostly done 2014-10-18 18:38:04 -04:00
Eric Rasche 6946a70aaa Fixed JS boolean conversion 2014-10-18 18:38:04 -04:00
Eric Rasche e572498896 More testing, now with passwords 2014-10-18 18:38:04 -04:00
Eric Rasche 628e3c83ce Refactored function calls 2014-10-18 18:38:04 -04:00
Eric Rasche d77ea5511c Refactored out URL access testing 2014-10-18 18:38:04 -04:00
Eric Rasche b720157f16 Moved spinner to generic IE js 2014-10-18 18:38:04 -04:00
Eric Rasche dbe1fda62c Moved notifications back, not happy with them there 2014-10-18 18:38:04 -04:00
Eric Rasche 195e514fc9 Moved messages and other non-ipy specific data to ie.js 2014-10-18 18:38:04 -04:00
Eric Rasche f87fd539d5 Refactor to use require.js 2014-10-18 18:38:04 -04:00
Eric Rasche 640455119b Commented out code planning for ie/ipy.js split 2014-10-18 18:38:04 -04:00
Eric Rasche 6901a23808 Requiring require.js 2014-10-18 18:38:04 -04:00
Eric Rasche a76cf1da28 Give up after 10 tries 2014-10-18 18:38:04 -04:00
Eric Rasche 0cae9aad0c More documentation 2014-10-18 18:38:04 -04:00
Eric Rasche 27cf4baac6 Refactored more variables out 2014-10-18 18:38:04 -04:00
Eric Rasche bcaa7d9ef9 Removed 'galaxy defaults' 2014-10-18 18:38:04 -04:00
Eric Rasche 743b7d06c2 Bugfix and remove no longer used imports 2014-10-18 18:38:04 -04:00
Eric Rasche 4cff8c3409 Removed more unused code 2014-10-18 18:38:04 -04:00
Eric Rasche 1470ae6f80 Load JS with default names 2014-10-18 18:38:04 -04:00
Eric Rasche 69a98d5c51 moved JS into template 2014-10-18 18:38:04 -04:00
Eric Rasche 5fd45775f2 More static variables gone 2014-10-18 18:38:04 -04:00
Eric Rasche 49950e0fff Moved URL writing into ie.mako 2014-10-18 18:38:04 -04:00
Eric Rasche 07bdd60e7a Reverted change used during testing 2014-10-18 18:38:04 -04:00
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