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
17,246 Commits 69 Branches 243 Tags
dc256aebf22497cfce57de04e33fd606f97e485e
Commit Graph
2366 Commits
Author SHA1 Message Date
Dannon Baker 9257817afd Strip out unused lunr dependency -- a different approach was pursued for tool searching. 2015-04-01 11:41:15 -04:00
Dannon Baker 3a397ee7d3 Merge circster fix from release_15.03 to dev 2015-03-31 17:39:48 -04:00
Carl Eberhard f7669f3cd6 Fix to ba44452: properly scope mod_icon_btn in define not require 2015-03-31 17:05:50 -04:00
Martin Cech 9496c9e9a4 Merge branch 'release_15.03' into dev 
Conflicts:
	static/scripts/mvc/library/library-dataset-view.js
	static/scripts/mvc/library/library-folder-view.js
	static/scripts/mvc/library/library-foldertoolbar-view.js
	static/scripts/mvc/library/library-library-view.js
	static/scripts/mvc/library/library-model.js
	static/scripts/packed
	static/scripts/packed/mvc/library/library-dataset-view.js
	static/scripts/packed/mvc/library/library-folder-view.js
	static/scripts/packed/mvc/library/library-foldertoolbar-view.js
	static/scripts/packed/mvc/library/library-library-view.js
	static/scripts/packed/mvc/library/library-model.js
 2015-03-25 16:33:44 -04:00
Martin Cech d5aeb952ce Merge pull request #37 from martenson/release_15.03 
[STABLE] fix libraries to work with proxy prefix
 2015-03-25 15:23:17 -04:00
John Chilton f11a3a80fe Add file lost in previous merge (b52e562369). 2015-03-25 14:29:38 -04:00
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
Carl Eberhard 5ace814041 UI, History: fix model setAsCurrent to use galaxy_config.root proxy prefix 2015-03-24 17:03:59 -04:00
Martin Cech 4f53a85ea1 add root prefix to all ajax calls in data libraries 2015-03-24 14:11:41 -04:00
Martin Cech 9eed7ddb56 add root prefix to all library BB model urls 2015-03-24 11:14:11 -04:00
Carl Eberhard ec89d4c7cf Client: fix to base.js to remove Backbone dependency until we stop loading it via script tag (this should fix a trackster load error where backbone was attempting to reload jquery without a shim) 2015-03-23 18:53:40 -04:00
Carl Eberhard e36e51eeb1 Serializers, History: account for dataset collections when serializing 'empty'; UI, Collections: show deleted and hidden warnings in the list item views 2015-03-20 15:59:52 -04:00
Carl Eberhard 1e55206696 UI, Collections: show deleted and hidden warnings on collection list items 2015-03-20 14:49:57 -04:00
Carl Eberhard 0c796800ea UI, Collections: better validity checking of collection inputs (must be datasets in the ok state), refactoring 2015-03-20 14:25:57 -04:00
Carl Eberhard 535fc9cc07 UI, Collections: add compressed files and maps 2015-03-20 12:40:46 -04:00
Carl Eberhard 51943d4962 UI, Collections: rename badly named paired collection creator, begin moving other creators out to add functionality 2015-03-20 12:39:20 -04:00
Carl Eberhard af15a06ec5 Merge branch 'collections' into dev 2015-03-20 12:23:52 -04:00
Carl Eberhard 87a45aa90b UI, Collections: refactor promoteToHDCA 2015-03-20 12:19:27 -04:00
Carl Eberhard 3f885ddbb5 UI, Collections: minor fixes, cleanup 2015-03-19 10:09:21 -04:00
guerler a8a85ec0f6 ToolForm: Remove unnecessary code 2015-03-19 09:03:14 -04:00
guerler 4f0ba0b545 Form: Use title (as for repeats) instead of label for custom sections 2015-03-19 08:54:30 -04:00
guerler 91396853b7 Unifies and improves the handling of optional select fields 2015-03-19 04:50:35 -04:00
guerler 23ef706cb5 ToolForm: Fix version handling 2015-03-19 04:08:47 -04:00
Carl Eberhard 21d1d6b28e UI, Collections: allow editing of top level collection names, prevent in below-top-level collections (considered immutable for now), minor style fixes 2015-03-18 16:10:37 -04:00
Martin Cech 7d411033e5 prevent the search hint string to enter the searchbox 
proper placeholder is used instead
 2015-03-18 15:31:02 -04:00
