Commit Graph
16525 Commits
Author SHA1 Message Date
Aysam Guerler 2efea0a048 Ui: Adjust styles 2015-02-13 15:00:23 -05:00
Dannon Baker 280e5c4e9e Mask password from connection log in queue worker. 2015-02-13 14:15:22 -05:00
Carl Eberhard 3d2c2ab913 UI, multi-history: move styles from mako to less 2015-02-13 14:00:42 -05:00
Dannon Baker 638f9cdff2 Add utility method for masking passwords from urls. 2015-02-13 13:05:24 -05:00
Dannon Baker 2559379dad Cleanup in util. 2015-02-13 09:39:49 -05:00
Aysam Guerler 574a4a4192 ColorPicker: Use fade out 2015-02-12 21:15:03 -05:00
Aysam Guerler 8d85b184d7 ColorPicker: Hide on selection 2015-02-12 21:12:13 -05:00
Aysam Guerler b7a6cd9c10 ColorPicker: Use lower case values 2015-02-12 20:42:56 -05:00
Aysam Guerler dcd7764db1 ColorPicker: Fix event handler 2015-02-12 20:11:11 -05:00
Aysam Guerler 327580cb35 Ui: Add default color 2015-02-12 20:02:59 -05:00
Aysam Guerler c36283a623 Change color 2015-02-12 19:46:08 -05:00
Aysam Guerler d43b1ed0c2 Ui: Add simple color picker 2015-02-12 19:24:56 -05:00
Carl Eberhard bb2cef9790 UI, history multi-view: fix size sorting, add more orders, rework UI for orders 2015-02-12 17:51:45 -05:00
Martin Cech bedf599779 fix for 'add datasets to folder' button in data libraries
when no library import configuration is set;
thanks to Carl for reporting this
2015-02-12 16:09:18 -05:00
Nate Coraor 1d16ebbe9b Rename the egg env vars back to GALAXY_* now that they are not config file options anymore. 2015-02-12 15:42:50 -05:00
Carl Eberhard b589725907 Merge 2015-02-12 15:35:47 -05:00
Carl Eberhard 8bf5a5b38d Core: move handlebars load before require (stackoverflow.com/questions/15371918); minor clean up 2015-02-12 15:35:24 -05:00
Nate Coraor 47a1c7752e Pass the egg env variables onto jobs. 2015-02-12 15:35:19 -05:00
Nate Coraor e64ab4c85c There's no reliable way to use the Galaxy config file to control egg use/fetching since so many things use galaxy.eggs from outside of Galaxy, so drop the support for the config file options and rely on the environment variables only. Reverse the defaults so that eggs and fetching are enabled by default. I'll make sure that they properly get passed to the tool execution environments in the next commit. 2015-02-12 15:10:19 -05:00
Dannon Baker c45710da57 Update original parse_xml function with Carl's fix. It's safe, and I know I saw that same doctype deprecation somewhere else, might as well share it. 2015-02-12 14:56:33 -05:00
Carl Eberhard 5029a819d5 Visualizations registry: remove ElementTree doctype deprecation warning 2015-02-12 14:47:45 -05:00
Nate Coraor 1e07117791 Place the new egg config options into the environment at Galaxy startup since
eggs.require() has no access to the config file.
2015-02-12 14:27:37 -05:00
Dannon Baker 6ff8aa97f7 Merge from stable. 2015-02-12 13:40:22 -05:00
Nate Coraor 212b1f9cb9 Merged in dannon/galaxy-central/stable (pull request #668)
[STABLE] Egg-fetching related bugfixes grafted from default.
2015-02-12 13:20:29 -05:00
Nate Coraor de6a45cc05 So, you can put module source URLs right into a requirements.txt. Thanks John (and thanks for nothing, pip documentation). 2015-02-12 13:18:15 -05:00
Carl Eberhard 03845f5ef3 UI, history multi-view: move copy and delete into submenu 2015-02-12 13:07:31 -05:00
Nate Coraor c051625a1c Require Whoosh<2.5 as per Martin. 2015-02-12 12:39:27 -05:00
Nate Coraor 0c8cb50c1d Use GALAXY_CONFIG_ environment variables instead of GALAXY_ to fall in line with convention. 2015-02-12 12:31:58 -05:00
Nate Coraor 49cc443b81 Make it possible to disable egg fetching or the use of eggs entirely and provide a requirements.txt. 2015-02-12 12:13:24 -05:00
Nate Coraor 92f6ace47f Ensure the correct default Galaxy config file is found in common_startup.sh, it
makes a difference for egg fetching since some eggs are conditional based on
config.
2015-02-12 11:47:58 -05:00
Martin Cech 082ff4d493 Merged in dan/galaxy-central-prs/stable (pull request #667)
[STABLE] Fixes for resetting metadata on ToolShed Repositories.
2015-02-12 11:42:29 -05:00
Carl Eberhard 48fc8fddea Merge 2015-02-12 11:18:40 -05:00
Carl Eberhard 286bf397d3 UI, history multi-view: render and keep drag help text on current histry as an affordance for drag-to-copy 2015-02-12 11:18:21 -05:00
Aysam Guerler 66f7303ba8 ToolForm: Separate tool parameters from sections 2015-02-12 11:10:14 -05:00
Dannon Baker fd500d7493 Fix path insertion vs appending of <galaxy>/lib for unit tests. 2015-02-12 10:37:44 -05:00
Dannon Baker a165e1d9b6 Fix path insertion vs appending of <galaxy>/lib for galaxy/main.py. 2015-02-12 10:36:10 -05:00
Dannon Baker 3961d4834f Fix path insertion vs appending of <galaxy>/lib for all scripts. 2015-02-12 10:34:51 -05:00
Dannon Baker c733ce370b Fix path insertion vs appending of <galaxy>/lib for all scripts. 2015-02-12 10:34:51 -05:00
Carl Eberhard eea2a8a346 UI, history multi-view: simplify header UI, label current history, some clean up 2015-02-12 10:06:37 -05:00
Nate Coraor 669bdd4dc2 Update tag latest_2015.01.13 for changeset 577b270034b4 2015-02-12 09:00:26 -05:00
Dannon Baker dce9c1a521 Fix path manipulation during fetch_eggs. This getting an external version of pkg_resources (and not ours in lib/) is what is causing the weird egg fetching errors. Newer versions of pkg_resources create a mangled distribution string for some eggs with nonstandard version identifiers. 2015-02-12 08:28:37 -05:00
Dannon Baker de1cd01954 Fix path manipulation during fetch_eggs. This getting an external version of pkg_resources (and not ours in lib/) is what is causing the weird egg fetching errors. Newer versions of pkg_resources create a mangled distribution string for some eggs with nonstandard version identifiers. 2015-02-12 08:28:37 -05:00
Dannon Baker 58e9b20965 Fix at least one error with zipfile downloads and file permissions not being set correctly. 2015-02-12 07:57:51 -05:00
Dannon Baker 6a46ea7d50 Fix at least one error with zipfile downloads and file permissions not being set correctly. 2015-02-12 07:57:51 -05:00
Dannon Baker 2822b64d3e pep8 in eggs module while trying to fix eggnotfetchable bugs 2015-02-12 07:55:52 -05:00
Aysam Guerler bbc750881e Ui: Drilldown remove unnecessary index 2015-02-12 00:56:29 -05:00
Aysam Guerler 43878c2fff Ui: Drilldown fix state expansion 2015-02-11 22:41:03 -05:00
Aysam Guerler 8bc22ecd91 Ui: Drilldown simplify state expansion 2015-02-11 22:04:53 -05:00
Aysam Guerler 9cdf570585 Ui: Drilldown set initial expand states 2015-02-11 21:58:08 -05:00
Aysam Guerler 3ffcc2448c Charts: Fix error message 2015-02-11 20:56:10 -05:00