guerler
cfb0ddb2dd
Revise options, add test cases
2016-05-05 13:09:27 -04:00
guerler
bd22456c41
Revise selectors, add test cases
2016-05-04 15:57:31 -04:00
Dannon Baker
7166a87364
Merge branch 'release_16.04' into dev
2016-05-02 13:15:00 -04:00
Eric Rasche
9290ddc8a7
Fixes #2230
...
This sanitizes some instances where tool parameters were included
directly into the DOM.
workflow/run.mako displayed the parameter as a value in a hidden input.
This was base64 encoded as there was no better solution apparent at the
time. I'm not sure where this parameter is POSTed to but we should
figure that out and b64decode it, or remove the hidden parameter.
client/... added the parameter value into the DOM. This was easily
sanitized using a standard method.
workflow/display.mako included the parameter value directly into the
HTML. This was cgi.esacped
Conflicts:
static/scripts/bundled/libs.bundled.js.map
2016-05-02 12:25:35 -04:00
guerler
7718ac511b
Rename Utils.validate() to Utils.isEmpty()
2016-04-25 15:30:43 -04:00
Dannon Baker
bbf5722f27
Merge branch 'release_16.04' into dev
2016-04-22 12:33:14 -04:00
guerler
e5b3c94c5e
Fix js value validator
2016-04-22 12:16:19 -04:00
Eric Rasche
7dcc7a5af0
Fixes #2230
...
This sanitizes some instances where tool parameters were included
directly into the DOM.
workflow/run.mako displayed the parameter as a value in a hidden input.
This was base64 encoded as there was no better solution apparent at the
time. I'm not sure where this parameter is POSTed to but we should
figure that out and b64decode it, or remove the hidden parameter.
client/... added the parameter value into the DOM. This was easily
sanitized using a standard method.
workflow/display.mako included the parameter value directly into the
HTML. This was cgi.esacped
2016-04-22 05:44:59 +00:00
Dannon Baker
c563d37bfd
Merge branch 'release_16.04' into dev
2016-04-21 12:02:33 -04:00
guerler
971613404c
Avoid reset of cursor position for input fields during manual entry
2016-04-21 10:49:40 -04:00
Dannon Baker
9cd168bbab
make client
2016-04-21 09:27:10 -04:00
guerler
ca5f6053c7
Fix tool action redirects for non-default tools displaying tool forms
2016-04-21 00:59:37 -04:00
Dannon Baker
9b5fdbf9a4
Merge branch 'release_16.04' into dev
2016-04-19 19:25:45 -04:00
Dannon Baker
65fa24d57e
Merge 16.01->16.04, rebuild.
2016-04-19 19:25:21 -04:00
carlfeberhard
cfb8ed3269
UI, citations: fix bad merge from 15.10
...
774487d
2016-04-19 15:35:15 -04:00
Martin Cech
212f7f4aab
Merge branch 'release_16.01' into release_16.04
...
Conflicts:
client/galaxy/scripts/mvc/library/library-dataset-view.js
static/maps/mvc/library/library-dataset-view.js.map
static/maps/mvc/library/library-folder-view.js.map
static/maps/mvc/library/library-library-view.js.map
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js.map
static/scripts/mvc/library/library-dataset-view.js
static/scripts/mvc/library/library-folder-view.js
static/scripts/mvc/library/library-library-view.js
2016-04-19 11:02:44 -04:00
Nate Coraor
78f35bfe84
Merge branch 'release_16.04' into dev
2016-04-19 10:44:19 -04:00
Martin Cech
642fccd288
do not pass variable that is not used
2016-04-18 15:27:36 -04:00
Martin Cech
980d37f50f
fix a bug with missing history_id in libraries dataset import
...
also allow creation of new histories as exists in the folderlist view
2016-04-18 15:14:06 -04:00
guerler
cea9a12238
Replace masthead dom to avoid duplication
2016-04-18 09:49:02 -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
d8e4f571ae
Merge branch 'release_16.04' into dev
2016-04-15 11:40:54 -04:00
Dannon Baker
1c38b9723c
Merge 16.01->16.04
2016-04-15 11:39:07 -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
John Chilton
5a747bd127
Merge pull request #2144 from yhoogstrate/galaxy_workflow_autosniff
...
Tools with auto_format='true' connectable in workflow editor
2016-04-14 20:11:20 -04:00
carlfeberhard
8b49814859
Merge 16.01 into 16.04
2016-04-14 14:49:07 -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
87dbfeeabd
Merge branch 'release_16.01' into release_16.04
...
Conflicts:
static/scripts/bundled/analysis.bundled.js
static/scripts/bundled/analysis.bundled.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
2016-04-13 11:55:16 -04:00
yhoogstrate
5b0f23562d
Tools with auto_format='true' are connectable with other tools in workflow editor via GUI
2016-04-13 09:55:55 +02: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
guerler
543a999dfa
Fix data type list in editor
2016-04-07 04:44:11 -04:00
John Chilton
aee38feeb4
Merge remote-tracking branch 'galaxyproject/dev' into gie-generic
...
Conflicts:
static/maps/layout/menu.js.map
static/scripts/bundled/libs.bundled.js
static/scripts/bundled/libs.bundled.js.map
static/scripts/layout/menu.js
2016-04-04 13:00:21 -04:00
Dannon Baker
565f11f142
Merge branch 'lib-refactor-cleanup' into dev
2016-03-30 09:43:19 -04:00
Dannon Baker
d15b1030c5
Merge, rebuild.
2016-03-29 16:03:18 -04:00
Martin Cech
971b987f0b
libraries: fetch nondeleted only first to speed up
...
fetch the deleted only when specifically requested
2016-03-29 12:38:21 -04:00
Martin Cech
5def7ee035
refactor rest of JS templates;
...
move all text outside of the fontawesome spans
convert console. calls to Galaxy.emit calls
2016-03-29 12:38:21 -04:00
guerler
9f0ddf57bb
Revise input wrapper, add test cases
2016-03-29 12:02:10 -04:00
Martin Cech
2c76ba7502
repack client
2016-03-28 11:09:36 -04:00
Martin Cech
ee0a65bf13
fix duplication of select2 entries
...
leverage caching
2016-03-28 11:08:23 -04:00
guerler
d0f7ce260d
Add workflow content selectors and test cases
2016-03-27 16:18:29 -04:00
guerler
f70df22060
Upgrade content selector, add test cases
2016-03-27 16:18:26 -04:00
Dannon Baker
3240c20a4b
Swap analyse to analyze to be consistent.
2016-03-25 17:12:24 -04:00
Martin Cech
ce1b9aeb38
minor adjustments to markup; improve logging; repack
2016-03-25 15:54:26 -04:00
Martin Cech
87ea37ca28
add 'create history &import to it' feature
...
various refactorings and fixes to UX glitches
2016-03-25 15:24:23 -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
Martin Cech
ab31bd9f48
move text out of icon spans for library dataset view
...
also re-touch the html to be better readable
2016-03-24 13:12:02 -04:00
guerler
cfd937a46e
Repack scripts
2016-03-23 20:47:34 -04:00
guerler