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,179 Commits 69 Branches 243 Tags
39fe6b44bfbab9f490524dff902ceb80bc52a2ee
Commit Graph
2792 Commits
Author SHA1 Message Date
jgoecks ce418d33fe Resolve conflicting label CSS class. 2015-11-13 14:10:10 -05:00
Mark Einon 67d0bcb5b3 Trivial: Replace unnecessary duplicated var check with 'else if' 2015-11-12 15:38:18 +00:00
Martin Cech 75d6489348 Merge pull request #1049 from mvdbeek/library_add_from_history 
Fix import of history datasets into library.
 2015-11-10 12:22:49 -05:00
Marius van den Beek 4f824cb920 Add changed static files. 2015-11-10 17:37:28 +01:00
Daniel Blankenberg 39ff0e9d76 Merge pull request #1044 from jmchilton/release_15.10_to_dev 
Bring 15.10 (and 15.07) fixes into dev.
 2015-11-10 10:42:02 -05:00
Martin Cech daccea42bd Merge pull request #1040 from guerler/revise_logging_000 
Fix log statements and link to logger
 2015-11-09 10:26:54 -05:00
John Chilton dc534bb258 Merge branch 'release_15.10' into dev 
Conflicts:
	client/galaxy/scripts/mvc/grid/grid-view.js
	static/maps/mvc/collection/list-of-pairs-collection-creator.js.map
	static/scripts/mvc/collection/list-of-pairs-collection-creator.js
 2015-11-09 15:19:02 +00:00
guerler 76bcfaa0ff Fix log comments 
Use emit

Fix namespace

Fix namespace

Remove empty line

Check if logger exists

Fix comment

Redo

More

Fix yet another log

Fix statements

More fixes

Move emitter
 2015-11-07 00:45:00 -05:00
guerler 975a94ce01 Pack scripts 2015-11-05 10:44:17 -05:00
guerler bbc3e943e7 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_multiselect_000 2015-11-05 10:43:28 -05:00
guerler 8a9372b989 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into revise_multiselect_001 2015-11-04 11:06:48 -05:00
Dannon Baker 1649570e78 Rebuild client styles, merge. 2015-11-04 08:37:22 -05:00
guerler 5c56ec8bc7 Fix style of labels in grids 
Fix styles

Pack styles
 2015-11-04 04:09:10 -05:00
guerler 0fe684c688 Fix upload button style 
More fixes
 2015-11-04 03:04:38 -05:00
guerler 7717659c78 Allow resizing of regular multi-select boxes 
Remove event handler

Add mouse leave event handler

Improve visibility and accessibility

Fix tag name

Style compromise

Repack charts
 2015-11-04 02:16:45 -05:00
guerler f57d917949 Patch select2 to avoid resetting highlighted location 
Keep search term
 2015-11-03 15:41:46 -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 168d42acf3 Keep select field open for multi select 2015-11-03 09:58:24 -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
Nate Coraor 3b133d0d92 Merge pull request #917 from carlfeberhard/release_15.10 
[15.10] UI, list of pairs collection creator: create regexp from filters for …
 2015-10-28 13:26:19 -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
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
Dannon Baker dc9c2e4b75 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-22 16:06:30 -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 0911287df7 UI, list of pairs collection creator: create regexp from filters for name creation 2015-10-14 13:20:19 -04:00