3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b7c2f4457ace/ Changeset: b7c2f4457ace Branch: release_15.05 User: natefoo Date: 2015-05-15 19:21:08+00:00 Summary: Fix tags for 15.05 release. Affected #: 1 file diff -r c3cef260df887330c6da902caf8a5f068b9d29b4 -r b7c2f4457acef8bf0478170983787a2ea42eccff .hgtags --- a/.hgtags +++ b/.hgtags @@ -27,5 +27,5 @@ 9f40ff3e3fe1f7fed7e055d4269fe83199cf5ed2 v15.03.1 bfd4635011e39aa210b2b1498dd65831dd2a365e v15.03.2 bfd4635011e39aa210b2b1498dd65831dd2a365e latest_15.03 -31c076123a8fa32b2b6a51eb859e4cac90043333 v15.05 -31c076123a8fa32b2b6a51eb859e4cac90043333 latest_15.05 +c3cef260df887330c6da902caf8a5f068b9d29b4 v15.05 +c3cef260df887330c6da902caf8a5f068b9d29b4 latest_15.05 https://bitbucket.org/galaxy/galaxy-central/commits/46a4ef8850b5/ Changeset: 46a4ef8850b5 Branch: stable User: natefoo Date: 2015-05-15 19:21:24+00:00 Summary: Merge release_15.05 to stable Affected #: 3 files diff -r ae85e9661ccd635a08ab9e224a43fd9333fdd5c5 -r 46a4ef8850b5852390f0bf86869d889a30dffbe9 .hgtags --- a/.hgtags +++ b/.hgtags @@ -27,5 +27,5 @@ 9f40ff3e3fe1f7fed7e055d4269fe83199cf5ed2 v15.03.1 bfd4635011e39aa210b2b1498dd65831dd2a365e v15.03.2 bfd4635011e39aa210b2b1498dd65831dd2a365e latest_15.03 -31c076123a8fa32b2b6a51eb859e4cac90043333 v15.05 -31c076123a8fa32b2b6a51eb859e4cac90043333 latest_15.05 +c3cef260df887330c6da902caf8a5f068b9d29b4 v15.05 +c3cef260df887330c6da902caf8a5f068b9d29b4 latest_15.05 diff -r ae85e9661ccd635a08ab9e224a43fd9333fdd5c5 -r 46a4ef8850b5852390f0bf86869d889a30dffbe9 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 ae85e9661ccd635a08ab9e224a43fd9333fdd5c5 -r 46a4ef8850b5852390f0bf86869d889a30dffbe9 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> https://bitbucket.org/galaxy/galaxy-central/commits/e837a68e8d14/ Changeset: e837a68e8d14 User: natefoo Date: 2015-05-15 19:21:34+00:00 Summary: Merge stable to default Affected #: 3 files diff -r 7a4e3a661a76fa8f150c11f26c2bb52b2faa0046 -r e837a68e8d149bb185d631b27e049f3edeb641d3 .hgtags --- a/.hgtags +++ b/.hgtags @@ -27,5 +27,5 @@ 9f40ff3e3fe1f7fed7e055d4269fe83199cf5ed2 v15.03.1 bfd4635011e39aa210b2b1498dd65831dd2a365e v15.03.2 bfd4635011e39aa210b2b1498dd65831dd2a365e latest_15.03 -31c076123a8fa32b2b6a51eb859e4cac90043333 v15.05 -31c076123a8fa32b2b6a51eb859e4cac90043333 latest_15.05 +c3cef260df887330c6da902caf8a5f068b9d29b4 v15.05 +c3cef260df887330c6da902caf8a5f068b9d29b4 latest_15.05 diff -r 7a4e3a661a76fa8f150c11f26c2bb52b2faa0046 -r e837a68e8d149bb185d631b27e049f3edeb641d3 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 7a4e3a661a76fa8f150c11f26c2bb52b2faa0046 -r e837a68e8d149bb185d631b27e049f3edeb641d3 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.