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,105 Commits 69 Branches 243 Tags
793fbdbedc3e59140ece9aa2caed11d69815069b
Commit Graph
2981 Commits
Author SHA1 Message Date
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
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
Dannon Baker e325eba37c Some tweaks care of @bgruening. This adds (slightly tweaked) functionality to support a series of clicks, still needs a delay between clicks, and since it's the most common case that pre/postclick will be a single item, a list shouldn't be required here. 2015-12-21 13:08:15 -05:00
guerler 17d733b042 Move closing events to show/hide function 2015-12-19 17:20:02 -05:00
guerler 39e7f025eb Refine popover wrapper 
Revise popover, add tests
 2015-12-19 17:08:51 -05:00
guerler 048561d282 Avoid duplicate upload entries, revise modals, add tests 
Revise styles

Add more tests
 2015-12-19 17:08:49 -05:00
Dannon Baker 2c5241dc3b Full client rebuild. 2015-12-18 16:26:47 -05:00
Dannon Baker aecc5d864f Make tours.js safe (but possibly not functional wrt/ listing) to use on pages without Galaxy object. 2015-12-18 16:24:19 -05:00
Dannon Baker 38b3c6e97a Build client, bundle. 2015-12-18 14:19:17 -05:00
Dannon Baker 4efa8e73b3 Consolidate to standard options dict, minor refactorings. 2015-12-18 14:15:17 -05:00
Dannon Baker 8c1beb2af5 title override, working on fixing style. 2015-12-18 13:44:34 -05:00
Dannon Baker ffede65302 Debugging cruft. 2015-12-18 13:22:11 -05:00
Dannon Baker 5a3524245b Actually let people end a tour. 2015-12-18 13:20:57 -05:00
Dannon Baker 9e7eaaa7aa Finish sessionStorage and restart of tours across multiple pages. 2015-12-18 13:10:09 -05:00
Dannon Baker 7110a0cc5e Document necessary tweak. 2015-12-18 12:38:43 -05:00
Dannon Baker 1e5640163a Tour shim in onload, check sessionStorage (or would local be more appropriate?) 2015-12-18 12:23:40 -05:00
Dannon Baker f107b17928 Refactor a bit, adjust textinsert action to trigger 'change' on the element. 2015-12-18 12:01:07 -05:00
Dannon Baker 0203a69d88 Tours. 2015-12-18 10:26:22 -05:00
Dannon Baker 04f5ed4552 Reimplement menu onclick functionality that appears to have been dropped (probably a bad merge?) in the webpack PR. 2015-12-17 19:35:17 -05:00
John Chilton abd51e7f79 Merge pull request #1358 from guerler/fix_same_upload_000 
[15.10] Fix change handler association
 2015-12-17 14:31:17 -05:00
Martin Cech b4683fbce4 raise and show specific exception and warning when no files detected 2015-12-17 12:40:09 -05:00
guerler b0deead9c3 Fix change handler association 2015-12-17 11:40:25 -05:00
guerler 2ff3bf0c0c Fix label change handling 2015-12-16 17:12:37 -05:00
guerler 12014cc225 Show correct subworkflow name 2015-12-16 17:12:23 -05:00