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,357 Commits 69 Branches 243 Tags
dd7bddcaa682d6d7cdaba8661c2c7cc80997ade0
Commit Graph
3377 Commits
Author SHA1 Message Date
Dannon Baker 84464288b1 Merge pull request #1184 from guerler/fix_download_links_002 
Filter download links, avoid warning dialog
 2015-12-01 10:19:22 -05:00
Nate Coraor 9e28f2e786 Merge branch 'release_15.10' into dev 2015-11-30 14:13:26 -05:00
guerler 2e97553194 Filter download links 2015-11-28 04:35:58 -05:00
Martin Cech e19b7f656f fix the extra slash in URL when creating folder 2015-11-23 15:14:15 -05:00
Martin Cech e142beaffe replace wrong class name 2015-11-23 15:08:25 -05:00
guerler 368da171f5 Call onbeforeunload before hiding iframe through display() 
Validated message
 2015-11-23 11:12:03 -05:00
John Chilton a664deeee7 Merge pull request #1130 from dannon/repack_dev 
Enforce client build deps are up-to-date.  Rebuild style with lessc > 2.5
 2015-11-20 16:15:35 -05:00
carlfeberhard 119e26f4e5 Merge pull request #1142 from dannon/menu_onclick_addition 
Menu onclick addition
 2015-11-20 15:15:08 -05:00
carlfeberhard 844facd1f1 UI, Lists: throttle selector animation when number of list items > 20 2015-11-20 14:55:14 -05:00
Dannon Baker 81f1b7f8e0 Remove debugging logic and shortcut. 2015-11-20 13:17:46 -05:00
Dannon Baker f0e28555af Support onclick for menu items. 2015-11-20 12:11:55 -05:00
Dannon Baker f61ec1c3c0 Merge and rebuild client 2015-11-19 20:34:32 -05:00
Dannon Baker 0fdca7d40a A large assortment of escaping fixes to primarily grids and javascript templating, and one bad-data-ingress fix (copy history name). 2015-11-19 20:27:25 -05:00
Dannon Baker 5c285eaee7 Add grunt check task to verify npm modules are up to date 2015-11-19 11:34:49 -05:00
Dannon Baker 40e3e7926a Rebuild style with lessc > 2.5 (which everyone needs to update to now, or we'll have battling commits of packed css 2015-11-19 10:39:24 -05:00
Nicola Soranzo c252987b4c Merge branch 'master' into dev 2015-11-18 10:15:22 +00:00
Nicola Soranzo 3ffa607c15 Deprecate old library UI in the "Shared Data" menu. 2015-11-17 17:24:39 +00:00
Nate Coraor d8152f3336 Merge branch 'release_15.10' into dev 2015-11-17 11:37:05 -05:00
guerler 0a09de5453 Show welcome page with required login, remove iframes 
Reinsert iframe for login

Use iframes
 2015-11-16 14:47:59 -05:00
Dannon Baker 39fe6b44bf Rebuild styles, fixes history panel green being wrong. 2015-11-16 12:40:32 -05:00
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
guerler 6580701395 Fix parsing of message configuration 
Fix default value

Add root to Galaxy object
 2015-11-10 23:51:29 -05:00
Marius van den Beek 36797b3195 Add changed static files. 2015-11-10 12:25:01 -05: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
Martin Cech d9d746675a Merge pull request #1013 from jxtx/fix-default-welcome-references 
Updates to default welcome page.
 2015-11-01 12:57:18 -05:00
James Taylor 2d60665ab5 Fix link target in welcome 2015-11-01 10:35:13 -05:00
James Taylor 12b6d43c81 Change a.btn style, fix welcome link targets. 
"a" elements styled with .btn will have no underline by default.
 2015-11-01 10:18:35 -05:00
James Taylor bd95d7672d Updates to default welcome page. 
Reference CONTRIBUTORS.md, update institution references, update to
HTML5, use some standard classes for formatting, include links for
configuring and installling tools.
 2015-11-01 09:53:44 -05:00