opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,357 Commits 62 Branches 243 Tags
dd7bddcaa682d6d7cdaba8661c2c7cc80997ade0
Commit Graph
2810 Commits
Author SHA1 Message Date
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
guerler 51dca28794 [WIP] Continue API integration 2015-07-21 10:59:48 -04:00
guerler dbc1bd50b4 Code style adjustments for uploadbox code 2015-07-18 16:51:19 -04:00
guerler 04eadf4bfc Fix uploadbox trigger for local upload 2015-07-18 16:42:30 -04:00
guerler 3678c111a6 Prepare composite tab 2015-07-18 16:15:53 -04:00
guerler ad661147e8 [WIP] Style adjustments 2015-07-17 20:26:32 -04:00
guerler f36f785456 [WIP] Adjust styles 2015-07-17 19:48:16 -04:00
guerler f42981810a [WIP] Fix button states 2015-07-17 15:43:05 -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
guerler 85fc57696f [WIP] Reinserting button panel 2015-07-17 15:18:34 -04: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
guerler a0cd5b7410 [WIP] Separate upload modal and default upload view, insert tabs 2015-07-16 04:59:52 -04: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
Eric Enns 8787f94cbb Replace lf_ids with folder_ids 2015-07-05 07:31:28 -05:00
Carl Eberhard b18cfa09b0 UI, collections: fix DatasetCollectionElement and DatasetAssociation id collision in DCECollection by preserving Element id in idAttribute 'element_id' 2015-07-05 13:13:13 +01:00
Eric Enns 34d60749a0 Fixed download in beta library view to work with folders 2015-07-05 05:51:06 -05:00
Eric Enns 33abc49473 Fixed bug where panel wouldn't show unless a folder was present 2015-07-05 04:48:14 -05:00
Eric Enns 5a3b6564bc Icon now changes properly when folder row selected in beta library interface 2015-07-05 04:27:08 -05:00
Eric Enns 61a909978b Updated library view to show toolbar when folder or file present instead of only when file present 2015-07-05 04:05:25 -05:00
Eric Enns 5deb35a106 Updated library folder row to toggle checkbox when row is clicked 2015-07-05 03:54:12 -05:00
Eric Enns 0c7c7db1e1 Added compiled js 2015-07-04 12:59:12 -05:00
Airistotal 9ab2f65699 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into Reports_TTClean 2015-06-30 09:50:13 -05:00
guerler 61024b832e Add missing packed files 2015-06-24 15:42:46 -04:00
guerler e51cd719dc Fix remaining qunit test cases for the workflow editor 2015-06-24 13:56:02 -04:00
guerler 63fee8f7ce Undo merged fixed, replace underscore path rewrite 2015-06-24 12:33:17 -04:00
John Chilton 110b12e571 Modify a few references to underscore. 
This fixes these references when importing these modules through qunit.
 2015-06-17 22:26:26 -04:00
guerler cc979583ce Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 2015-06-17 16:04:37 -04:00
Airistotal 55eadd41f4 Build with grunt 2015-06-16 15:38:38 -05:00
John Chilton fe625bc6cf Merge pull request #351 from guerler/add_argument_001 
Add parenthesis to argument name search
 2015-06-16 15:03:35 -04:00
John Chilton 042ec77100 Merge pull request #347 from martenson/ts-refactor-static 
refactor TS javascript files to be separated from Galaxy JS
 2015-06-16 14:23:33 -04:00
guerler 0c69c5b92f Add parenthesis to argument name search 2015-06-15 14:58:20 -04:00
guerler d2da9d9a17 Only add argument name if unavailable in help text 2015-06-15 13:46:01 -04:00
Martin Cech e8087f7b12 refactor TS javascript files to be separated from Galaxy JS 
thanks to Carl for helping me with this
 2015-06-15 13:31:16 -04:00