Commit Graph
3737 Commits
Author SHA1 Message Date
guerler 86050f2b67 Build job success messages within tool form view 2016-05-12 18:27:14 -04:00
Dannon Baker 366056c0b7 Rebuild following client libs update 2016-05-12 10:00:37 -04:00
Dannon Baker ab05091379 Merge pull request #2328 from carlfeberhard/client.libs-update
Client library updates
2016-05-12 09:55:49 -04:00
Dannon Baker 09e8f0ab9b Merge pull request #2338 from guerler/update_qunit_000
Update qunit and sinon
2016-05-11 19:10:53 -04:00
carlfeberhard ecfbf53e66 (merge conflicts) 2016-05-11 12:48:32 -04:00
Dannon Baker f3e4cd4dda Make client. 2016-05-11 11:09:08 -04:00
guerler 7e63ae66cd Update qunit and sinon 2016-05-10 20:40:39 -04:00
carlfeberhard 0844852388 UI: remove deprecated jQuery.size()
(from selected scripts)
2016-05-10 10:15:20 -04:00
carlfeberhard 3672eda0ea UI, history: update using xhr date header
Makes the 'updated since' contents query based on any previous update's
ajax Date response header instead of the client time. This may offer
more protection against incorrect client time.

This works (and may work better than the previous method) because the
Date header is floored and not rounded and seems to mark a time before
the contents query is made.

Resolves #2242 (hopefully)
2016-05-10 09:35:25 -04:00
carlfeberhard af15f55ea9 UI: major library updates
jquery          1.12.3
jquery-migrate  1.4.0
ravenjs         3.0.3
requirejs       2.2.0
tracekit        0.4.3
underscore      1.8.3
backbone        1.3.3
bootstrap-tour  0.10.3
d3              3.5.17
2016-05-09 14:11:55 -04:00
carlfeberhard bab9e44db1 (re-build client) 2016-05-09 13:28:03 -04:00
carlfeberhard b5c198a7bc Build: remove redundant webpack step in makefile
Removes the webpack make target and the 'webpack' call from client
target. The webpack production build step is already called from
the `grunt` step.
2016-05-09 13:07:10 -04:00
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 created a difference between the imported name and the one
used.
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 35ab333c7e remove old template 2016-04-18 15:18:50 -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 1e04025819 Merge branch 'release_16.04' into dev 2016-04-14 14:50:59 -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
Nate Coraor a919e98be3 Merge branch 'release_16.04' into dev 2016-04-14 11:15:43 -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
nturaga 2c81a648a7 changed class name 2016-04-13 10:50:52 -04:00
nturaga 90d21d6353 Added class linewrap base.less file 2016-04-13 10:16:02 -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