Dannon Baker
ebb49d460b
Make client, somehow this got out of sync.
2016-04-20 13:19:03 -04:00
carlfeberhard
cfb8ed3269
UI, citations: fix bad merge from 15.10
...
774487d
2016-04-19 15:35:15 -04:00
Martin Cech
b95cca862c
always fetch new permissions as we are reusing the view
2016-04-15 12:58:36 -04:00
Dannon Baker
9e278de395
Rebuild client.
2016-04-15 11:33:19 -04:00
Dannon Baker
3e79a574be
Merge #2167 manually to resolve conflicts.
2016-04-15 11:31:58 -04:00
carlfeberhard
e26bff23ed
Merge 'release_15.10' with 'release_16.01'
2016-04-14 12:59:05 -04:00
carlfeberhard
03c8573731
Multi-history: open rerun button in new tab
2016-04-14 12:12:23 -04:00
Martin Cech
1e3b3a1558
fix the value passed to Masthead as options were options.config before
2016-04-12 14:43:18 -04:00
Martin Cech
2ebe940510
load options from config, not from options
2016-04-12 12:50:18 -04:00
Dannon Baker
7d1b525682
The response from dataproviders here can return data===null in addition to being simply undefined. This corrects the logic shortcutting and prevents errors like 'Cannot read property 'min' of null'
2016-03-25 10:37:28 -04:00
guerler
79d16f71f9
Fix scratchbook
2016-03-22 14:19:58 -04:00
carlfeberhard
fef166545c
Layout: Fix optional panel rendering and associated inline css
2016-03-22 11:52:13 -04:00
carlfeberhard
133f77413e
Fix 'Resend verification' link in inactive user message box which would display as [Object object]
2016-03-22 11:24:14 -04:00
guerler
58346169df
Fix dom duplication
2016-03-22 10:54:38 -04:00
guerler
bd0439d9b7
Fix tool access rights and forwarding
2016-03-18 20:12:21 -04:00
carlfeberhard
774487ddcc
Fix citation-model to fail silently/gracefully when a non-parsable bibtex entry is tried
2016-03-07 11:07:56 -05:00
John Chilton
e14e8a074c
Allow rerun of datasets new yet queued by job manager.
2016-03-04 09:14:29 +00:00
carlfeberhard
f27ff0c7ba
Fix to 9acbfdf: initial fix borked fa-2x, instead remove second woff loaded due to fa-icon font-family rule by aliasing that to fa
2016-02-24 12:46:06 -05:00
carlfeberhard
9acbfdf3c3
Fix chrome-only intermittent rendering error of font awesome icons that have their sizes changed by overriding 4.2 font-size inheritance rule from core.less
2016-02-23 15:46:00 -05:00
John Chilton
dbab6f5b97
Workaround for #1739 - fixing up subworkflow inut connections.
...
Do the same relaxed thing we do for inputs of type 'input' as we do for outputs of this type. Someday we should have better tracking, but such a change is probably not wise for a release branch.
2016-02-22 21:46:03 +00:00
carlfeberhard
84de6b4ed3
Fix target or window.location when importing histories from display.mako (shared with me->view) to allow for iframes; silence popup-menu.js when menu is closed due to location change
2016-02-17 14:41:08 -05:00
Martin Cech
776180ab80
show all available information for current library and the opened folder
2016-02-09 10:24:02 -05:00
Martin Cech
054c04f490
Merge pull request #1695 from natefoo/help-message-css
...
[16.01] Update help text rST note/warning/error box styling for change in div class from toolHelpBody to ui-form-help.
2016-02-08 10:41:54 -05:00
Nate Coraor
5e77af198a
Update help text rST note/warning/error box styling for change in div
...
class from toolHelpBody to ui-form-help.
2016-02-08 09:47:07 -05:00
Martin Cech
7867f3e083
accept json as input for setting permissions;
...
fix inconsistency by leveraging role_manager
2016-02-04 15:51:57 -05:00
Bjoern Gruening
45f523f922
fix show_welcome_with_login = True
2016-02-03 15:19:09 +01:00
guerler
61818948a1
Fix default option for repeats
2016-02-01 11:31:50 -05:00
Dannon Baker
44336b289b
Merge pull request #1620 from guerler/fix_module_border_000
...
[16.01] Fix module/step border style in workflow canvas
2016-01-29 14:55:47 -05:00
guerler
4ae49fbfec
Fix module/step border style in workflow canvas
2016-01-29 14:24:56 -05:00
carlfeberhard
f5fbe1c502
Client: remove older compiled backbone/backbone.js, update scatterplot and charts for same; Visualizations: fix visualization-model url; Scatterplot: fix title bug and Galaxy var
2016-01-21 13:38:12 -05:00
John Chilton
a00faba4fe
Merge pull request #1551 from guerler/fix_hidden_rerun_000
...
[16.01] Keep track of hidden datasets
2016-01-21 09:39:02 -05:00
guerler
035a67d0b5
Keep track of hidden datasets
2016-01-21 03:15:23 -05:00
guerler
bbff72e0ce
Fix upgrade messages
2016-01-20 19:48:02 -05:00
guerler
4b5b970d78
Fix disabled css
2016-01-13 20:50:40 -05:00
guerler
37f8038d63
Undo user icon in masthead
2016-01-13 14:31:40 -05:00
John Chilton
3dda415fb9
Merge remote-tracking branch 'jmchilton/release_16.01' into release_16.01_merge_4
...
Conflicts:
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
2016-01-11 12:15:14 +00:00
carlfeberhard
54dca064fa
UI, Multi-history: fix drop event handler to use dataTransfer of original event
2016-01-11 10:21:06 -05:00
John Chilton
f8a7ac0820
Merge release_15.10 into release_16.01.
...
Conflicts:
eggs.ini
lib/galaxy/tools/__init__.py
lib/galaxy/tools/actions/__init__.py
lib/galaxy/tools/toolbox/base.py
static/maps/mvc/collection/list-collection-creator.js.map
static/maps/mvc/library/library-foldertoolbar-view.js.map
static/maps/utils/uploadbox.js.map
static/scripts/mvc/collection/list-collection-creator.js
static/scripts/mvc/library/library-foldertoolbar-view.js
static/scripts/utils/uploadbox.js
test/base/twilltestcase.py
test/functional/tools/samples_tool_conf.xml
2016-01-08 18:06:28 +00:00
guerler
237ecc7789
Add form help class
2016-01-05 16:15:55 -05:00
Dannon Baker
a1a549ea67
Re-add identifiers to masthead, new ones for scratchbook (thanks @guerler)
2016-01-05 14:04:22 -05:00
Dannon Baker
9416e6f3f7
Merge and resolve conflicts, rebuilding.
2016-01-05 13:18:46 -05:00
Dannon Baker
5924857c2c
Fix pre/postclick that got broken somewhere along the way w/ patches&merges.
2016-01-05 13:08:33 -05:00
guerler
884b1d42db
Change scratchbook close icon
2016-01-05 11:45:31 -05:00
Dannon Baker
1d97e4271e
Merge dev to include menu/onclick fix.
2016-01-05 11:00:10 -05:00
Dannon Baker
62b80dfcc5
Fix onclick broken in #1407
2016-01-05 10:04:03 -05:00
Dannon Baker
4ef3e21c95
Fix onclick handling broken w/ #1407
2016-01-05 09:44:06 -05:00
Dannon Baker
da8b943f53
Merge.
2016-01-04 19:23:06 -05:00
Eric Rasche
5a441044fb
Merge pull request #1308 from jmchilton/multi_collection_types
...
Allow input collections to specify multiple collection types.
2016-01-04 14:43:37 -06:00
guerler
c9870cb89d
Fix url formatting
2016-01-04 08:34:56 -05:00
guerler
4cd621dd37
Add test cases
2015-12-31 01:46:37 -05:00
Dannon Baker