Commit Graph
3185 Commits
Author SHA1 Message Date
Dannon Baker a5cc0081f7 Merge branch 'release_16.04' into dev
Rebuild client.
2016-06-20 13:39:20 -04:00
carlfeberhard c8af30009b UI, history: backport of 3672eda
(update using xhr date header)
2016-06-16 11:57:02 -04:00
John Chilton 8a0056530f Improve configuration and display of collection operation tools. 2016-06-10 13:34:18 -04:00
Martin Cech c78c2796d3 isolate the data libraries css to affect only the libraries app 2016-06-03 14:28:49 -04:00
John Chilton a0dbcb93a3 Merge pull request #2440 from guerler/fix_subworkflows_display
Properly list subworkflows in run workflow form
2016-06-02 14:41:43 -04:00
guerler 1b3eaeb299 Fix batchmode labels 2016-06-02 12:42:31 -04:00
carlfeberhard f78d5404a2 Raven: remove tracekit as raven has its own 2016-06-02 09:26:16 -04:00
guerler dcd07221a8 Remove output details from success message 2016-06-01 01:21:31 -04:00
guerler 52a5f6e2db Properly display subworkflows in new run workflow form 2016-06-01 00:45:41 -04:00
John Chilton eefc73abae Merge pull request #2416 from guerler/tool_composite_000
Updates and fixes for the run workflow ui elements
2016-05-28 11:17:09 -04:00
guerler 8aa629a982 Updates and fixes of the run workflow ui elements and views 2016-05-26 13:41:09 -04:00
guerler 197f2283f9 Merge branch 'dev' into scratchbook_slider_000 2016-05-25 16:26:24 -04:00
carlfeberhard 2e45e77fa8 UI, history: correctly handle index API defaults
Bypasses the histories.index default `deleted=False` flag when using
HistoryCollection to fetch with `includeDeleted`.
2016-05-25 14:24:49 -04:00
guerler a12c1cb45b Cache histories individually 2016-05-25 11:37:47 -04:00
guerler 617cd2de82 Add event handlers to navigate through history 2016-05-25 11:37:47 -04:00
guerler 64cb97cfc9 Parse view instead of content dom on click 2016-05-25 11:37:47 -04:00
guerler e16c3f34f3 Remove unused class variables, reduce indention 2016-05-25 11:37:46 -04:00
guerler 44bd042624 Add support for optional header items/icons 2016-05-25 11:37:46 -04:00
guerler 53fa566a54 Use regular initialization from frame shadow view 2016-05-25 11:37:46 -04:00
guerler b9e2983e90 Remove grid lock feature 2016-05-25 11:37:46 -04:00
guerler be97d7e6db Replace frame dictionary with regular view 2016-05-25 11:37:45 -04: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