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
20,091 Commits 69 Branches 243 Tags
e59d08f85631eacb83eada88c3351e4c19bcd667
Commit Graph
2784 Commits
Author SHA1 Message Date
carlfeberhard e59d08f856 Webpack: move vendor to libs; break up galaxy.panels to panels and modal; break up galaxy.base to polyfills, galaxy-async, ui/popupmenu, ui/editable-text, and utils/async-save-text; move reset_tool_search into workflow-view; move commatize into trackster/util; move galaxy.autocom_tagging to ui/autocom_tagging 2015-11-06 17:10:52 -05:00
carlfeberhard 4f242151e7 Webpack: remove libs and history apps, grunt:pack scripts 2015-11-05 15:08:04 -05:00
carlfeberhard d80d74c888 Client libs: move backbone down into /libs (not backbone/backbone); Webpack: move to non-entry vendor bundling for libraries, clean up assoc. 2015-11-05 12:04:52 -05:00
carlfeberhard 84b40650ec (merge dev) 2015-11-03 15:12:31 -05:00
carlfeberhard 9a659d85d6 Webpack: use bundled libs in base templates 2015-11-03 14:57:24 -05:00
Dannon Baker 593cb4074b Merge pull request #1018 from guerler/revise_promise_000 
Revise deferred queue, use jQuery promises
 2015-11-03 13:32:00 -05:00
guerler 142db64fb3 Use remove instead of empty if iframe is shown 2015-11-03 12:48:55 -05:00
Dannon Baker 86648d23e2 Merge pull request #1011 from carlfeberhard/logging 
Client side logging
 2015-11-03 11:01:51 -05:00
Dannon Baker 9fd0bd1cc1 Manual merge and rebuild due to conflict. 2015-11-03 10:54:40 -05:00
guerler cc4e8e4a34 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_promise_000 2015-11-02 14:48:52 -05:00
guerler f1f5efe703 Fix display call 
Fix config

Fix naming
 2015-11-02 14:47:48 -05:00
guerler 2e21e027b0 Insert promises 
Revision

Revise deferred class to use promises

Update charts

Fix comment

Use resolve and reject properly

Fix comments

Fix comments

Fix comments

Fix comment

Improve naming/comments

Remove unnecessary queue handler

Fix naming
 2015-11-02 12:59:16 -05:00
James Taylor 9e0973d720 Labels for individual tools in tool panel. 
Allow one or more labels to be attached to a tool in the tool panel.
These will be rendered to the right of the tool's link using the
boostrap label style. Styles for specific labels can be defined in CSS,
specific colored labels for "new" and "beta" are defined.
 2015-10-31 16:04:39 -04:00
carlfeberhard b67601f74c Client logging: move logger assignment into Galaxy object, both Galaxy.user and all LoggableMixins will now respond to debugging, properly localize error messages 2015-10-30 15:58:08 -04:00
carlfeberhard b75150ade7 Client logging: remove 'namespaced', allow 'log' to be added in the standard way (now that browsers are compat with this), simplify interface in the Galaxy object 2015-10-30 10:43:11 -04:00
guerler bd383cc518 Repack scripts 2015-10-29 23:54:49 -04:00
carlfeberhard 945f369003 Client logging: namespace current loggables 2015-10-29 17:09:56 -04:00
carlfeberhard d96fc60e1f Client logging: allow focusing on one or more namespaces, add function to more easily namespace loggers 2015-10-29 13:09:28 -04:00
carlfeberhard a9ac9193c1 Client logging: adapt metrics logger for optional debug logging 2015-10-29 12:27:17 -04:00
guerler 27bde1bb1d Merge branch 'dev' of https://github.com/galaxyproject/galaxy into fix_require_login_003 
Conflicts:
	static/maps/mvc/app/app-analysis.js.map
	static/scripts/mvc/app/app-analysis.js
 2015-10-28 13:26:09 -04:00
Dannon Baker 70bd415461 Merge pull request #997 from guerler/performance_001 
Fix deferred dom removal
 2015-10-28 11:20:38 -04:00
carlfeberhard 2513e766be Webpack: adding production bundles 2015-10-28 09:37:36 -04:00
carlfeberhard cebfdd2745 Webpack: restore original page scripts 2015-10-27 17:22:36 -04:00
carlfeberhard 5dfb3ffbec Webpack: test index page (Analyze Data) working, original working, history app working 2015-10-27 17:15:56 -04:00
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
guerler c70c1aabd8 Fix deferred dom removal 
Remove empty line

Fix comments

Fix log location

Fix comments
 2015-10-27 15:37:39 -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
carlfeberhard 0235eceb57 (merge dev) 2015-10-23 12:17:32 -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
guerler 66d3289b38 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into fix_require_login_003 
Conflicts:
	static/maps/mvc/app/app-analysis.js.map
	static/scripts/mvc/app/app-analysis.js
 2015-10-21 15:26:48 -04:00
Dannon Baker a5814e8f3b Merge master-> dev. Resolved one conflict on style build. 2015-10-21 15:14:04 -04:00
guerler 4cbeba4d60 Show masthead if login is required, add login page to front end 
Style fix
 2015-10-21 14:54:42 -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