opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,621 Commits 69 Branches 243 Tags
d72dd3735c0dfd652fb45a117fe1942f10ff726d
Commit Graph
454 Commits
Author SHA1 Message Date
Eric Rasche f4dab5523b Merge pull request #1178 from bgruening/obbeforechange_ie 
Prevent GIEs from being closed without user confirmation
 2015-11-26 07:29:44 -06:00
Bjoern Gruening 62474100f8 add onbeforeunload to IE 2015-11-26 00:48:05 +01:00
guerler 368da171f5 Call onbeforeunload before hiding iframe through display() 
Validated message
 2015-11-23 11:12:03 -05:00
Eric Rasche 81f842743d Merge pull request #1131 from bgruening/IE_iobio 
Add BAM iobio visualisation as Interactive Environment
 2015-11-19 15:02:37 -06:00
Bjoern Gruening af36ca6d94 add BAM iobio visualisation as Interactive Environment 2015-11-19 18:58:43 +01:00
Nate Coraor d8152f3336 Merge branch 'release_15.10' into dev 2015-11-17 11:37:05 -05:00
Nate Coraor c435141326 Built image tag differs from intended. 2015-11-13 10:55:25 -05:00
Nate Coraor d824cca31f In interactive environments, the /import volume can now be made 
conditional. Also, fix a bug when using a proxy for the node proxy and
cookie_path is /
 2015-11-12 16:56:16 -05:00
guerler 7717659c78 Allow resizing of regular multi-select boxes 
Remove event handler

Add mouse leave event handler

Improve visibility and accessibility

Fix tag name

Style compromise

Repack charts
 2015-11-04 02:16:45 -05:00
guerler 2e21e027b0 Insert promises 
Revision

Revise deferred class to use promises

Update charts

Fix comment

Use resolve and reject properly

Fix comments

Fix comments

Fix comments

Fix comment

Improve naming/comments

Remove unnecessary queue handler

Fix naming
 2015-11-02 12:59:16 -05:00
carlfeberhard fd3cadc371 Merge pull request #378 from eteriSokhoyan/dev 
graph visualization added
 2015-10-06 09:58:41 -04:00
Eric Rasche 5f4502b650 Pin images for next release of Galaxy 2015-10-05 14:50:35 -05:00
John Chilton 6d3ea7ee00 Merge pull request #790 from erasche/gie-docker-launch 
Refactor GIE Launching to use -P
 2015-09-25 16:05:35 +01:00
Eric Rasche 4a4a7ca51b Update URLs for rstudio 2015-09-23 16:23:54 -05:00
Eric Rasche b4bbd1c2f1 Make use of proxy path in appropriate places 2015-09-23 16:12:01 -05:00
Björn Grüning a7c1c53f53 Update rstudio.ini.sample 2015-09-23 22:42:45 +02:00
Björn Grüning b1d642a6ec Update ipython.ini.sample 2015-09-23 22:42:27 +02:00
Eric Rasche 1d78033625 Merge branch 'gie-docker-cmd' into gie-docker-launch 2015-09-23 15:09:40 -05:00
Eric Rasche 1ad3308b49 Remove small formatting issue 2015-09-23 15:09:03 -05:00
Eric Rasche a76ba39321 Update against gie-docker-cmd 2015-09-23 14:45:35 -05:00
Eric Rasche 10af450127 Move run into python from template 2015-09-23 14:22:32 -05:00
Eric Rasche a02df53f33 Correct IPython notebooks to new URL 2015-09-23 12:51:37 -05:00
Eric Rasche 04c5e6864c Merge branch 'gie-docker-cmd' into gie-docker-launch 2015-09-23 12:27:40 -05:00
Eric Rasche 175f89bdc8 Hardcode defaults, per @jmchilton's comments 2015-09-23 11:27:52 -05:00
Eric Rasche 484578936b Refactor to use -P 
This is a major refactoring to use the -P option of docker
which should simplify some of our deployment like running docker containers
on another host. In support of #372
 2015-09-23 11:24:37 -05:00
