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
18,899 Commits 69 Branches 243 Tags
ea130e2c008e100de92da78fa62ac797b635baed
Commit Graph
2530 Commits
Author SHA1 Message Date
Carl Eberhard ea130e2c00 Histories: move order parsing into managers; View multi: allow and pass ordering into bootstrapped histories, limit to 10; View multi, client: allow better collection setting and addition 2015-08-21 10:15:38 -04:00
Martin Cech c51b5c9b8d Merge pull request #472 from Airistotal/Reports_homepage 
Reports homepage
 2015-08-09 20:57:34 -04:00
Martin Cech d6d8604d53 update with @jxtx suggesting of using existing classes 2015-08-07 15:18:18 -04:00
Martin Cech b887606616 make the 'Start' button green when enabled 
I have seen numerous times how people struggle to find the correct
button when uploading. This should help them.
 2015-08-07 14:41:05 -04:00
Airistotal c7b9ee3c13 Merge branch 'dev' of https://github.com/Airistotal/galaxy into Reports_homepage 
Conflicts:
	client/galaxy/style/less/base.less
	static/style/blue/base.css
 2015-08-06 15:44:22 -05:00
Martin Cech 86757fb13a Merge pull request #410 from Airistotal/Reports_newpage 
Reports newpage
 2015-08-06 16:26:53 -04:00
John Chilton 4441fb4732 Merge pull request #568 from ericenns/new-tool-form-batch-collection 
[15.05] Fix batch mode input in new tool form ui
 2015-08-06 20:36:27 +01:00
Eric Enns 864e2b5111 Fix batch mode for collection, when collection maps to multiple inputs 2015-08-06 14:29:51 -05:00
John Chilton 668e650f52 Merge pull request #526 from carlfeberhard/trackster.existing-browser 
Visualizations, trackster: allow the user to add the dataset launched…
 2015-08-05 20:50:18 +01:00
Airistotal 8395244a38 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into Reports_homepage 
Conflicts:
	static/style/blue/base.css
 2015-08-04 13:08:03 -05:00
Airistotal 5df41184d4 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into Reports_newpage 
Conflicts:
	static/style/blue/base.css
 2015-08-04 13:07:08 -05:00
Airistotal 7eb075e711 Added cursor change to indicate that you can zoom 
Added comments to script to make it easier to find
Organized script to make it easier to understand
 2015-08-04 12:04:17 -05:00
guerler efcfc897d6 Filter deleted library datasets 2015-08-03 15:02:20 -04:00
Björn Grüning cf516c5698 Merge pull request #536 from carlfeberhard/client.update-libs 
Update client libs: farbtastic, jqtouch, bib2json
 2015-08-01 12:42:50 +02:00
Carl Eberhard ba4aabc186 Client, libs: update and track farbtastic and jqtouch; compress scripts 2015-07-31 12:48:10 -04:00
Carl Eberhard de375004c9 UI, histories: render nice_size on the client 2015-07-30 13:10:13 -04:00
Airistotal 13522af7d1 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into Reports_newpage 2015-07-29 16:24:27 -05:00
Airistotal cc2cd0fb01 Merge branch 'dev' of https://github.com/Airistotal/galaxy into Reports_homepage 
Conflicts:
	static/scripts/reports_webapp/run_stats.js
 2015-07-29 16:12:31 -05:00
Airistotal 8d5ef14d4f Changed spacing 2015-07-29 16:06:23 -05:00
Dannon Baker 09f0aaf371 Run grunt. 2015-07-29 15:53:31 -04:00
Dannon Baker 9c3be3efb4 Merge branch 'Reports_homepage' of https://github.com/Airistotal/galaxy into Airistotal-Reports_homepage 2015-07-29 15:46:06 -04:00
Carl Eberhard 2c2f49bf8e Visualizations, trackster: allow the user to add the dataset launched from as a new track in an existing trackster visualization; add utils/query-string-parsing.js for pulling query params from the query string 2015-07-29 13:57:34 -04:00
Airistotal 6849970cec Automatic x axis creation was inconsistent, changed to manual x axis creation 2015-07-28 11:20:12 -05:00
guerler 638ef77b3c Add numpad key codes to ui-slider element 2015-07-27 15:33:53 -04:00
John Chilton a0fc6e3acb Merge pull request #491 from carlfeberhard/ui.remove-select-button 
History UI: do not render selector when there are no datasets to select
 2015-07-27 15:52:09 +01:00
