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
25,499 Commits 69 Branches 243 Tags
48664fa2fe7f43ee667e9fa4ece51852632570e7
Commit Graph
3534 Commits
Author SHA1 Message Date
Nicola Soranzo ef3e63e6d7 Merge branch 'release_16.07' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
 2016-11-02 10:40:04 +00:00
guerler c4526bdaba Hide tab navbar if there is only one tab available 2016-10-27 13:30:39 -04:00
guerler 0b1c171ebc Revise tab viewer, add test cases 2016-10-27 13:02:01 -04:00
guerler ec9ca3ffd1 Fix list view title 2016-10-27 08:38:36 -04:00
guerler 296ef7e232 Hide tabs navigation if there is only one tab 2016-10-27 08:38:34 -04:00
guerler d9dfc2cc78 Move thumbnail list view to shared ui elements 2016-10-27 08:37:49 -04:00
Dannon Baker 67b1d45e36 Reapply isolated tool-form.js webhook changes 2016-10-27 12:50:02 +02:00
Dannon Baker 62773a72c7 Reapply isolated menu.js webhook changes 2016-10-27 12:35:36 +02:00
Dannon Baker 6e4f3d9d2d Revert menu.js, tool-form.js to pre-webhooks-PR 2016-10-27 10:56:58 +02:00
Dannon Baker 0eff2ec647 Merge remote-tracking branch 'tmcgowan/issue_3000' into dev 2016-10-27 10:22:27 +02:00
Dannon Baker 9d402eaf1a Merge remote-tracking branch 'tmcgowan/frequest_943' into dev 2016-10-25 17:07:38 +02:00
Dannon Baker a6d52cdbdc Merge remote-tracking branch 'bgruening/feature/plugin-system' into dev 2016-10-23 19:00:43 +02:00
Martin Cech 096a7bf94d fix the incorrect handling of root when prefix is in play 2016-10-20 20:46:47 -04:00
tmcgowan f9357ea07d Add modal confirmation for tool reload. 2016-10-20 14:30:59 -05:00
tmcgowan 38464b5b28 Originating workflow must be unchanged, load save as workflow to editor on save. 2016-10-18 16:06:16 -05:00
tmcgowan a431d88293 Add tool xml reload to tool run page - for admins only 2016-10-18 12:38:59 -05:00
guerler f053f9bb3d Merge branch 'dev' into remote_chart_plugins 2016-10-14 16:24:39 -04:00
Dannon Baker 6312d8052b Rebuild cilent. 2016-10-14 09:43:41 -04:00
Evgeny Anatskiy cc36793cd0 - remove separate functions for adding masthead/history-menu plugins 
- choose a random tool/workflow plugin only among active ones
 2016-10-12 10:49:41 +02:00
tmcgowan 1288cf0505 Add workflow save-as functionality. Issue 3000 2016-10-11 11:10:08 -05:00
Evgeny Anatskiy a3627b98ab make client 2016-10-09 22:26:35 +02:00
Evgeny Anatskiy ef304a2223 - merge 2016-10-09 22:22:54 +02:00
Evgeny Anatskiy 69a9344c52 - show Webhook on a workflow page 
- fix merge errors
 2016-10-09 22:18:15 +02:00
Evgeny Anatskiy ce346b6ad4 pass trans object into the helper function 2016-10-09 21:32:08 +02:00
Evgeny Anatskiy 578bdf679f bug fixes and improvements 2016-10-09 21:29:27 +02:00
Evgeny Anatskiy f3b1232bdb add new entry point for History Panel menu 2016-10-09 21:29:16 +02:00
anatskiy e95392b4b6 - add new entry point (Workflow) 
- temporarily hide masthead webhook (due to instability)
 2016-10-09 21:29:07 +02:00
anatskiy bb9dc0560a - unify webhooks entry point 
- simlify webhooks code (on load)
- improve code readability
- clean up
 2016-10-09 21:28:55 +02:00
anatskiy b215de947c renamings and fixes 2016-10-09 21:28:43 +02:00
anatskiy bf4a1aa1a8 topbar webhooks testing 2016-10-09 21:22:10 +02:00
anatskiy 40bcaaecf5 add one more plugin 2016-10-09 21:19:34 +02:00
anatskiy eb46e70206 add first webhook 2016-10-09 21:19:20 +02:00
anatskiy 6e66fbeca8 add very basic plugin system (for tools) 2016-10-09 21:19:05 +02:00
Evgeny Anatskiy d821c2745c pass trans object into the helper function 2016-10-09 16:32:58 +02:00
guerler 2316075f0c Merge branch 'dev' into remote_chart_plugins 2016-10-08 14:20:59 -04:00
Nicola Soranzo a2ee8d10af Merge branch 'release_16.07' into dev 
Conflicts:
	doc/source/admin/conda_faq.rst
	static/maps/mvc/ui/ui-modal.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/ui/ui-modal.js
 2016-10-05 20:34:50 +01:00
Evgeny Anatskiy 2bf0549a37 fix bugs after previous commit 2016-10-05 16:59:16 +02:00
Evgeny Anatskiy 31674ef5b7 Merge branch 'feature/plugin-system' of github.com:bgruening/galaxy into feature/plugin-system 
# Conflicts:
#	client/galaxy/scripts/layout/menu.js
#	client/galaxy/scripts/mvc/tool/tool-form.js
#	static/maps/layout/menu.js.map
#	static/maps/mvc/tool/tool-form.js.map
#	static/scripts/bundled/analysis.bundled.js
#	static/scripts/bundled/analysis.bundled.js.map
#	static/scripts/bundled/libs.bundled.js
#	static/scripts/bundled/libs.bundled.js.map
#	static/scripts/layout/menu.js
#	static/scripts/mvc/tool/tool-form.js
 2016-10-05 16:16:27 +02:00
Evgeny Anatskiy 6f109176d1 bug fixes and improvements 2016-10-05 16:11:07 +02:00
Evgeny Anatskiy 3c3819900f add new entry point for History Panel menu 2016-10-05 16:10:44 +02:00
anatskiy fce44d257b - add new entry point (Workflow) 
- temporarily hide masthead webhook (due to instability)
 2016-10-05 16:10:30 +02:00
anatskiy 6e534213e1 - unify webhooks entry point 
- simlify webhooks code (on load)
- improve code readability
- clean up
 2016-10-05 16:10:19 +02:00
anatskiy 482e0b2bff renamings and fixes 2016-10-05 16:09:55 +02:00
anatskiy 239731d45a topbar webhooks testing 2016-10-05 16:04:52 +02:00
anatskiy fecf493ecd add one more plugin 2016-10-05 15:56:49 +02:00
anatskiy ac5a0f5a6a add first webhook 2016-10-05 15:55:55 +02:00
anatskiy cf1fde577e add very basic plugin system (for tools) 2016-10-05 15:54:21 +02:00
Evgeny Anatskiy b98e49f2bc bug fixes and improvements 2016-10-05 15:33:03 +02:00
guerler b595cd3f47 Always submit either history_id or new history name through run form 2016-10-04 22:36:16 -04:00
guerler 329ee05251 Hide children elements instead of destroying them upon successful workflow submission 2016-10-04 12:36:52 -04:00