mirror of
https://github.com/ansible/awx.git
synced 2026-05-14 12:57:40 -02:30
Merge branch 'release_2.4.0' into devel
* release_2.4.0: (70 commits) Disallow changing a users password for social auth bump django-radius to include new license Change Jenkins server references from IP to DNS name Social auth and SSO updates: allow multi-org expired licenses to delete orgs Add social log messages to tower's log on error Update default scopes requested for github social auth. Switch to matburt's fork for python social auth Emit a warning for unmapped SAML paramters Fix up some SAML issues Remove `environment` play stmt Use correct aw_repo_url when building packer Add missing libxmlsec1 openssl dependency for ubuntu adds socket tests added git pre commit hook to run flake8 fixes remove_instance error null pointer exception Resolve issue on precise keeping old debs around Attach handlers to django_auth_ldap Attach handlers to django_auth_ldap ...
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
|
||||
<div id="about-dialog-body">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-5">
|
||||
<div class="col-xs-12 col-sm-5 About-cowsay">
|
||||
<div style="width: 340px; margin: 0 auto;">
|
||||
<pre id="cowsay">
|
||||
________________
|
||||
@@ -19,10 +19,11 @@
|
||||
<div class="col-xs-12 col-sm-7 text-center">
|
||||
<img id="about-modal-titlelogo" src="/static/assets/ansible_tower_logo_minimalc.png"><br>
|
||||
<p>Copyright 2015. All rights reserved.</p>
|
||||
<p>Ansible and Ansible Tower are registered trademarks of Ansible, Inc.</p>
|
||||
<p>Ansible and Ansible Tower are registered trademarks of Red Hat, Inc.</p>
|
||||
<br>
|
||||
<img class="About-redhat" src="/static/assets/redhat_ansible_lockup.png">
|
||||
<br>
|
||||
<p>Visit <a href="http://www.ansible.com" target="_blank">Ansible.com</a> for more information.</p>
|
||||
<br>
|
||||
<p><span id='about-modal-subscription'></span></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user