1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/c3cef260df88/ Changeset: c3cef260df88 Branch: release_15.05 User: natefoo Date: 2015-05-15 19:20:17+00:00 Summary: Add missing files excluded by .hgignore. Affected #: 2 files
diff -r f23c513e451c2777c9cefafcf23956499a084e26 -r c3cef260df887330c6da902caf8a5f068b9d29b4 config/auth_conf.xml.sample --- /dev/null +++ b/config/auth_conf.xml.sample @@ -0,0 +1,39 @@ +<?xml version="1.0"?> +<auth> +<!--<authenticator> + <type>ldap</type> +--> + <!-- Filter users for which this authenticator applies. This is a Python + expression which is evaluated after replacing instances of {email} + and {username} with the corresponding user's values. --> +<!-- <filter>'{email}'.endswith('@example.com')</filter> + <options> + <auto-register>True</auto-register> + <server>ldap://dc1.example.com</server> +--> + <!-- If search-fields is not present, all other search-* elements are ignored --> +<!-- <search-fields>sAMAccountName,mail</search-fields> + <search-filter>(&(objectClass=user)(mail={email}))</search-filter> + <search-base>dc=dc1,dc=example,dc=com</search-base> +--> + <!-- If search-user not specified will bind anonymously to LDAP for search --> +<!-- <search-user>jsmith</search-user> + <search-password>mysecret</search-password> + <bind-user>{sAMAccountName}@example.com</bind-user> + <bind-password>{password}</bind-password> + <auto-register-username>{sAMAccountName}</auto-register-username> + <auto-register-email>{mail}</auto-register-email> +--> + <!-- To allow login with username instead of email, default is False --> +<!-- <login-use-username>True</login-use-username> + </options> + </authenticator> +--> + + <authenticator> + <type>localdb</type> + <options> + <allow-password-change>true</allow-password-change> + </options> + </authenticator> +</auth>
diff -r f23c513e451c2777c9cefafcf23956499a084e26 -r c3cef260df887330c6da902caf8a5f068b9d29b4 config/plugins/visualizations/common/templates/script_entry_point.mako --- /dev/null +++ b/config/plugins/visualizations/common/templates/script_entry_point.mako @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +<%inherit file="visualization_base.mako"/> + +## No stylesheets +<%def name="stylesheets()"></%def> +## No javascript libraries +<%def name="late_javascripts()"> + <% tag_attrs = ' '.join([ '{0}="{1}"'.format( key, attr ) for key, attr in script_tag_attributes.items() ]) %> + <script type="text/javascript" ${tag_attrs}></script> +</%def>
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.