 Martin Cech
|
f0fbd25526
|
Merge branch 'dev' into track-newlibs
Conflicts:
static/maps/galaxy.library.js.map
static/scripts/galaxy.library.js
|
2015-10-27 16:30:05 -04:00 |
|
|
Nate Coraor
|
6d7be0a218
|
Merge branch 'release_15.10' of https://github.com/galaxyproject/galaxy into dev
|
2015-10-27 15:11:14 -04:00 |
|
|
Aysam Guerler
|
112c0390d5
|
Merge pull request #971 from dannon/grid_batch_fixes
Grid batch operation fixes
|
2015-10-22 16:02:23 -04:00 |
|
|
Daniel Blankenberg
|
eca98ec828
|
Merge pull request #856 from dannon/dynatree_upgrade
Dynatree upgrade
|
2015-10-22 14:31:15 -04:00 |
|
|
Dannon Baker
|
c3db6af560
|
Fix grid batch operations. This should correctly display and request confirmation for batch operations (such as delete a set of <GalaxyObjects> which is scary without a confirmation). It also fixes it to where grid bulk operations actually work in IE.
|
2015-10-21 17:54:40 -04:00 |
|
|
Dannon Baker
|
a5814e8f3b
|
Merge master-> dev. Resolved one conflict on style build.
|
2015-10-21 15:14:04 -04:00 |
|
|
Martin Cech
|
f3bfa2f56b
|
remove the autorefresh on Reports app
because of how long each page takes on Main the request for a subpage
would timeout because new autorefresh request would be automatically
issued
|
2015-10-21 14:22:41 -04:00 |
|
|
Martin Cech
|
291f4d77d6
|
add google analytics tracking to newlibs, propagate ga_code to JS config
|
2015-10-20 15:40:52 -04:00 |
|
|
guerler
|
b80eb8d47c
|
Fix tool url building
|
2015-10-19 18:05:41 -04:00 |
|
|
Martin Cech
|
47ce939322
|
remove log
|
2015-10-16 13:14:44 -04:00 |
|
|
Martin Cech
|
15a8c594bd
|
fix the filter on deleted libraries to not show the public deleted libs
by default
|
2015-10-16 13:12:53 -04:00 |
|
|
carlfeberhard
|
41069e8ba6
|
UI, histories: fix/reverse order for drag and drop dataset copy
|
2015-10-13 17:15:56 -04:00 |
|
|
carlfeberhard
|
34a11d1187
|
UI, histories: fix default empty message for lazy loaded panels in multi-view
|
2015-10-13 16:49:38 -04:00 |
|
|
carlfeberhard
|
99fab6f342
|
UI, histories: on first history search, use current searchFor value at callback and not value when ajax began
|
2015-10-13 16:16:43 -04:00 |
|
|
carlfeberhard
|
b470843c89
|
UI, histories: fix multiview button to be logged-in users only
|
2015-10-13 15:41:21 -04:00 |
|
|
John Chilton
|
408c82c43d
|
Merge pull request #874 from guerler/tool_execution_001
Use common exceptions in tools
|
2015-10-10 04:37:49 +01:00 |
|
|
Martin Cech
|
fae21e30f5
|
Merge branch 'release_15.10' into dev
Conflicts:
lib/galaxy/web/framework/middleware/remoteuser.py
|
2015-10-09 12:29:36 -04:00 |
|
|
Martin Cech
|
251f390f7c
|
fix the ordering of folder controls to match library's
also fix the active area of 'include deleted' checkbox
|
2015-10-08 15:25:32 -04:00 |
|
|
Martin Cech
|
fe8dbd8183
|
fix problems with multiple bindings of view events;
drop attempts at caching the libraries - need to study more for that
|
2015-10-08 15:25:31 -04:00 |
|
|
Martin Cech
|
775ee33d4d
|
fix options default order to fix bug with improper page being rendered
also add missing comma for previous commit
|
2015-10-08 15:25:31 -04:00 |
|
|
Martin Cech
|
39f5b7adf1
|
show proper message when search has no results
|
2015-10-08 15:25:31 -04:00 |
|
|
Martin Cech
|
2d4bd2e6f5
|
fix the ordering and margins of lib toolbar items
|
2015-10-08 15:25:31 -04:00 |
|
|
Martin Cech
|
60a1b45704
|
make lib search case insensitive
|
2015-10-08 15:25:31 -04:00 |
|
|
guerler
|
45763bf85e
|
Use common exceptions in tools
|
2015-10-08 12:00:34 -04:00 |
|
|
Dannon Baker
|
bad9cce30f
|
Update dynatree to what will be the final release; we probably want to just replace it at some point.
|
2015-10-06 10:07:12 -04:00 |
|
|
carlfeberhard
|
31c89ea29c
|
UI, Collections: allow expansion to fetch details for DatasetDCEs (assuming they're HDAs); move rerunnable and creating_job fetch to HDAs
|
2015-10-06 09:49:16 -04:00 |
|
|
guerler
|
59885c3afd
|
Fix error message handling
Use common exception handlers
Fix error message
Fix error message
More fixes
|
2015-10-05 19:01:48 -04:00 |
|
|
Martin Cech
|
053f51eb53
|
forgoten minification and map
|
2015-10-05 16:16:23 -04:00 |
|
|
carlfeberhard
|
7dcd2636fd
|
Merge pull request #820 from martenson/lib-search
Initial implementation of data library search
|
2015-10-05 10:39:15 -04:00 |
|
|
carlfeberhard
|
4e3fe5012f
|
Fix to a5e97e6: correctly pass in dom fragment to setUpBehaviors (fixes multiselect btn and name editing
|
2015-10-02 15:05:19 -04:00 |
|
|
Dannon Baker
|
5592422d01
|
Merge pull request #826 from guerler/fix_select_000
Fix default value for optional select fields
|
2015-10-01 16:08:02 -04:00 |
|
|
guerler
|
df74d2651b
|
Fix label text
|
2015-10-01 15:28:16 -04:00 |
|
|
guerler
|
8cc27b45d0
|
Fix default value for optional select fields
|
2015-10-01 15:23:06 -04:00 |
|
|
carlfeberhard
|
a5e97e6e59
|
UI, histories: fix scroll position capture/restore for the current history
|
2015-10-01 12:25:07 -04:00 |
|
|
John Chilton
|
c7c269572e
|
Merge pull request #819 from carlfeberhard/fix.collection-expansion
UI, Collections: correct foldout expansion for collections only re-re…
|
2015-09-30 20:58:35 +01:00 |
|
|
carlfeberhard
|
2c45f356a9
|
UI, Collections: correct foldout expansion for collections only re-rendering on 'populated' or 'visible' change; correct foldout expansion in published histories by giving dataset collection elements an api endpoint and moving 'rerunnable' and 'creating_job' fetch into li-edit
|
2015-09-30 15:08:32 -04:00 |
|
|
guerler
|
728c545090
|
Hide regular tool form for upload tool
|
2015-09-30 12:46:16 -04:00 |
|
|
Martin Cech
|
91ef04a25b
|
docs, refac and indentation
|
2015-09-29 17:00:36 -04:00 |
|
|
Martin Cech
|
f64a23fbe1
|
initial implementation of library search
|
2015-09-29 16:30:50 -04:00 |
|
|
guerler
|
082c8952e0
|
Undo initial errors
|
2015-09-29 15:59:25 -04:00 |
|
|
guerler
|
6d00f38f0a
|
Merge branch 'dev' of https://github.com/galaxyproject/galaxy into tool_form_003
Conflicts:
client/galaxy/scripts/mvc/tools/tools-form.js
static/maps/mvc/tools/tools-form.js.map
static/scripts/mvc/tools/tools-form.js
|
2015-09-29 15:55:59 -04:00 |
|
|
Daniel Blankenberg
|
6406276146
|
Merge pull request #806 from martenson/data-lib-work
UI and API for data library folders management
|
2015-09-29 14:15:11 -04:00 |
|
|
Nate Coraor
|
90dc2b1093
|
Merge branch 'release_15.07' into dev
|
2015-09-29 13:55:22 -04:00 |
|
|
Martin Cech
|
10c915bb62
|
Merge branch 'dev' into data-lib-work
Conflicts:
static/maps/mvc/library/library-foldertoolbar-view.js.map
static/scripts/mvc/library/library-foldertoolbar-view.js
also re-grunted
|
2015-09-28 11:40:35 -04:00 |
|
|
Martin Cech
|
796f803df0
|
provide UI to delete and udelete lib folders; slight refactor
|
2015-09-28 11:38:35 -04:00 |
|
|
guerler
|
7777ea8f91
|
Extend large ui-messages to cover states (info, warning, danger, success)
|
2015-09-28 02:16:57 -04:00 |
|
|
guerler
|
c1faf48d81
|
Add large message style and use for initial tool loading notifications
|
2015-09-28 01:48:07 -04:00 |
|
|
Daniel Blankenberg
|
e52b9ac255
|
Show tool parameter errors on initial tool form load. Needed for e.g. proper rerun display behavoir.
|
2015-09-25 16:42:31 -04:00 |
|
|
carlfeberhard
|
12ada39cdd
|
Fix to b58c720: only request creating_job and rerunnable
|
2015-09-24 17:25:13 -04:00 |
|
|
carlfeberhard
|
e1aad97759
|
Fix to b58c720: add creating_job to info needed for re-run button
|
2015-09-24 16:41:49 -04:00 |
|