opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,066 Commits 62 Branches 243 Tags
b47b5ff00a3db510bf570391d32c96aa98b316c7
Commit Graph
100 Commits
Author SHA1 Message Date
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
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
guerler f88ad8d4e3 Fix Change type label in editor form 2015-12-16 15:22:18 +00:00
Dannon Baker cf5d209e0f Manual merge of #1303 to resolve build artifact conflicts. 2015-12-16 06:51:12 -05:00
carlfeberhard 2acdbe54f7 UI, Citations: fix citation-model's import of bibtex to use *either* commonjs or global 2015-12-14 17:22:58 -05:00
guerler 3108ba5c01 Ensure that text fields only display text 2015-12-14 13:29:01 -05:00
guerler c61a5529b4 Merge branch 'dev' of git://github.com/galaxyproject/galaxy into run_workflow_form_004 2015-12-14 10:37:45 -05:00
carlfeberhard c1ce8ef0ce UI, list of pairs collection creator: improve auto-pair error message to be more beginner friendly(?) 2015-12-14 09:20:10 -05:00
carlfeberhard f14b38124b UI, list of pairs collection creator: prevent vice-versa pair duplication by removing paired dataset from both temp lists during auto pairing 2015-12-14 08:59:24 -05:00
carlfeberhard 84f3b72e1a (merge dev); Testing, histories: update tests to reflect allowing anon to create/copy histories via the API 2015-12-11 13:44:48 -05:00
carlfeberhard 32be886f0f API, Histories: allow api/histories/create to be used as anon user; UI, Histories: minor fixes 2015-12-11 10:30:39 -05:00
carlfeberhard 9e512f5246 UI, History: use copy dialog in the embedded histories in Pages, add autoClose option to copy dialog 2015-12-11 08:44:45 -05:00
guerler 952f3f9b7a Open select2 dropdown on click 2015-12-11 03:10:17 -05:00
carlfeberhard 1ebc0ea9e7 UI, Quotameter: correctly update the quotameter for anon users 2015-12-10 14:15:33 -05:00
carlfeberhard cb23e010d7 UI, History: use copy dialog in history/view for import, minor fixes 2015-12-10 13:52:43 -05:00