opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-16 15:45:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,533 Commits 62 Branches 243 Tags
c26d06839190e8d75d744bc4884cb670e44a77ee
Commit Graph
28533 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
anuprulez c26d068391 Update logic to show node name and bootstrap 2017-07-07 14:20:35 +02:00
anuprulez 23f3a31d27 Round off the confidence values 2017-07-07 13:58:49 +02:00
anuprulez ee948063e1 Show the confidence value as text on phylogenetic tree branches 2017-07-07 13:32:59 +02:00
anuprulez 390afd6e83 Updating the node tooltip to add confidence level information 2017-07-06 18:42:40 +02:00
anuprulez 065ab584c7 Merging with dev 2017-07-05 23:30:35 +02:00
Dannon Baker 9a65d9b2ab Merge pull request #4272 from erasche/uniform-titles 
Uniform titles
 2017-07-05 17:00:09 -04:00
Dannon Baker bec227436c Client build as part of merge. 2017-07-05 16:57:13 -04:00
Dannon Baker 601c136247 Merge remote-tracking branch 'pvanheus/collection_tag_searchable' into dev 2017-07-05 16:55:54 -04:00
Peter van Heusden caffea1253 Search collections by tags 2017-07-05 22:16:30 +02:00
John Chilton a42abc03e0 Merge pull request #4119 from mvdbeek/version_switch_fix 
Merge ShedToolLineage and StockLineage to ToolLineage
 2017-07-05 15:42:41 -04:00
Marius van den Beek 516f7bff63 Merge pull request #4281 from jmchilton/test_fixes 
Fix problem in collection download tests related to ID references.
 2017-07-05 22:09:29 +03:00
John Chilton 3529897b88 Merge pull request #4186 from dpryan79/fix3990 
Fix #3990, don't chown non-galaxy files
 2017-07-05 14:24:53 -04:00
John Chilton 422add1c48 Fix problem in collection download tests related to ID references. 
DatasetsCollectionElement ids were being confused with HDA ids.
 2017-07-05 14:20:47 -04:00
Nicola Soranzo dab07a6715 Merge pull request #4274 from jmchilton/users_api 
Expose more user properties to admins via the API.
 2017-07-05 18:04:15 +01:00
anuprulez efc877ab29 Adding showBootstrap feature for Phylocanvas viz 2017-07-05 18:44:38 +02:00
Nicola Soranzo 9eb3c0f40a Merge branch 'release_17.05' into dev 
Conflicts:
	static/style/blue/base.css
	test/functional/tools/sample_datatypes_conf.xml
 2017-07-05 16:19:10 +01:00
Nicola Soranzo d0893b91ae Merge branch 'release_17.01' into release_17.05 2017-07-05 15:36:16 +01:00
Nicola Soranzo bfb3ce6e79 Merge branch 'release_16.10' into release_17.01 
Conflicts:
	test/functional/tools/sample_datatypes_conf.xml
 2017-07-05 15:34:41 +01:00
Nicola Soranzo fada8d2a60 Merge branch 'release_16.07' into release_16.10 2017-07-05 15:05:28 +01:00
John Chilton 7baf86f7c1 Merge pull request #4227 from bwlang/galaxy_with_conda_python 
avoids broken version of mercurial in conda
 2017-07-05 09:45:30 -04:00
John Chilton 5a39d47b0a Merge pull request #4230 from nsoranzo/release_16.07_backport_4224 
[16.07] Backport #4224
 2017-07-05 09:44:32 -04:00
John Chilton bd2d52800e Merge pull request #4233 from guerler/fix_color_picker_release 
[17.05] Remove float style from color picker label
 2017-07-05 09:43:36 -04:00
John Chilton 20ef3eebcf Merge pull request #4236 from nsoranzo/python3 
Fix import order and Python3 compatibility for 51 files
 2017-07-05 09:27:33 -04:00
John Chilton 79f3dc00a6 Merge pull request #4248 from mvdbeek/uninstall_repository_api_endpoint 
Add API repository uninstall endpoint
 2017-07-05 09:18:05 -04:00
