Aysam Guerler
d31416f043
ToolForm: Temporary modification of return dictionary for datasets
2014-11-12 15:30:35 -05:00
Carl Eberhard
70c77dd8f2
Pages: allow registry visualizations to display within an iframe; Refactor embed_item.less and minor style fixes
2014-11-12 13:45:38 -05:00
Aysam Guerler
cbf63cf66f
ToolForm: Trigger change event manually
2014-11-12 11:30:59 -05:00
Aysam Guerler
8116209048
ToolForm: Show/hide single dataset selection field
2014-11-12 03:13:37 -05:00
Aysam Guerler
b9a13cdf2f
ToolForm: Match and sort datasets and collections through API, add single selection as default option
2014-11-11 21:46:38 -05:00
John Chilton
62918c0ff3
Small fix for e4c9f0b.
2014-11-11 15:56:18 -05:00
John Chilton
e1603d636e
Rework ToolDataParameter and ToolDataCollectionParameter to_dict to filter over valid matches.
...
Doesn't do anything with them yet - passing this work off to Sam to populate the dictionaries in whatever manner makes most sense for UI consumption.
2014-11-11 13:41:00 -05:00
John Chilton
80c72bae04
Refactor dataset matcher stuff for use outside of field generation.
...
(i.e. for reuse in filtering datasets on the client side)
2014-11-11 13:41:00 -05:00
Martin Cech
709abedcb4
Merged in anton/galaxy-central-anton (pull request #539 )
...
Initial tweaks to tool_conf.xml sample and one of the tools.
2014-11-11 12:26:45 -05:00
Aysam Guerler
b7ce02f5e5
ToolForm: Fix field type output
2014-11-10 15:07:04 -05:00
John Chilton
4d7bf62f49
Merge stable.
2014-11-10 11:43:09 -05:00
Dannon Baker
56abf815d0
Merged in BjoernGruening/galaxy-central-1/obo-owl-datatype (pull request #542 )
...
Add OWL & OBO datatype.
2014-11-10 08:14:49 -08:00
John Chilton
b391883060
Merged in nsoranzo/galaxy-central (pull request #551 )
...
Small bugs, doc and pylint fixes.
2014-11-10 11:04:02 -05:00
Carl Eberhard
b60de7d63f
Active history content: change style as suggested
2014-11-10 10:50:03 -05:00
John Chilton
1677e15a11
Bugfix renaming individual parts of pairs.
...
From Carl: "Yeah - that looks fine for stable. A better fix is probably adding the pair index directly into the DOM and getting it there - I'll add that to the 'Iteration 2' card. I'll approve now if you want to do the request."
2014-11-10 10:07:56 -05:00
Nate Coraor
5b3d1a220e
Update tag latest_2014.10.06 for changeset a1dca14d5b1a
2014-11-10 09:00:34 -05:00
Dannon Baker
0a1aa5dde6
Merged in kellrott/galaxy-farm/fix-tooltip (pull request #544 )
...
Adding fake host_url to tooltip rendering
2014-11-07 19:53:38 -05:00
Dannon Baker
302953f6ac
Merged in kellrott/galaxy-farm/workflow-input-fix (pull request #552 )
...
Fixing workflow import to correctly set the uuid
2014-11-07 19:48:15 -05:00
Kyle Ellrott
acda72d429
Putting in URL to current host for tooltip host_url variable
2014-11-07 14:18:32 -08:00
Nate Coraor
5321bbf0ef
Memory limit detection. This code is from default and is a partial graft. It
...
includes the code for detecting if a Slurm job was killed due to exceeding
memory limits but does not include resubmit functionality.
2014-11-07 15:41:27 -05:00
Aysam Guerler
113f90a91b
ToolForm: Integrate and optimize state population for tools api
2014-11-07 13:24:22 -05:00
Aysam Guerler
668cdc8309
ToolForm: Fix boolean handling
2014-11-07 10:39:19 -05:00
Martin Cech
616805c62b
Merged in martenson/galaxy-central-marten (pull request #554 )
...
fix for password rese
2014-11-07 10:29:06 -05:00
Kyle Ellrott
661b11cada
Removing whitespace fixes to avoid merge conflict
2014-11-06 14:18:03 -08:00
Aysam Guerler
5a1dac506d
ToolForm: Refactoring, generalize conditional parameters
2014-11-06 15:11:23 -05:00
Martin Cech
70d0d2c970
fix for https://trello.com/c/pML6OsMl/249-html-escaping-error-in-toolshed-password-reset-message
...
also removed bug with inproper redirecting when resetting password
2014-11-06 13:44:56 -05:00
Carl Eberhard
4825b9ed5c
History structure: incorporate tool data, refactor; HDA API: return create_time
2014-11-06 12:56:13 -05:00
Daniel Blankenberg
d29fb778aa
Merged in peterjc/galaxy-central-1/peterjc/fix-typo-nothting-sic-in-test-exception-1415290865597 (pull request #553 )
...
Fix typo nothting [sic] in test exception
2014-11-06 11:27:20 -05:00
Peter Cock
f9630ee81c
Fix typo nothting [sic] in test exception
2014-11-06 16:21:45 +00:00
Aysam Guerler
ad79a4dee8
ToolForm: Use classic ordering for repeat blocks
2014-11-06 09:02:29 -05:00
Kyle Ellrott
0caeade5b9
Fixing workflow import to correctly set the uuid
2014-11-05 17:39:08 -05:00
Aysam Guerler
e02ae27ab2
ToolForm: Prevent redundant ajax requests
2014-11-04 15:28:58 -05:00
Nate Coraor
ef48b26986
Update tag latest_2014.10.06 for changeset 9b8cb8d48a79
2014-11-04 14:00:15 -05:00
Martin Cech
51b295ac0b
typo
2014-11-04 13:58:42 -05:00
Martin Cech
479ac033f3
teach reports app to find its new config file
2014-11-04 13:38:24 -05:00
Dave Bouvier
db033edc64
Make the sharable link to a repository a clickable link.
2014-11-04 12:30:37 -05:00
Martin Cech
cadd51d097
initial commit of google analytics script
2014-11-04 11:14:31 -05:00
Nicola Soranzo
5cd46dc4dd
Bugs, doc and pylint fixes.
2014-11-04 16:48:33 +01:00
Nicola Soranzo
5d64d5d0b2
Add keys() and values() methods to Bunch.
2014-11-05 14:28:14 +01:00
Nicola Soranzo
0dc1fec519
Remove unused and buggy function.
2014-11-04 16:46:42 +01:00
Daniel Blankenberg
4c5ad58897
Add Tool ID to show job info page.
2014-11-04 10:32:59 -05:00
Martin Cech
3d86007c7c
initial commit of google analytics tracking for toolshed
2014-11-04 10:31:15 -05:00
Martin Cech
d6e0f23489
Merged in martenson/galaxy-central-marten (pull request #548 )
...
changesto user account updates
2014-11-04 10:27:24 -05:00
Martin Cech
20a20dffc1
gremmar
2014-11-04 10:26:53 -05:00
Carl Eberhard
bc5c86a03c
Merge default
2014-11-04 10:15:08 -05:00
Carl Eberhard
e77f7b2591
Fix: regenerate dataset-model urls on fetch even when silent
2014-11-04 09:51:53 -05:00
Björn Grüning
ee96638754
Remove set_meta() function. It's not used.
2014-11-04 11:01:42 +00:00
Björn Grüning
e1f299d626
Remove set_meta() function. It's not used.
2014-11-04 10:01:52 +00:00
Martin Cech
1b7b74e0bc
changes to account updates: added javascript valdiation of username and email changes; user account will be deactivated if you change an email address and you have to activate it once again
2014-11-03 15:16:36 -05:00
Dannon Baker
d1f0d323fe
Merge.
2014-11-03 15:04:17 -05:00
Aysam Guerler