External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-02 10:08:10 -03:30
Code Issues Packages Projects Releases Wiki Activity
6,170 Commits 55 Branches 102 Tags
e5b0e2aeb37bf0cb9a4c7bf4bb1f26ab54aaeee6
Commit Graph

6170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Mitchell
a698dae53f fixed messing up add user form w social auth pw hide earlier 2015-11-16 16:26:21 -05:00
Jared Tabor
01b77168b5 Update response object nesting for pendo service 2015-11-16 12:46:11 -08:00
Matthew Jones
3b07773bcd 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
  ...
 2015-11-16 15:12:37 -05:00
Chris Meyers
b37af76599 update requirements.txt README 2015-11-16 11:20:57 -05:00
John Mitchell
9bf0b8be4c hide un and pw fields when user is social auth based 2015-11-16 11:18:34 -05:00
Chris Meyers
46428e7674 add pyrad to requirements.txt 2015-11-16 11:15:08 -05:00
Chris Meyers
a1f9476f6d added appdirs 2015-11-16 11:14:17 -05:00
Matthew Jones
dfb056d200 Disallow changing a users password for social auth 2015-11-16 10:09:22 -05:00
Chris Meyers
5142732f59 Merge pull request #505 from chrismeyersfsu/fix-django-radius 
bump django-radius to include new license
 2015-11-16 10:05:49 -05:00
Chris Meyers
693a4412c8 bump django-radius to include new license 2015-11-16 09:59:41 -05:00
Chris Meyers
47dc5b62ba add django-radius license 2015-11-16 09:26:02 -05:00
Chris Meyers
93076533c7 python openid 2015-11-13 15:29:49 -05:00
Chris Meyers
e92004c6c5 remove duplicate, wrongfully created, license files 2015-11-13 15:02:37 -05:00
Chris Meyers
0cd7746290 keep pre-existing license files 2015-11-13 15:01:05 -05:00
Chris Meyers
4f66949cd9 2.4.0 python lib licenses 2015-11-13 14:51:28 -05:00
James Laska
c9c4f16319 Merge pull request #502 from ghjm/jenkins-ip_2.4.0 
Change Jenkins server references from IP to DNS name
 2015-11-13 12:47:16 -05:00
Chris Church
89c6a7a9d1 Merge pull request #499 from cchurch/social_auth_updates 
Social Auth and SSO Updates
 2015-11-13 11:56:39 -05:00
Graham Mainwaring
c836e3415a Change Jenkins server references from IP to DNS name 2015-11-13 11:47:28 -05:00
Chris Church
cd447bed96 Social auth and SSO updates: 
* Move auth backends into sso app.
* Add support for mapping social auth users into organizations and teams.
* Return social auth backends in a consistent order in the API.
* Remove custom SAML attribute mapping and use options provided by PSA.
* Add pipeline function to raise an exception if no user has been found or created; added comments on how to disable new user creation.
* Add comments for defining a custom social auth pipeline function.
 2015-11-13 11:30:55 -05:00
Chris Meyers
9829d83839 Merge pull request #498 from chrismeyersfsu/fix-delete_when_license_expired 
allow multi-org expired licenses to delete orgs
 2015-11-13 10:12:44 -05:00
John Mitchell
521177130c Update custom icons 
This also required an update to the padding fixes of the currently logged in user menu item.  These aren't necessary anymore.
 2015-11-12 18:00:20 -05:00
jlmitch5
31a3843e50 Merge pull request #496 from jlmitch5/login_refactor_3 
Login refactor 3
 2015-11-12 17:54:36 -05:00
John Mitchell
ce027a8e9d remove animate-hide deprecated class from partial. 2015-11-12 17:53:45 -05:00
John Mitchell
99d8648b3f add global error fade transitions 2015-11-12 17:50:09 -05:00
jaredevantabor
ce78fee680 Merge pull request #497 from jaredevantabor/footer 
Footer Opacity on Login
 2015-11-12 13:11:18 -08:00
Chris Meyers
97c56d451e allow multi-org expired licenses to delete orgs 2015-11-12 15:33:00 -05:00
Matthew Jones
4832f48e06 Add social log messages to tower's log on error 2015-11-12 13:47:17 -05:00
Chris Church
908b1b4094 Update default scopes requested for github social auth. 2015-11-12 12:27:19 -05:00
Jared Tabor
4ac56a474b Set footer opacity to 0 when on login modal 
and hide the copyright if the screen is not wide enough for it
 2015-11-12 00:35:20 -08:00
Matthew Jones
7f276b03fb Switch to matburt's fork for python social auth 
This picks up the change needed for python 2.6 to work
 2015-11-11 16:06:37 -05:00
Matthew Jones
5f321ecab6 Emit a warning for unmapped SAML paramters 2015-11-11 16:05:53 -05:00
John Mitchell
c6ca1b1c2b update loginModal based on 3.0 mockups 2015-11-11 15:29:36 -05:00
John Mitchell
0e104249a0 inject angular-animate to be used by Tower 2015-11-11 15:14:58 -05:00
John Mitchell
adb1c9bb45 update global styles for login refactor 2015-11-11 15:14:11 -05:00
John Mitchell
98770a4cd8 update angular animate from merge 2015-11-11 15:13:26 -05:00
John Mitchell
3a87b22269 upgrade angular and angular-animate 2015-11-11 15:09:55 -05:00
Matthew Jones
fdc9979595 Fix up some SAML issues 
* Fix an issue I created overriding authenticate
* Fix up attribute mapping using an identity provider class.  The
  methods built into django-social-auth for saml are probably not going
  to work.  We also now expose those mappings in a settings attrs map
  that the user can override.
 2015-11-10 11:58:42 -05:00
James Laska
60a2787468 Use correct aw_repo_url when building packer 2015-11-06 15:19:35 -05:00
Chris Meyers
c52c7c2f9f Merge pull request #494 from chrismeyersfsu/feature-socket_tests 
adds socket tests
 2015-11-06 14:39:03 -05:00
John Mitchell
a5e938e9ab fixed merge conflict with layout css 2015-11-06 13:34:38 -05:00
John Mitchell
1662b8bff7 update ids based on conversation with jlaska 2015-11-06 13:26:03 -05:00
John Mitchell
5863d25968 move hover style under selected so it is not overridden 2015-11-06 13:25:23 -05:00
John Mitchell
7d208b7d6f updates based on jtabor's review 2015-11-06 10:53:20 -05:00
Chris Meyers
e928aa40a5 Merge pull request #493 from chrismeyersfsu/feature-git_hook 
added git pre commit hook to run flake8
 2015-11-06 10:48:38 -05:00
Chris Meyers
3f4913f5ab adds socket tests 2015-11-06 10:30:56 -05:00
Chris Meyers
014419f6ca Merge pull request #492 from chrismeyersfsu/fix-ha_remove 
fixes remove_instance error
 2015-11-06 07:56:50 -05:00
Chris Meyers
0b4efa3fcd added git pre commit hook to run flake8 2015-11-06 07:38:29 -05:00
Chris Meyers
dbbfde0d25 fixes remove_instance error 
* Initialize object attribute to None so a later if check that depends
on that attributes succeeds. The attribute is related to unifying the
command line args to the *_instance command set.
* Added regression test case
 2015-11-06 07:19:09 -05:00
jaredevantabor
229be0a99e Merge pull request #491 from jaredevantabor/footer 
Directivize footer and make it sticky
 2015-11-05 17:17:52 -08:00
Jared Tabor
edc364be8b Directivize footer and make it sticky 
Sticky to bottom of screen if viewport is taller than brawser window
 2015-11-05 16:57:05 -08:00