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,557 Commits 69 Branches 243 Tags
1f62be4e1aec00a82b4c66209d486ebda695554a
Commit Graph
3035 Commits
Author SHA1 Message Date
Carl Eberhard 4440240b55 Tagging (mako-based): extract js set up code for tagging from display_base.mako and move to tagging_common (hackathon quick fix) 2015-07-05 11:58:35 +01:00
guerler 53d13e9284 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 2015-06-24 12:58:53 -04:00
Carl Eberhard d25bd38896 UI, History structure: fix/update serializer call to non-trans form 2015-06-23 10:05:46 -04:00
guerler cc1db3543e Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 
Conflicts:
	templates/webapps/galaxy/workflow/editor_tool_form.mako
 2015-06-22 08:53:28 -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
Nicola Soranzo f8b364b9f5 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into pep8 
Conflicts:
	lib/galaxy/tools/parameters/validation.py
 2015-06-17 12:44:53 +01: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
Nicola Soranzo 3c40f32fa2 PEP-8 and pylint fixes. 2015-06-16 16:53:49 +01:00
Martin Cech 06cc164f9b Merge pull request #340 from blankenberg/toolshed-hg-link 
Restore link to mercurial browsing of repositories.
 2015-06-16 11:35:53 -04:00
Martin Cech 0943142a08 add titles to explan TS mercurial browser links 2015-06-16 10:41:23 -04:00
Martin Cech 0ba756e0f2 Merge pull request #330 from Airistotal/reports_sorting 
Reports sorting
 2015-06-15 17:09:01 -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 4de4aecea2 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 2015-06-15 13:34:44 -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
Dannon Baker f472a67e79 Merge pull request #337 from martenson/ts-hide-test-results 
TS hide test results
 2015-06-15 11:34:49 -04:00
Martin Cech 5e77f3f34a bind to correct config option 2015-06-15 11:32:42 -04:00
guerler 91b00044dc Use proper convention for main workflow view name 2015-06-15 04:38:09 -04:00
guerler 614b35e3a9 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 
Conflicts:
	client/galaxy/scripts/galaxy.workflows.js
	static/maps/galaxy.workflows.js.map
	static/scripts/galaxy.workflows.js
 2015-06-15 04:01:26 -04:00
John Chilton 07072bd568 Merge pull request #326 from martenson/ts-groups 
TS groups
 2015-06-13 17:26:32 -04:00
Daniel Blankenberg 8ba8066a8e Restore link to mercurial browsing of repositories. 2015-06-12 17:24:08 -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
Martin Cech 353ee2f22a introduce a config option to hide results of install & test framework 2015-06-12 13:16:16 -04:00
Airistotal d3246c3f5f Added fix for ORDER BY NULL case and added sorting to the rest of the reports pages. 
Added a link for errors per tool to inspect the erring jobs.
 2015-06-11 14:08:15 -05:00
Airistotal b4715119dd Generalized sorting and applied changes to all Jobs pages in Reporting 2015-06-10 14:09:09 -05:00
Airistotal 3450363fde Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev 2015-06-09 15:38:02 -05:00
Airistotal 815539ca95 Reimplemented sorting to be much easier to apply to other pages. 
Added sorting for Errorrs per Tool page.
 2015-06-09 15:24:32 -05: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
Kyle Ellrott 745c777879 Clarifing naming to use 'Phase' 2015-06-09 11:08:25 -07:00
Kyle Ellrott b904a5fddd Adding system to log tool loading/preperation exceptions so that they can be viewed in an admin dialog 2015-06-08 22:33:01 -07:00
guerler 4bceafcbf4 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 
Conflicts:
	client/galaxy/scripts/galaxy.workflow_editor.canvas.js
	static/maps/galaxy.workflow_editor.canvas.js.map
	static/scripts/galaxy.workflow_editor.canvas.js
 2015-06-08 14:43:04 -04:00
Martin Cech b0a16eb407 Merge pull request #303 from Airistotal/dev 
Added sorting ability to jobs per tool page in reporting
 2015-06-08 12:04:10 -04:00
guerler e466bcbc44 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into workflow_form_002 2015-06-07 22:17:25 -04:00
guerler d22f1fb96d Replace global js variables by shared object module 2015-06-06 17:06:59 -04:00
Dannon Baker 8d95a37515 Merge pull request #302 from martenson/update-admin-page 
update and clarify admin menu
 2015-06-04 12:34:06 -04:00
guerler 0bfd30a1a9 Move global add_node function to workflow class 2015-06-04 11:58:41 -04:00
Martin Cech 9c89d43875 fix shared mako templates that would not work with TS 
by also looking for 'app' within context when 'webapp' is not present
and defaulting to 'galaxy' afterwards
 2015-06-04 10:31:44 -04:00
guerler a00461eaf6 Merge workflow_001 2015-06-04 02:42:53 -04:00
Daniel Bouchard eb08088bcb Add errors per job mako 2015-06-03 11:27:25 -05:00
Daniel Bouchard b985851f8a Fixed extra space in jobs per tool page, underlined both titles 2015-06-03 10:33:29 -05:00
Dannon Baker c69945ff95 Merge new workflow editor. 2015-06-02 18:44:56 -04:00
Daniel Bouchard db105dbefa Added a Errors per tool page to the report webpage 2015-06-02 16:09:37 -05:00
Daniel Bouchard 04862bdc9a Merge branch 'dev' of https://github.com/galaxyproject/galaxy into dev 2015-06-01 14:49:56 -05:00
Daniel Bouchard 0dd99b13f9 Removed hyperlink underline for unsorted columns in jobs per tool in reports page 2015-06-01 13:56:34 -05:00
Daniel Bouchard 0369161eea Added the ability to sort by id and job number on the jobs per tool page 2015-06-01 12:54:41 -05:00
Martin Cech dbe91aa316 reorder; add links; show help only if option is present 2015-06-01 13:42:59 -04:00
Martin Cech 8e68ea23b6 fix minor typo 2015-06-01 10:50:31 -04:00
Martin Cech d4aa8bbd91 open links in _blank 2015-06-01 10:43:27 -04:00
Martin Cech 6d08accfa4 fix minor typos, add wiki link 2015-06-01 10:37:30 -04:00
Martin Cech a86ee81c28 update and clarify descriptions, cleanup admin menu 2015-06-01 10:30:56 -04:00