carlfeberhard c15e5db2ec (manually merge conflicts)

2016-03-07 16:15:38 -05:00

..

citation

UI, Citations: fix citation-model's import of bibtex to use *either* commonjs or global

2015-12-14 17:22:58 -05:00

collection

(merge dev)

2016-01-15 11:27:23 -05:00

dataset

UI: use strict and replace leaky uses of Backbone.Events.on with listenTo

2016-01-12 15:18:54 -05:00

form

Remove former populate_state

2016-02-18 17:41:38 -05:00

grid

Fix style of labels in grids

2015-11-04 04:09:10 -05:00

history

UI, histories: rework update system to check contents based on update times of contents and only stop checking when history has no more running jobs

2016-02-24 09:20:24 -05:00

job

(merge dev)

2015-11-20 10:29:23 -05:00

library

refactor library dataset permissions API to use role manager

2016-02-17 11:59:00 -05:00

list

UI, Histories: use links for file inputs shown in show_params (the 'i' button in the datasets of histories) that, when clicked, 1) scroll the history to the dataset shown and 2) open *that* datasets info/show_params in the center panel

2016-01-21 16:18:28 -05:00

tool

Remove DummyDataset

2016-02-18 17:41:41 -05:00

ui

Merge branch 'release_16.01' into dev

2016-02-18 19:52:23 +00:00

upload

Disable individual file metadata changes in upload

2016-01-29 22:51:21 -05:00

user

UI: use strict and replace leaky uses of Backbone.Events.on with listenTo

2016-01-12 15:18:54 -05:00

visualization

Merge release_16.01 into dev.

2016-01-26 09:06:52 +00:00

workflow

Use visit_inputs for check_and_update_param_values

2016-02-24 21:26:30 -05:00

annotation.js

Webpack: normalize tags, annotations, and tools (change refs - 3 of 3)

2015-11-13 16:28:39 -05:00

base-mvc.js

UI: use strict and replace leaky uses of Backbone.Events.on with listenTo

2016-01-12 15:18:54 -05:00

tag.js

Webpack: correct tool menu template loading in requirejs/galaxy.panels.mako by using require.config.map; normalize galaxy_config.root and Galaxy.options.root to Galaxy.root across the templates and js

2015-11-13 18:05:26 -05:00

tours.js

Use real routes for tours, and make them actually work. Now it's

2016-03-04 16:23:58 -05:00