Carl Eberhard 006c373693 Merge branch 'collections' into dev 2015-03-18 12:39:49 -04:00
Carl Eberhard c0e55095da UI, Collections: adding editable collection panels and lis 2015-03-18 11:40:18 -04:00
Carl Eberhard e351fefdbd Client build: symlink static/scripts/packed back to static/scripts for backward compatibility, remove cruft 2015-03-18 11:01:56 -04:00
Carl Eberhard ef382f7332 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
Carl Eberhard bcd1701a4b Client: update raven.js to 1.1.17 2015-03-17 11:55:12 -04:00
Carl Eberhard 2632738584 Merge to dev 2015-03-17 10:56:40 -04:00
Carl Eberhard ba20f5f6e1 Fix bad commit (adding files) 2015-03-17 10:47:31 -04:00
Carl Eberhard 9a7f5fc17b Remove scripts/packed, packing infrastructure, and pack_scripts config options 2015-03-17 10:31:35 -04:00
guerler ff34ef0ed7 Ui: Properly refresh options state on initialization 2015-03-17 02:07:39 -04:00
guerler 4d483aaf25 Ui: Fix chunk data viewer 2015-03-17 01:23:47 -04:00
Martin Cech 6946e46bba closes #10, thanks @wezen 2015-03-16 15:01:13 -04:00
Martin Cech 4e2ed61be2 some post-merge problems 2015-03-16 14:54:06 -04:00
Martin Cech 570d4fd1b7 Merge branch 'dev' into tools-api-expose-search 
resolved conflicts:
	client/galaxy/scripts/mvc/tools.js
	lib/galaxy/webapps/galaxy/api/tools.py
	static/scripts/mvc/tools.js
	static/scripts/packed/mvc/tools.js
 2015-03-16 14:40:13 -04:00
Carl Eberhard 4e5218f4dc Charts: fix script tag order to prevent new version of Backbone loading as AMD; UI, Histories: remove debug statement 2015-03-16 10:48:52 -04:00
guerler a84740a4d4 Ui: Limit forced element selection to non-optional fields 2015-03-16 02:55:06 -04:00
guerler 3091311257 Ui: Force element selection only for single select fields 2015-03-16 02:43:52 -04:00
guerler 2de52bb3bf Ui: Add js-part of library data tool parameter, code adjustments to select/option fields 2015-03-16 02:17:35 -04:00
guerler 379098ede8 Ui: Remove spaces, minor adjustments 2015-03-14 03:30:31 -04:00
guerler 0194f99fc3 Ui: Use regular select all checkbox for multi-select2 fields 2015-03-14 03:07:00 -04:00
guerler cd3c47f017 Ui: Fix select all option for select2 field in Chrome, add help text 2015-03-13 23:42:29 -04:00
guerler 115c85420b Remove unnecessary files 2015-03-13 16:51:07 -04:00
guerler e8564d7675 Ui: Allow Ctrl-A and Ctrl-X in multi-select2 field 2015-03-13 14:54:36 -04:00
Carl Eberhard 8991ea812b Client build: fix new link to event-drag libraries, update backbone to 1.1.2, update relevant Collections to use the new set function 2015-03-13 12:55:52 -04:00
Martin Cech 67fc35a370 add standard button for trigerring citation BibTeX - improve usability 2015-03-11 16:52:45 -04:00
Carl Eberhard 4992d0a893 Merge 2015-03-11 12:55:06 -04:00