John Chilton b52e562369 Merge remote-tracking branch 'galaxyproject/release_15.03' into dev ...

Conflicts:
	client/galaxy/scripts/mvc/tools/tools-parameters.js
	static/scripts/mvc/history/history-model.js
	static/scripts/packed
	static/scripts/packed/mvc/history/history-model.js
	static/scripts/packed/mvc/tools/tools-parameters.js

2015-03-25 14:19:54 -04:00

..

form-data.js

Fix bad commit (adding files)

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

form-input.js

Fix bad commit (adding files)

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

form-parameters.js

Merge remote-tracking branch 'galaxyproject/release_15.03' into dev

2015-03-25 14:19:54 -04:00

form-repeat.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

form-section.js

Form: Use title (as for repeats) instead of label for custom sections

2015-03-19 08:54:30 -04:00

form-select-content.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

form-view.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