opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,263 Commits 69 Branches 243 Tags
11c5259f46b7d1774ecbee89e2459efa32b30099
Commit Graph
3003 Commits
Author SHA1 Message Date
Martin Cech 11c5259f46 fix librarydataset model detection; 
always show dataset.message and folder.description
 2016-01-29 10:17:48 -05:00
Martin Cech 2eb6868955 datalibs: introduce folder management; fix various glitches; refactor 2016-01-29 10:17:42 -05:00
John Chilton 807586ace8 Merge release_16.01 into dev. 2016-01-26 09:06:52 +00:00
carlfeberhard 017b97b7dc (repack bundles) 2016-01-21 16:20:10 -05:00
carlfeberhard 4a61a4cb47 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
Martin Cech bb15242903 repack static scripts 2016-01-20 15:20:17 -05:00
carlfeberhard 7dba828632 UI, Tool form: replace spinner gif with font awesome icon 2016-01-19 16:27:47 -05:00
carlfeberhard bf459c8d55 UI: (cleaning up) remove handlebars compiled/map and remaining references 2016-01-19 14:12:28 -05:00
carlfeberhard 250ad37737 UI, Tools: remove handlebars templates 2016-01-19 12:41:21 -05:00
carlfeberhard cf1bcaa0a6 UI, Tools: convert handlebars templates for tool panel to underscore tempaltes 2016-01-19 12:36:21 -05:00
carlfeberhard 9f8cc9a13f Client-build: add the webpack task file, merge dev 2016-01-15 14:04:10 -05:00
carlfeberhard 313c6a7247 Client-build, Webpack: add tasks to grunt for the common webpack tasks, update readme 2016-01-15 13:51:24 -05:00
carlfeberhard d5d39ed85c (merge dev) 2016-01-15 11:27:23 -05:00
guerler 03082a7239 Fix test label 2016-01-14 18:52:08 -05:00
guerler 907ce6efd2 Fix inputs 2016-01-14 18:27:22 -05:00
guerler 5d22fa7dd9 Fix message styles and fading 2016-01-14 18:02:55 -05:00
guerler 5d5dfb5f64 Revise ui-misc 2016-01-14 15:37:07 -05:00
guerler e52626b279 Apply fix from 16.01 2016-01-14 09:09:57 -05:00
guerler 30c472a388 Add flat id attribute to form parameters 2016-01-14 09:05:31 -05:00
guerler 0ccb72160a Refactor masthead render to improve readibility 2016-01-14 09:04:41 -05:00
guerler 94443625d8 Cleanup settings view 2016-01-14 09:02:27 -05:00
John Chilton 793fbdbedc Merge remote-tracking branch 'jmchilton/release_16.01' into dev_merge_0 
Conflicts:
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-01-14 07:44:48 +00:00
John Chilton f2c3eaaf64 Merge branch 'release_16.01' into dev_merge_0 
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-01-14 07:41:29 +00:00
guerler 4b5b970d78 Fix disabled css 2016-01-13 20:50:40 -05:00
guerler e14449e62d Revise label handling in form 2016-01-13 16:23:38 -05:00
guerler 37f8038d63 Undo user icon in masthead 2016-01-13 14:31:40 -05:00
guerler c4b5323035 Remove parenthesis 2016-01-12 16:35:38 -05:00
Dannon Baker 4819d1aa71 set ajaxConfig.data to null if an empty dict 2016-01-12 16:34:39 -05:00
Dannon Baker b47b5ff00a Fix for bad URL generation when empty GET string data. 2016-01-12 16:33:31 -05:00
carlfeberhard adb577e7f8 UI: use strict and replace leaky uses of Backbone.Events.on with listenTo 2016-01-12 15:18:54 -05:00
Dannon Baker 5a2eb7d473 Rebundle post merge. 2016-01-12 15:00:56 -05:00
John Chilton 3dda415fb9 Merge remote-tracking branch 'jmchilton/release_16.01' into release_16.01_merge_4 
Conflicts:
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
 2016-01-11 12:15:14 +00:00
carlfeberhard 54dca064fa UI, Multi-history: fix drop event handler to use dataTransfer of original event 2016-01-11 10:21:06 -05:00
John Chilton f8a7ac0820 Merge release_15.10 into release_16.01. 
Conflicts:
	eggs.ini
	lib/galaxy/tools/__init__.py
	lib/galaxy/tools/actions/__init__.py
	lib/galaxy/tools/toolbox/base.py
	static/maps/mvc/collection/list-collection-creator.js.map
	static/maps/mvc/library/library-foldertoolbar-view.js.map
	static/maps/utils/uploadbox.js.map
	static/scripts/mvc/collection/list-collection-creator.js
	static/scripts/mvc/library/library-foldertoolbar-view.js
	static/scripts/utils/uploadbox.js
	test/base/twilltestcase.py
	test/functional/tools/samples_tool_conf.xml
 2016-01-08 18:06:28 +00:00
guerler 237ecc7789 Add form help class 2016-01-05 16:15:55 -05:00
Dannon Baker a1a549ea67 Re-add identifiers to masthead, new ones for scratchbook (thanks @guerler) 2016-01-05 14:04:22 -05:00
Dannon Baker 9416e6f3f7 Merge and resolve conflicts, rebuilding. 2016-01-05 13:18:46 -05:00
Dannon Baker 5924857c2c Fix pre/postclick that got broken somewhere along the way w/ patches&merges. 2016-01-05 13:08:33 -05:00
guerler 884b1d42db Change scratchbook close icon 2016-01-05 11:45:31 -05:00
Dannon Baker 1d97e4271e Merge dev to include menu/onclick fix. 2016-01-05 11:00:10 -05:00
Dannon Baker 62b80dfcc5 Fix onclick broken in #1407 2016-01-05 10:04:03 -05:00
Dannon Baker 4ef3e21c95 Fix onclick handling broken w/ #1407 2016-01-05 09:44:06 -05:00
Dannon Baker da8b943f53 Merge. 2016-01-04 19:23:06 -05:00
Eric Rasche 5a441044fb Merge pull request #1308 from jmchilton/multi_collection_types 
Allow input collections to specify multiple collection types.
 2016-01-04 14:43:37 -06:00
guerler c9870cb89d Fix url formatting 2016-01-04 08:34:56 -05:00
guerler 4cd621dd37 Add test cases 2015-12-31 01:46:37 -05:00
guerler 339ad57f3f Cleanup Masthead and Scratchbook 
Cleanup Masthead and Scratchbook
 2015-12-30 16:31:59 -05:00
Dannon Baker 401583d730 Move TOURS.giveTour at the top level of the namespace instead of a method of the view. 2015-12-29 09:50:47 -05:00
Dannon Baker 578e201d64 Launch tour on GET arg (?tour_id=core.galaxy_ui). 2015-12-28 14:19:34 -05:00
Bjoern Gruening 1873d2c5ed update js scripts 2015-12-25 18:56:55 +01:00