guerler eaff25b6eb Merge branch 'dev' of https://github.com/galaxyproject/galaxy into upload_000 ...

Conflicts:
	client/galaxy/scripts/mvc/upload/upload-view.js
	static/maps/mvc/upload/upload-view.js.map
	static/scripts/mvc/upload/upload-view.js
	static/style/blue/base.css

2015-08-10 11:26:37 -04:00

..

add-logging.js

Fix bad commit (adding files)

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

ajax-queue.js

Fix bad commit (adding files)

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

config.js

Trackster, chromosome interaction: fix display of chrint files in trackster, do not apply config default_value if explicitly set to undefined, clean line endings

2015-07-15 12:45:19 -04:00

deferred.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

graph.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

levenshtein.js

Fix bad commit (adding files)

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

localization.js

Fix bad commit (adding files)

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

metrics-logger.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

natural-sort.js

Fix bad commit (adding files)

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

query-string-parsing.js

Visualizations, trackster: allow the user to add the dataset launched from as a new track in an existing trackster visualization; add utils/query-string-parsing.js for pulling query params from the query string

2015-07-29 13:57:34 -04:00

uploadbox.js

Attach success, error handlers for composite uploads, fixes

2015-08-05 05:43:29 -04:00

utils.js

UI, histories: render nice_size on the client

2015-07-30 13:10:13 -04:00