Dannon Baker 86caee96e9 Merge pull request #4278 from jmchilton/gitignore 
Add test_errors to .gitignore.
 2017-07-05 09:12:50 -04:00
John Chilton a4689b6bf3 Add test_errors to .gitignore. 
Used to store information about selenium failures.
 2017-07-05 08:21:49 -04:00
John Chilton 932b8f59ec Merge pull request #4250 from bwlang/spelling_style_fixes 
Spacing convention, -> util.asbool, atribute -> attribute
 2017-07-05 07:11:15 -04:00
John Chilton d9607684ef Tweak exposing user attributes to use an include list instead of exclude list. 
This allows for the addition of new dictifiable attributes on user like in 55956fe2ca without exposing these attributes to non-admin users.
 2017-07-05 07:04:20 -04:00
mvdbeek 6a8f15bacb Add basic unittest for InstalledRepositoryManager 
that exercises the most basic functionality, which is the deactivate and
to uninstall repositories. Also moves shared `_init_dynamic_tool_conf`
method to BaseToolBoxTestCase
 2017-07-04 19:43:34 +03:00
John Chilton 57d5b485b5 Merge remote-tracking branch 'XDtim/dev' into users_api 2017-07-04 05:51:58 -04:00
John Chilton 7ce50a8ff7 Merge remote-tracking branch 'upstream/dev' into login_only 2017-07-04 05:40:31 -04:00
John Chilton ac59d1d6e0 Merge pull request #4259 from gregvonkuster/ptkscmp 
Add ptkscmp datatype
 2017-07-04 05:33:32 -04:00
Jelle Scholtalbers 010beb8270 code optimization - reuse userTab variable 2017-07-04 09:01:10 +02:00
John Chilton 666c4bcbb0 Merge remote-tracking branch 'guerler/fix_shared_history' into dev 2017-07-03 20:46:42 -04:00
John Chilton bc8d6dd1da Merge pull request #4271 from mvdbeek/job_rerun_changed_parameters 
Keep tool parameters when rerunning a job
 2017-07-03 20:37:00 -04:00
XDtim e320fd4a20 Impliment review comments from @nsoranzo 2017-07-03 17:30:00 -06:00
Nicola Soranzo ee62fa7de8 Merge pull request #4270 from mvdbeek/context_manager_get_fileobj 
Use contextmanager when using compression_util.get_fileobj()
 2017-07-03 13:23:21 +01:00
mvdbeek 3d16aa62fa Also remove the inner try/except 2017-07-03 13:25:35 +02:00
mvdbeek e379f44eff Remove outer try/except in Eland sniffer 
Exceptions in a sniffer are already caught in
galaxy.datatypes.sniff.guess_ext() and are equivalent to `return False`.
Thanks @nsoranzo!
 2017-07-03 13:25:35 +02:00
mvdbeek b928236cfa Fix indentation 2017-07-02 16:27:28 +02:00
mvdbeek 4c68e29a81 Use if/else if to determine the job_id 2017-07-02 16:24:29 +02:00
mvdbeek 65e3365948 Simplify if/elif (thx @nsoranzo) 2017-07-02 15:49:32 +02:00
mvdbeek 3492f0e18f Fix the uninstall/deactivate message that is send to the mako template 2017-07-02 15:42:38 +02:00
E Rasche e88986f389 Accidental inclusion 2017-07-02 06:00:38 +00:00
E Rasche 3f03774616 Redundant 2017-07-02 05:45:12 +00:00
E Rasche 0bc2d9c96a Uniform html titles 2017-07-02 05:45:09 +00:00
mvdbeek 36bdd99fbc Keep tool parameters when rerunning a job 
with a different tool version, as long as the parameter did not change.
Addresses https://github.com/galaxyproject/galaxy/issues/1729
 2017-06-30 16:54:45 +02:00
mvdbeek cbcee585b5 Use contextmanager when using compression_util.get_fileobj() 2017-06-30 11:56:59 +02:00
guerler d694b60613 Remove shared grids mako 2017-06-29 04:06:44 +02:00
guerler fb73b5dc14 Align operation handling 2017-06-29 04:03:30 +02:00