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
26,677 Commits 69 Branches 243 Tags
08449059f4e3c62fd281fcbeae67cdce149241c0
Commit Graph
3759 Commits
Author SHA1 Message Date
mvdbeek 8906f515e1 Add first working version of js needed for collection import 2017-02-04 21:03:45 +01:00
Nicola Soranzo 0b074f3fa5 Merge branch 'release_17.01' into dev 
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
 2017-02-03 11:44:02 +00:00
Dannon Baker 58241e8dcb Rebuild client for 17.01 with latest node. 2017-02-01 14:51:07 -05:00
guerler 0b0419533a Merge branch 'dev' into fix_workflow_issues 2017-01-24 09:12:18 -05:00
John Chilton 1b589f252e Merge remote-tracking branch 'jmchilton/dev' into escape_vis 
Conflicts:
	static/scripts/bundled/libs.bundled.js.map
 2017-01-23 11:27:26 -05:00
guerler 0482416c7a Merge branch 'dev' into fix_workflow_issues 2017-01-17 13:09:14 -05:00
Nicola Soranzo 8cb6162681 Merge branch 'release_16.10' into dev 
Conflicts:
	static/maps/mvc/ui/ui-misc.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/ui/ui-misc.js
 2017-01-16 11:57:16 +00:00
yhoogstrate ce0780abef Custom dbkey builds: additional variable escaping 2017-01-16 10:35:52 +01:00
guerler 84d9e171bc Merge branch 'fix_workflow_issues' of https://github.com/guerler/galaxy into fix_workflow_issues 2017-01-14 18:07:32 -05:00
Dannon Baker 08454cfa2a Name function appropriately for Javascript instead of being stuck in Python. 2017-01-13 14:50:48 -05:00
Dannon Baker b2cf773bef Merge remote-tracking branch 'upstream/release_16.10' into dev 2017-01-13 14:20:47 -05:00
Dannon Baker b798895af0 Swap form-view to use the new UnescapedMessage 2017-01-12 16:38:41 -05:00
Dannon Baker 890107334d Reversion of ui-misc messagebox changes. 2017-01-12 16:02:03 -05:00
Dannon Baker 45a9d586b6 Formatting cleanup. 2017-01-12 15:51:18 -05:00
Dannon Baker 3060da4ee5 Export UnescapedMessage from ui-misc. 2017-01-12 15:49:30 -05:00
Dannon Baker e1083132b8 Add UnescapedMessage, for when we actually need to display a message with html contents. Any users of this must escape contents on their own. 2017-01-12 15:42:05 -05:00
Dannon Baker a5c445966e Swap the client's ui-misc.Message to escape by default. 2017-01-12 12:10:38 -05:00
John Chilton e74ca27dbf Revert "Markdown datatype support." 2017-01-11 21:48:09 -05:00
John Chilton ca40f984b0 Markdown datatype support. 
With test tools demonstrating HTML and Markdown outputs from tools.

Implements #3396 as part of the Qiime hackathon.
 2017-01-10 15:51:08 -05:00
guerler 48ba525eb5 Merge branch 'dev' into fix_workflow_issues 2017-01-08 12:36:53 -05:00
Bjoern Gruening 5bfffac069 repack 2017-01-08 15:12:55 +01:00
Bjoern Gruening a24ce4c61f Merge branch 'workflow_inputs_display' of https://github.com/jmchilton/galaxy into jmchilton-workflow_inputs_display 2017-01-08 15:11:09 +01:00
guerler c8e1c8f535 Remove out commented code block, debug statement 2017-01-04 14:44:20 -05:00
guerler d21c77c67b Parse job actions as dictionary 2017-01-02 13:25:50 -05:00
guerler 9133618c04 Fix workflow parameter panel in workflow editor 2017-01-02 10:24:54 -05:00
guerler 1487e144ec Merge branch 'dev' into fix_workflow_issues 2016-12-29 15:11:08 -05:00
guerler 084b9432a6 Fix export test case 2016-12-29 15:09:52 -05:00
guerler 9df94f77c1 Fix load state identification, disable spinner for now 2016-12-27 19:04:18 -05:00
guerler 2b8cc0771f Attempt to use build module for module initialization 2016-12-27 18:58:52 -05:00
guerler d84221ea47 Add label hiding option without need to overwrite actual label 2016-12-27 10:51:38 -05:00
guerler 71b64472c6 Repack scripts 2016-12-27 10:29:13 -05:00
guerler ccdf09b099 Remove unused local variable 2016-12-27 08:43:30 -05:00
guerler c8ef41f1f1 Undo changes label handling adjustments to form-input and form-section modules 2016-12-26 22:50:36 -05:00
guerler a8caede3f8 Add form message if no inputs are available 2016-12-26 22:33:29 -05:00
John Chilton cd0387f7ba Repack client scripts. 2016-12-26 13:58:46 -05:00
guerler da6406202e Show workflow attributes instead of mock node content, remove special handling from show module form caller 2016-12-21 15:36:14 -05:00
guerler 5c49af7d0d Parse datalist handler for regular text input fields to front end 2016-12-21 12:53:12 -05:00
anuprulez ef82eec610 Merging with dev 2016-12-21 15:04:19 +01:00
anuprulez 132e284d37 Bug fix for masthead webhook if Galaxy.page is undefined for workflow, data libraries etc pages 2016-12-21 12:46:14 +01:00
guerler 7a8486f31f Merge branch 'dev' into fix_workflow_issues 2016-12-19 15:23:33 -05:00
guerler f2f1f0b3ef Rename tool form build caller 2016-12-19 15:20:14 -05:00
guerler 4476a2bfbf Indicate removal of form html building 2016-12-19 15:17:22 -05:00
guerler ca14167cdf Move non-tool module handling to api, disable workflow parameter info panel for now 2016-12-19 14:53:59 -05:00
Dannon Baker 415ddbb3bf Merge branch 'release_16.10' into dev 2016-12-19 12:03:13 -05:00
guerler 5c3a0e1df0 Identify workflow parameters through regex from original value 2016-12-17 15:22:20 -05:00
guerler 3f07c7b52e Preserve template value if no workflow parameter value has been specified 2016-12-17 15:03:28 -05:00
guerler 733a53adcf Replace workflow parameter values in template value string 2016-12-17 15:00:57 -05:00
guerler b6e9ba402d Allow multiple workflow parameters in a single line 2016-12-16 15:14:54 -05:00
Nicola Soranzo ed4e87ecad Merge branch 'release_16.10' 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
	static/scripts/bundled/login.bundled.js.map
	static/style/blue/base.css
 2016-12-15 11:27:28 +00:00
Bjoern Gruening d2ab7e701c build the client 2016-12-14 22:46:36 +01:00