 guerler
|
5dec24c21e
|
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into library_data_parameter
|
2015-04-19 22:59:16 -04:00 |
|
|
guerler
|
ebafd06fea
|
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into library_data_parameter
|
2015-04-16 20:02:25 -04:00 |
|
|
Carl Eberhard
|
9ada2f6c43
|
UI, Histories: improve highlighting of current/active content in current history panel
|
2015-04-16 16:01:23 -04:00 |
|
|
guerler
|
c40e8f618d
|
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_validation
|
2015-04-14 03:01:33 -04:00 |
|
|
guerler
|
5c8ad19ddb
|
New library data selector for tool form
|
2015-04-14 02:27:38 -04:00 |
|
|
James Taylor
|
d323fa0aad
|
Change Emory to Johns Hopkins in sample welcome.
|
2015-04-13 17:21:52 -04:00 |
|
|
guerler
|
c1bf66b9b0
|
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_validation
Conflicts:
lib/galaxy/tools/__init__.py
static/maps/mvc/form/form-view.js.map
static/scripts/mvc/form/form-view.js
|
2015-04-10 19:59:56 -04:00 |
|
|
John Chilton
|
e09fc21e6c
|
Merge pull request #104 from guerler/revise_default_values
Fix default value handling in new tool form
|
2015-04-10 07:56:14 -05:00 |
|
|
John Chilton
|
38b06a704b
|
Merge pull request #35 from guerler/tool_form_section_tag
Tool form section tag
|
2015-04-10 07:52:37 -05:00 |
|
|
guerler
|
182fac5ad6
|
Re-insert classic tool form
|
2015-04-10 01:07:36 -04:00 |
|
|
guerler
|
3ff5204801
|
Fix default tool parameter value handling in current form
|
2015-04-09 22:44:16 -04:00 |
|
|
guerler
|
e625190219
|
Fix default value handling in new tool form
|
2015-04-09 22:18:41 -04:00 |
|
|
Carl Eberhard
|
237c857f8d
|
UI, Histories: respect subtitle dataset hiding switch and prevent bad autohiding of newly added datasets.
|
2015-04-09 15:03:31 -04:00 |
|
|
Carl Eberhard
|
fb1048bb09
|
UI, history multipanel: attempt to solve undefined context in underscore.debounce<-checkColumnsInView by removing context binding
|
2015-04-09 11:05:34 -04:00 |
|
|
guerler
|
7f479ff32c
|
WorkflowForm: Use is_workflow instead of is_dynamic for workflow editor
|
2015-04-09 00:28:37 -04:00 |
|
|
guerler
|
e7b7281be7
|
WorkflowForm: Convert selection arrays to proper strings
|
2015-04-08 18:47:10 -04:00 |
|
|
guerler
|
388587de1c
|
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into tool_form_section_tag
Conflicts:
lib/galaxy/tools/__init__.py
|
2015-04-06 12:30:17 -04:00 |
|
|
Carl Eberhard
|
b9fc715dd5
|
Fix url for DatasetAssociationCollection (and expansion of datasets in dataset-choice.js)
|
2015-04-02 17:16:46 -04:00 |
|
|
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 |
|
|
guerler
|
5aa73d0e05
|
Merge branch 'dev' into tool_form_section_tag
Conflicts:
lib/galaxy/tools/test.py
|
2015-03-26 17:04:29 -04:00 |
|
|
guerler
|
0279d6010a
|
Repack styles, packing fails sometimes
|
2015-03-25 22:56:09 -04:00 |
|
|
guerler
|
49f45d3fce
|
Ui: Add top margin to section element
|
2015-03-25 22:54:54 -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 |
|
|
guerler
|
6b86b8c86f
|
Parameters: Add expanded attribute to section input parameter
|
2015-03-23 15:41:32 -04:00 |
|
|
guerler
|
f1c036e746
|
ToolForm: Add section tag
|
2015-03-23 15:31:23 -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 |
|