Nate Coraor
08f66a924b
GIE container waiting and swarm management.
...
1. Create a new API endpoint and client spin to wait for GIE containers to
become ready. IEs are not required to use it, but usage does require
a slight change to their `load_notebook()` functions.
2. Add a Docker swarm manager daemon that runs automatically
to add nodes when services are waiting, clean up exited services, and
remove idle nodes. Shuts down automatically when there's nothing to
do.
The format of the GIE proxy session database has changed, if GIEs are
running when you restart Galaxy, they will be interrupted. If you run
the GIE proxy separate from Galaxy, you should restart it after
upgrading.
2017-03-13 21:31:55 -04:00
Dannon Baker
90108e450f
tool-form needs to not be required at the top level of the Galaxy webapp
2017-03-08 15:38:38 -05:00
anuprulez
0bfe9fa7ca
Merging with dev
2017-03-07 21:46:26 +01:00
Dannon Baker
006801ba1a
Escape FTP filename. Thanks @yhoogstrate
2017-03-07 07:43:45 -05:00
guerler
477626385c
Filter tags by query term
2017-03-06 18:48:58 -05:00
Dannon Baker
f8e6b84998
Compose tag:value serverside -- we don't benefit from having them split when shipped (yet)
2017-03-06 18:46:05 -05:00
Dannon Baker
278da1b356
Merge remote-tracking branch 'upstream/dev' into nametags_to_value
2017-03-06 17:36:04 -05:00
Dannon Baker
942f0d98d9
Only compose tag:value one time on the client.
2017-03-06 17:29:33 -05:00
Dannon Baker
d20e19e85a
Include values in tags and tag selection lgoic
2017-03-06 16:30:26 -05:00
guerler
a52695dee6
Escape title for select labels
2017-03-06 16:01:35 -05:00
guerler
496f476b30
Fix tag escaping
2017-03-06 15:58:31 -05:00
guerler
ecaf1be02f
Show tags in select search field
2017-03-06 15:15:35 -05:00
guerler
5055283f49
Merge branch 'tags_in_history' into dev
2017-03-06 13:27:44 -05:00
guerler
6b2f9be75a
Use space instead of comma when concatenating tags
2017-03-03 14:11:01 -05:00
guerler
735f56ec95
Concat all tags to improve front-end performance
2017-03-03 14:02:04 -05:00
Dannon Baker
a3ab46ef26
Swap to a 'nametags' field in the high level view instead of returning all tags. TODO: Optimize this
2017-03-03 09:34:16 -05:00
Dannon Baker
4b7fea8d3f
Adjust positioning again for nametags, below the standard title but still visible above the fold.
2017-03-02 21:16:03 -05:00
Dannon Baker
9e5008984f
nametags first, then hid+title
2017-03-02 20:42:48 -05:00
Dannon Baker
31d222c910
'name' tag rendering, very basic, needs styling and loading fixes
2017-03-02 18:08:34 -05:00
guerler
2135e63f8e
Filter tags regardless of given select field label
2017-03-02 12:49:25 -05:00
guerler
c80380dc57
Merge branch 'dev' into unify_label_name_000
2017-02-28 16:13:17 -05:00
guerler
3efe748279
Strip partially removed autocomplete feature for history names, removed in #1303
2017-02-27 15:05:10 -05:00
guerler
fb17e55a1d
Use former version of autocomplete module for grids
2017-02-27 12:41:00 -05:00
guerler
b9ba754ce6
Fix repacked files
2017-02-24 14:01:50 -05:00
guerler
2f53b1d6d1
Merge branch 'dev' into unify_label_name_000
2017-02-24 13:23:10 -05:00
guerler
820c46cf63
Repack scripts
2017-02-24 13:21:48 -05:00
Dannon Baker
0da2ac78e6
Rebuild client -- bad merge previously.
2017-02-22 16:04:03 -05:00
guerler
198d36f77b
Fix step title in composite tool form
2017-02-22 12:53:57 -05:00
guerler
dde9ba83ac
Merge branch 'dev' into unify_label_name_000
2017-02-22 12:20:13 -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
guerler
c9b765794b
Fix form handler
2017-02-21 19:01:22 -05:00
guerler
b03904b52c
Allow input specific error handling, fix input parameter configuration
2017-02-21 17:38:15 -05:00
guerler
3a7e6b0b74
Enable labels for all modules, used shared building process
2017-02-21 17:17:22 -05:00
guerler
0f742a6d83
Move workflow related tool form to workflow directory
2017-02-21 16:59:14 -05:00
guerler
92bd559c11
Move label/annotation input parameters at top for all modules
2017-02-21 16:28:38 -05:00
guerler
e13958ffcd
Remove tool module related annotation input parameter
2017-02-21 16:27:40 -05:00
guerler
b91680a5b2
Use shared label/annotation input parameter building process
2017-02-21 16:26:46 -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
Nate Coraor