Commit Graph
3171 Commits
Author SHA1 Message Date
anuprulez 0ef409dc12 adding close button and updating chat ui 2016-05-30 17:16:34 +02:00
anuprulez 7abca061f5 removed disconnet icon and moved the functionality to online status icon 2016-05-29 23:08:21 +02:00
anuprulez ee647dbe80 revert to fetching resources from the URLs and adjusted the size of chat window 2016-05-29 18:20:41 +02:00
anuprulez 48466e1a84 adjusted previous changes with new ones for the communication server 2016-05-28 23:09:32 +02:00
Bjoern Gruening b07cfa887d make client updates 2016-05-28 20:26:43 +02:00
anuprulez 19d333d427 updated files for real time communication feature addition 2016-05-26 01:28:07 +02:00
anuprulez e9642720b8 updating files for real time communication-server and client 2016-05-25 19:10:24 +02:00
guerler 2ddf4e02fc Upgrade shared ui libraries, add test cases 2016-05-18 08:24:35 -04:00
Martin Cech a144a32f40 Merge branch 'dev' of https://github.com/anuprulez/galaxy into anuprulez-dev
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
2016-05-17 16:32:50 -04:00
Dannon Baker 180eeeafe3 Merge branch 'revise_portlet_000' into dev 2016-05-17 08:00:17 -04:00
Dannon Baker a5f6195c3d Merge branch 'revise_visit_000' into dev 2016-05-16 18:39:48 -04:00
guerler c749e13973 Revise portlet view 2016-05-16 18:28:56 -04:00
Dannon Baker a0291c6142 Merge branch 'show-dce-count' into dev 2016-05-16 14:17:52 -04:00
Dannon Baker d9c0f4fa44 Merge branch 'datasets.show-inaccessible' into dev 2016-05-16 14:05:09 -04:00
guerler 86050f2b67 Build job success messages within tool form view 2016-05-12 18:27:14 -04:00
guerler 99693306e6 Revise form data visitor 2016-05-12 17:20:42 -04:00
anuprulez e96b8bbf7a Adding changes for latest Underscore JS library 2016-05-12 18:41:12 +02:00
anuprulez 7f95786aef Adding latest Underscore.js dependency 2016-05-12 18:24:26 +02:00
carlfeberhard 889ed2547a UI & API: fix display of inaccessible datasets
- Uses contexts in serializers to restore inaccessible field of hdas
- Overrides serialize to return only the inaccessible view of
inaccessible hdas (no other keys are returned): 'accessible', 'id',
'name', 'history_id', 'hid', 'history_content_type', 'state',
'deleted', 'visible'
- If a DatasetAssociation Backbone Model is inaccessible, considers it
to have details preventing the (failing) GET for more details

Should be revisited if/when thread local contexts (user/session) are
working.
2016-05-12 11:52:42 -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
carlfeberhard 3aaccdac7b UI, history: get element_counts after history load
- Waits 2s after history contents loading and fetches element_count
for all dataset collections in the history
- Removes element_count as a default summary field for HDCAs
2016-05-09 12:44:33 -04:00
carlfeberhard 8ce93d7fed UI, history: doc updates 2016-05-09 11:41:56 -04:00
carlfeberhard f9afb7bcdc UI & API, history: return element_count by default
- Adds element_count to summary serialization for hdcas through
history/{:id}/contents
- Implements a HistoryContents fetch method to decorate the hdcas
after loading if necessary
2016-05-09 11:34:13 -04:00
carlfeberhard a16ba6c615 UI, HDCAs: render element_count when available
- Adds a change event for element_count that renders the subtitle
- Subtitle now renders the count or nothing if not available
2016-05-09 10:17:42 -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