Eric Rasche 56ac2c0f13 Revert command inject and document rationale 2015-09-23 10:50:05 -05:00
Eric Rasche 52dfd589b9 Unify the docker command, command_inject, and command_wrapper 2015-09-23 10:34:36 -05:00
Jelle Scholtalbers 130b3f2d75 Add docker command wrapper. For example, to change the current group to docker, which is needed when user belongs to (too) many groups) 2015-09-23 14:28:03 +02:00
Eric Rasche f55b70e2d3 Merge pull request #462 from scholtalbers/dev 
Some minor changes to get ipython running on my instance
 2015-08-09 23:44:26 +01:00
Carl Eberhard 2c2f49bf8e Visualizations, trackster: allow the user to add the dataset launched from as a new track in an existing trackster visualization; add utils/query-string-parsing.js for pulling query params from the query string 2015-07-29 13:57:34 -04:00
Jelle Scholtalbers fadd1990e6 moved changes to lib/galaxy/web/base/interactive_environments.py 2015-07-15 22:47:30 +02:00
Jelle Scholtalbers f8f36620ec Fix issue with docker not being able to mount tmp dir 2015-07-15 18:39:42 +02:00
Dannon Baker 79562cf8d2 Merge branch 'master' into dev 2015-07-01 14:29:13 -04:00
guerler 8b7a455b01 Disable custome tooltips for histograms 2015-06-30 13:46:12 -04:00
Eric Rasche fcc706e8d0 Whitespace/other small fixes 2015-06-30 11:50:27 -05:00
Eteri d4fba96231 graph visualization added 2015-06-24 15:28:42 +02:00
Bjoern Gruening 43b2b7929b change docker_host to docker_hostname to be more explicit 2015-06-17 15:54:18 +02:00
Bjoern Gruening 77169a2078 add docker_host as configurable option 2015-06-16 17:23:58 +02:00
John Chilton 884e824d72 Merge remote-tracking branch 'vavrusa/table-datatype' into dev. 
Conflicts:
	lib/galaxy/datatypes/tabular.py
 2015-06-03 10:52:42 -04:00
guerler cc1f56a118 Fix load order of require and d3 2015-05-27 11:18:04 -04:00
Nicola Soranzo 48023ed374 Remove outdated sentence. 2015-05-15 12:45:16 +01:00
Björn Grüning 8965dd2cbf Pin the IPython Docker Image to the 15.05. 
From now on we pin every Galaxy release to a special ipython-notebook image.
 2015-05-14 21:23:27 +02:00
John Chilton ed8112b422 Fix problems introduced in IE refactorings. 2015-05-14 14:32:49 -04:00
John Chilton 998d0e8a8c IE: Move IPython-specific password hashing out of framework into plugin. 
See dicussion here - https://github.com/erasche/galaxy/commit/23459f318507255a2bb1d1fb647e1581bd2090e1.
 2015-05-14 10:15:49 -04:00
John Chilton 624d540c04 IEs: Move temp dir handling into ie_request to simplify interface. 2015-05-13 23:08:21 -04:00
John Chilton 55e523ea63 Introduce new IE launch abstraction. 
In addition to reducing duplication between IPython and RStudio - it also shields them from low-level details and creates an interface we could more reasonably generalize to something like qsubing the docker commands or using Docker Swarm.
 2015-05-13 23:08:20 -04:00
John Chilton 23459f3185 Expose and cache raw IE password to simplify RStudio plugin. 2015-05-13 23:08:20 -04:00
John Chilton 0a5ec3e8d3 Merge remote-tracking branch 'jmchilton/dev' into rstudio 2015-05-13 21:06:21 -04:00
Eric Rasche a9fb12a146 Update RStudio to new IE infrastructure 2015-05-11 17:11:04 -05:00
Eric Rasche 285eece97a Update RStudio to new IE infrastructure 2015-05-11 17:07:33 -05:00