Airistotal 31bed7f83e Changed zoom on graphs 
Changed graph title
Fixed flake errors
 2015-07-24 07:56:12 -05:00
Airistotal 3ccc76555a Fixed x axis moving around *hopefully* 2015-07-23 11:41:03 -05:00
Carl Eberhard 27692c434e History UI: do not render selector when there are no datasets to select 2015-07-22 15:56:32 -04:00
Dannon Baker ba7963da5e Merge release_15.07 into dev 2015-07-22 12:41:21 -04:00
Dannon Baker 488d42deb5 Merge branch 'release_15.05' into release_15.07 2015-07-22 12:37:26 -04:00
Jeremy Goecks f751314e61 Fixes to make Sweepster work again: (a) update template syntax to match changes made in underscore v1.7 and (b) update tool rerun to account for API changes. 2015-07-22 10:32:00 -04:00
Airistotal fc09e47a98 Small appearance fix 2015-07-21 15:15:00 -05:00
Airistotal 6cf4b1b136 Polished the appearance of the graphs 
Added functionality to ETA graphs
 2015-07-21 15:06:29 -05:00
Carl Eberhard e649ff2e5e Client build: transition to grunt based handlebars compilation and minify/map them to static/scripts; cleanup: remove py script, remove uncompiled from minified 2015-07-21 14:56:07 -04:00
Carl Eberhard 04d5b634b9 Client build: update handlebars and complete template compilation task 2015-07-21 14:31:07 -04:00
Airistotal 115d5e2ba9 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into Reports_newpage 
Conflicts:
	lib/galaxy/webapps/reports/controllers/jobs.py
	lib/galaxy/webapps/reports/controllers/workflows.py
 2015-07-17 14:24:12 -05:00
Airistotal 753b5a4983 Merge branch 'Reports_homepage' of https://github.com/Airistotal/galaxy into Reports_homepage 2015-07-17 13:50:08 -05:00
Airistotal 2a04abe7ea Removed remnant of failed update 2015-07-17 13:47:30 -05:00
Daniel 739dddb427 Merge pull request #2 from jmchilton/Reports_homepage 
Merge Reports_homepage against latest dev.
 2015-07-17 13:42:27 -05:00
Airistotal 6ab9c52484 Removed Snap.svg.js 
Moved style to correct place in client
Moved script to correct place in client
 2015-07-17 13:32:22 -05:00
John Chilton 70ef7e5561 Merge pull request #463 from carlfeberhard/fix.trackster-chrint 
Trackster, chromosome interaction: fix display of chrint files in tra…
 2015-07-17 14:50:32 +01:00
John Chilton 7719ea7ea8 Merge remote-tracking branch 'galaxyproject/dev' into Reports_homepage 
Conflicts:
	.ci/pep8_sources.txt
 2015-07-17 14:14:12 +01:00
Airistotal dab8f42195 Added tool tips 
Changed titles to be more descriptive
 2015-07-15 15:27:06 -05:00
Carl Eberhard d31822e6d4 Trackster, chromosome interaction: fix display of chrint files in trackster, do not apply config default_value if explicitly set to undefined, clean line endings 2015-07-15 12:45:19 -04:00
Carl Eberhard 6e8bfc62cc UI, Collections: use Galaxy.options.root for API URL 2015-07-15 10:13:22 -04:00
Dannon Baker e1bbbe5ae8 Merge branch 'dev' into lint-additions 2015-07-13 14:20:24 -04:00
carlfeberhard 4792825924 Merge pull request #446 from jgoecks/trackster-close-files 
Trackster fixes: (a) close data provider files after reading from the…
 2015-07-13 11:36:02 -04:00
Martin Cech e9aa6e843d Merge pull request #426 from ericenns/feature/library_folder_export_to_history 
Feature/library folder export to history
 2015-07-13 16:29:01 +02:00
Nicola Soranzo 43aa5fa482 Lint various Python files. 2015-07-13 00:13:21 +01:00
Jeremy Goecks 75ab206ca5 Trackster fixes: (a) close data provider files after reading from them (but there are some data providers that currently lack close functions so those files will remain open); (b) fix running tools by correcting HDA manager function call; (c) remove use of underscore template because uglify does not handle it well. 2015-07-09 12:47:15 +02:00