anuprulez
b18736d824
Updating Cytoscape viewer in Viz/Charts, replacing the previous 'basic' folder name to 'viewer' and updating the wrapper.js file
2017-02-23 23:32:35 +01:00
Dannon Baker
0da2ac78e6
Rebuild client -- bad merge previously.
2017-02-22 16:04:03 -05:00
Martin Cech
d1c9ffb94c
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev
...
Conflicts:
client/galaxy/scripts/mvc/tool/tool-form-composite.js
preserved dev version
static/maps/mvc/tool/tool-form-composite.js.map
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
static/scripts/mvc/tool/tool-form-composite.js
2017-02-22 10:56:40 -05:00
Martin Cech
387805fc13
Merge branch 'release_17.01' into dev
...
Conflicts:
client/galaxy/scripts/mvc/tool/tool-form-composite.js
preserved the dev version
static/maps/mvc/tool/tool-form-composite.js.map
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
static/scripts/mvc/tool/tool-form-composite.js
2017-02-22 10:54:08 -05:00
Nicola Soranzo
24eba8c58e
Merge branch 'release_17.01' into dev
...
Conflicts:
client/galaxy/scripts/mvc/tool/tool-form-composite.js
static/maps/mvc/tool/tool-form-composite.js.map
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
static/scripts/mvc/tool/tool-form-composite.js
2017-02-21 20:31:17 +00:00
John Chilton
09c08d1f61
Merge pull request #3636 from guerler/fix_annotation
...
[17.01] Fix annotation display for data inputs
2017-02-21 07:48:18 -05:00
Dannon Baker
a3a7e1001c
Strip stashed-yet-merged debug detritus from history UI fixes.
2017-02-20 17:16:27 -05:00
Dannon Baker
ce264f9542
Reimplement *old* method for unhide/delete-all-hidden using a temporary web controller endpoint.
2017-02-20 13:53:40 -05:00
guerler
8557c32034
Fix sanitization
2017-02-20 13:10:20 -05:00
guerler
f1f6bf6c3a
Fix annotation display for data inputs
2017-02-20 12:10:11 -05:00
Dannon Baker
f155a9420a
temp
2017-02-17 09:07:54 -05:00
guerler
841cbfd9c7
Fix content id parsing, through error if subworkflow could not be found
2017-02-16 12:55:04 -05:00
Dannon Baker
ab6ae42c7a
Cancel existing delayed updates when changing pages in the history.
2017-02-15 15:45:53 -05:00
guerler
5cd0516141
Merge branch 'dev' into unify_name_label
2017-02-15 14:41:37 -05:00
Dannon Baker
8ce1291359
Merge branch 'release_17.01' into dev
2017-02-14 15:58:31 -05:00
Dannon Baker
944feb2411
Minor tooltip tweaks.
2017-02-14 15:49:59 -05:00
guerler
6330f60517
Merge branch 'dev' into unify_name_label
2017-02-14 15:01:58 -05:00
Dannon Baker
43d80a0b60
Tooltips to suggest relog for quota correction.
2017-02-14 14:43:48 -05:00
Dannon Baker
3f07555173
Merge branch 'dev' into recalc-on-logout
2017-02-14 14:22:02 -05:00
guerler
79c24066b4
Merge branch 'dev' into unify_name_label
2017-02-14 13:14:54 -05:00
Dannon Baker
255aa0470f
Fix workflow save-as url not using galaxy's prefix.
2017-02-14 07:32:13 -05:00
Dannon Baker
4fc0b84910
Merge remote-tracking branch 'guerler/fix_tool_reload_003' into dev
2017-02-13 15:44:41 -05:00
Nicola Soranzo
e06f56a615
Merge branch 'release_17.01' into dev
...
Conflicts:
static/maps/mvc/tool/tool-form-base.js.map
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
static/scripts/mvc/tool/tool-form-base.js
2017-02-13 18:13:40 +00:00
Dannon Baker
fcbb7c3de1
Tooltips to suggest relog for quota correction.
2017-02-12 15:50:08 -05:00
guerler
73b8fc45aa
Check once for admin operations when building dropdown list in tool form
2017-02-10 23:52:39 -05:00
guerler
9590d45514
Improve success message upon tool xml reloading
2017-02-10 23:48:05 -05:00
guerler
10943712b8
Revise dropdown item label
2017-02-10 23:46:49 -05:00
guerler
8e59ec1e2b
Remove unused tooltips for submenu options, fix response
2017-02-10 23:39:00 -05:00
guerler
727bfbd258
Fix error message style, raise message exception if tool has not been found
2017-02-10 23:20:38 -05:00
guerler
cd52f20961
Align code style to existing code in tool form base
2017-02-10 23:05:35 -05:00
guerler
1aa459f19d
Use shared modal viewer
2017-02-10 23:01:25 -05:00
guerler
b466ff6cd8
Fix root location for tool reloader
2017-02-10 23:00:56 -05:00
guerler
69552ba63b
Fix root location for tool reloader
2017-02-10 21:36:44 -05:00
guerler
d484355832
Provide attributes to front-end, build title on client side
2017-02-10 11:01:08 -05:00
guerler
1858e43d46
Unify handling/parsing of label and fixed module name to build title in workflow run form
2017-02-10 10:46:32 -05:00
guerler
d27e0570cb
Remove name handling field from workflow module forms
2017-02-10 10:15:23 -05:00
guerler
3e3eb4d139
Unify build_module handler
2017-02-09 14:32:18 -05:00
guerler
07a92fd3ef
Remove tool_model usage from client
2017-02-09 12:41:27 -05:00
John Chilton
d302400b99
Merge pull request #3407 from guerler/fix_workflow_ui
...
Workflow editor UI touch up
2017-02-07 14:55:01 -05:00
guerler
5b36664201
Fix qunit tests
2017-02-06 14:13:59 -05:00
guerler
f264e91cab
Use update endpoint to store workflows
2017-02-06 11:00:58 -05:00
Nicola Soranzo
0b074f3fa5
Merge branch 'release_17.01' into dev
...
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
2017-02-03 11:44:02 +00:00
Dannon Baker
58241e8dcb
Rebuild client for 17.01 with latest node.
2017-02-01 14:51:07 -05:00
guerler
5bf7c46eca
Repack scripts
2017-01-31 12:40:49 -05:00
guerler
3911cb039d
Merge branch 'dev' into fix_workflow_ui
2017-01-24 13:15:00 -05:00
guerler
0b0419533a
Merge branch 'dev' into fix_workflow_issues
2017-01-24 09:12:18 -05:00
John Chilton
1b589f252e
Merge remote-tracking branch 'jmchilton/dev' into escape_vis
...
Conflicts:
static/scripts/bundled/libs.bundled.js.map
2017-01-23 11:27:26 -05:00
guerler
0482416c7a
Merge branch 'dev' into fix_workflow_issues
2017-01-17 13:09:14 -05:00
Nicola Soranzo
8cb6162681
Merge branch 'release_16.10' into dev
...
Conflicts:
static/maps/mvc/ui/ui-misc.js.map
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
static/scripts/mvc/ui/ui-misc.js
2017-01-16 11:57:16 +00:00
yhoogstrate
ce0780abef
Custom dbkey builds: additional variable escaping
2017-01-16 10:35:52 +01:00
anuprulez