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,204 Commits 69 Branches 243 Tags
032dd3e3fd7ae9fb18259df4235eefdfbb86175c
Commit Graph
555 Commits
Author SHA1 Message Date
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
Martin Cech 6eddbf524b allow the js dependencies to use generalized path 
using requirejs paths to provide the relative prefix
 2015-06-15 13:57: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
guerler ca832ced32 Add tool parameter argument to parameter help 2015-06-15 13:25:39 -04:00
John Chilton 07072bd568 Merge pull request #326 from martenson/ts-groups 
TS groups
 2015-06-13 17:26:32 -04:00
Airistotal a2c44b4c8b Renamed new class and moved inline styling 2015-06-12 13:01:20 -05:00
Airistotal a09dd64d61 Added new css class for panel scrolling and compiled 2015-06-12 12:49:50 -05:00
Airistotal a91c81679c Fixed bug where the left panel didn't scroll when the screen was too smal 2015-06-12 12:30:44 -05:00
Carl Eberhard 6cc2e6bb73 Client build, toolshed: fix default task param in GruntFile 2015-06-11 09:41:36 -04:00
Carl Eberhard 7bea3621b6 Client build, toolshed: allow passing an 'app' option to the client/GruntFile, use 'grunt --app=toolshed' to watch for changes in toolshed scripts, duplicate our (unusual) galaxy scripts directories for the toolshed app (test-file.js to be removed). 2015-06-11 09:33:53 -04:00
guerler 66fa7c2ad2 Fix generic forms for modules 2015-06-10 03:13:38 -04:00
Martin Cech cfe9620192 backbone base of TS groups 
fix backbone hash problem; some more formatting and API polishing

refactor group API controller; better format group detail view

more formating and refactoring

add column to group detail

update details, add some more info to API response
 2015-06-09 16:13:10 -04:00
John Chilton 732abcc0db Merge remote-tracking branch 'jmchilton/release_15.05' into dev 2015-06-08 14:04:28 -04:00
guerler 2815354989 Follow jquery blog suggestions on attr vs prop usage 2015-06-05 15:45:11 -04:00
guerler 38037e487d Always open tool help links in a new window tab 2015-06-05 15:15:29 -04:00
John Chilton 620accaaad Extend workflow editor to allow output collections in tools. 
Mostly test cases - because I guess I could have sworn it was going to be harder than this.
 2015-06-04 14:38:38 -04:00
John Chilton 4872c9a895 Modify galaxy.workflow_editor.canvas.js verbage for output collections. 2015-06-04 14:38:37 -04:00
Bjoern Gruening 654c216a77 fix path to spinner icon 2015-06-02 15:54:45 +02:00
guerler d01c108375 Reduce form mako to json generation, load form just once 2015-05-24 15:37:00 -04:00
guerler 44739c6457 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_000 2015-05-20 23:20:06 -04:00
Dannon Baker d76af9bb7e Merge pull request #280 from carlfeberhard/fix.select2-search-focus 
UI, Tool form: remove select2 search.blur handler that re-focuses its…
 2015-05-20 20:08:30 -04:00
Carl Eberhard 2257bdc665 UI, Tool form: remove select2 search.blur handler that re-focuses its search and prevents focusing on other elements 2015-05-20 18:10:26 -04:00
Carl Eberhard 2cc5ea1225 Client style: fix sprite paths by using hardcoded path in task 2015-05-20 15:47:32 -04:00
guerler 3217a20927 Update integer fields while editing 2015-05-20 01:52:19 -04:00
guerler 0742b43cc7 Change set at runtime icons 2015-05-20 01:09:20 -04:00
guerler 45b7a625ae Explicitly identify runtime value in handling process 2015-05-19 23:21:32 -04:00
guerler 5691d345fa Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_000 
Conflicts:
	lib/galaxy/tools/__init__.py
 2015-05-19 18:44:29 -04:00
guerler 4fcd23c0f3 Extend checksum to account for collapsed input tool parameters 2015-05-19 18:41:51 -04:00
guerler ab2238e533 Merge branch 'tool_form_000' into workflow_form_000 
Conflicts:
	static/maps/mvc/form/form-data.js.map
	static/scripts/mvc/form/form-data.js
 2015-05-19 18:37:08 -04:00
guerler 2fa3dabf0e Remove debug output 2015-05-19 17:39:27 -04:00
guerler 2db905c5c1 Add field id to checksum 2015-05-19 17:39:04 -04:00
guerler bf436582a8 Fix checksum to detect tool form changes 2015-05-19 17:32:04 -04:00
Carl Eberhard b5615d28a4 Merge remote-tracking branch 'origin' into bitbucket.dataset-choice 2015-05-19 11:57:36 -04:00
Carl Eberhard 6d20093f7b UI, Dataset chooser: fix underscore templating and right,left border 2015-05-19 11:55:15 -04:00
guerler da63f0bef9 Add RuntimeValue handling for new workflow editor form 2015-05-19 00:27:59 -04:00
Nate Coraor 656d9bef50 Merge remote-tracking branch 'upstream/release_15.05' into dev 
Conflicts:
	lib/galaxy/version.py
 2015-05-14 11:11:46 -04:00
John Chilton 74cba741bc Merge pull request #255 from guerler/fix_none_selection 
[15.05] Accept 'None' as valid value for selections
 2015-05-13 13:24:21 -05:00
guerler e5d19d9999 Accept 'None' as valid value 2015-05-13 11:24:32 -04:00
guerler 32e027d431 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into library_data_parameter 
Conflicts:
	static/maps/mvc/form/form-section.js.map
	static/scripts/mvc/form/form-section.js
 2015-05-13 04:19:08 -04:00
Aysam Guerler 117a3415d3 Merge pull request #241 from carlfeberhard/client.update-d3 
Client libs: update d3 from 3.4.8 to 3.5.5
 2015-05-07 14:51:05 -04:00
Carl Eberhard 19d00d6ac6 Testing, qunit: remove unfortunately silent error of missing global Galaxy when running via require and phantom by checking scope first, update list of pairs tests with recent option changes, remove debugging cruft 2015-05-07 13:26:38 -04:00
Carl Eberhard edf794233d Client libs: update d3 from 3.4.8 to 3.5.5 2015-05-07 13:16:38 -04:00
Martin Cech d28ea45556 Merge branch 'release_15.05' into dev 
Conflicts:
	config/plugins/visualizations/common/templates/script_entry_point.mako
 2015-05-07 13:09:24 -04:00
Carl Eberhard c2d52fdddd History UI: in published/annotated panels, fix metafile download dropdowns (BAM files, etc.) to open properly, remove console statement in template 2015-05-07 10:53:30 -04:00
Nate Coraor 3e80076e6a Merge pull request #233 from guerler/workflow_1 
Fix post action job and annotation parsing in new workflow editor
 2015-05-07 09:00:06 -04:00
guerler 08d76ee0cf Fix automated section expansion for post job actions 2015-05-07 02:07:53 -04:00
Dannon Baker e0f351ae2a Merge pull request #221 from carlfeberhard/client.update-libs 
Update client libs
 2015-05-06 16:30:17 -04:00
Carl Eberhard 673aef1685 Client libs: correct dependency location for requirejs from dev to standard 2015-05-06 10:35:10 -04:00
Carl Eberhard b18d215c44 Client libs: update requirejs to 2.1.17, correct bower installation for same 2015-05-06 10:24:25 -04:00