Martin Cech d28ea45556 Merge branch 'release_15.05' into dev ...

Conflicts:
	config/plugins/visualizations/common/templates/script_entry_point.mako

2015-05-07 13:09:24 -04:00

..

citation

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

collection

UI, collection creators: move no valid message into the alert box

2015-04-20 10:02:39 -04:00

dataset

Fix url for DatasetAssociationCollection (and expansion of datasets in dataset-choice.js)

2015-04-02 17:16:46 -04:00

form

Fix flat sections

2015-05-04 14:32:10 -04:00

grid

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

history

Merge branch 'release_15.05' into dev

2015-05-07 13:09:24 -04:00

job

Client: do not remove console statements when compressing; UI, Collections: propagate hasUser to collection panels, style fixes

2015-03-18 09:30:18 -04:00

library

fix for UI duplication bug reported bo Bjorn

2015-04-28 12:37:23 -04:00

list

UI, Collections: refactor promoteToHDCA

2015-03-20 12:19:27 -04:00

tools

Fix automated section expansion for post job actions

2015-05-07 02:07:53 -04:00

ui

Fix empty default values for numeric parameters with min/max

2015-04-25 09:59:34 -04:00

upload

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

user

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

visualization

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

annotations.js

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

base-mvc.js

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

data.js

Client: do not remove console statements when compressing; UI, Collections: propagate hasUser to collection panels, style fixes

2015-03-18 09:30:18 -04:00

tags.js

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

tools.js

Strip out unused lunr dependency -- a different approach was pursued for tool searching.

2015-04-01 11:41:15 -04:00