External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-14 07:50:09 -02:30
Code Issues Packages Projects Releases Wiki Activity
7,638 Commits 64 Branches 102 Tags
dfec286bed4baf1d587bafb9e4d6bfb4f54080da
Commit Graph
7638 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Meyers ad383ebccc license enforcement 
* add rebrand and auth_enterprise feature to license
* enforce auth_enterprise by not surfacing auth callback info at /auth
endpoint
 2015-10-08 18:00:29 -04:00
Jared Tabor d937f996ae adding ng-pendo.js 
until the pendo guys load it on their servers
 2015-10-08 14:12:47 -04:00
jaredevantabor 0a63aaa5ef Merge pull request #468 from jaredevantabor/pendo3 
Conditionally load Pendo when analytics_status = off
 2015-10-08 13:14:23 -04:00
Jared Tabor fa4dd9a335 load pa.min.js for pendo on demand 
courtesy of our friends at Pendo
 2015-10-08 11:58:49 -04:00
Jared Tabor b6e51a0cd4 updated $http call to angular 1.4 implementation 2015-10-08 11:46:15 -04:00
Jared Tabor 4ea2e10f1c rejecting promise on requestError REST interceptor 2015-10-08 11:45:39 -04:00
jlmitch5 6883d70805 fixed tmp dir deletion in make clean 2015-10-08 10:58:30 -04:00
John Mitchell 8cfe02f5fb fixed ui implementation of get adhoc permission label 2015-10-08 10:57:46 -04:00
John Mitchell 8908f77fea add token to href of downloadable standard out 2015-10-08 10:56:27 -04:00
Matthew Jones 3b961cf4f2 Merge pull request #466 from matburt/use_waitfor_not_sleep 
Switch to using wait_for instead of sleep/pause throughout the setup playbook
 2015-10-07 15:53:18 -04:00
Bill Nottingham 9928707588 Merge pull request #465 from wenottingham/release_2.4.0 
Fix base class import on Ansible 2.0.
 2015-10-07 15:32:49 -04:00
Bill Nottingham 916391d0b3 Fix base class import on Ansible 2.0. 2015-10-07 13:03:52 -04:00
Chris Meyers 83fe3282dc add basic auth enabled / disabled setting 2015-10-07 11:36:08 -04:00
Chris Meyers dcd731071f pin django debug toolbar for django dep reason 
* fix IPy dep
* new django debug toolbar released today, broke things. Pin to our old
version of django to ensure success.
 2015-10-07 11:34:50 -04:00
Chris Meyers f213577f6b expose session settings to user 2015-10-07 11:32:45 -04:00
Chris Meyers 815081eec1 correct egg names for pip dependency resolution 2015-10-07 11:32:22 -04:00
Chris Meyers 02db736166 Merge pull request #464 from chrismeyersfsu/feature-setting_basic_auth 
add basic auth enabled / disabled setting
 2015-10-07 09:23:16 -04:00
Chris Meyers bc971da3a1 Merge pull request #463 from chrismeyersfsu/devel 
Fix up layed down settings
 2015-10-07 09:22:44 -04:00
Chris Meyers 96e282dbaf add basic auth enabled / disabled setting 2015-10-07 09:19:22 -04:00
Chris Meyers 5942819d86 Merge branch 'feature-auth_config' into devel 2015-10-07 08:55:05 -04:00
Chris Meyers e71189466c pin django debug toolbar for django dep reason 
* fix IPy dep
* new django debug toolbar released today, broke things. Pin to our old
version of django to ensure success.
 2015-10-06 20:26:33 -04:00
Jared Tabor 116b0849a7 updated $http call to angular 1.4 implementation 2015-10-06 17:42:17 -04:00
James Laska 6da39aeac2 Fix AMI publish playbook 2015-10-06 16:20:03 -04:00
Chris Meyers 61b0e80a5f Merge pull request #462 from chrismeyersfsu/feature-auth_config 
expose session settings to user
 2015-10-06 15:40:35 -04:00
John Mitchell 97f7e56635 add token to href of downloadable standard out 2015-10-06 15:31:39 -04:00
Jared Tabor 55e6206d74 rejecting promise on requestError REST interceptor 2015-10-06 12:11:14 -04:00
Matthew Jones f4fb43fdcd Merge remote-tracking branch 'upstream/release_2.4.0' into devel 
* upstream/release_2.4.0:
  Re-enable cedric-vincent to get installs working
  Handle cedric-vincent horrible proot version
  Allow AMI/vagrant builds to proceed
  Fix RPM builds failures building m2crypto
  Update RPM to support 2.4.0 builds
  Add RPM BuildRequires for xmlsec1-openssl-devel
  Correct typo in debian dependency list
  Debian cannot handle release dependencies
 2015-10-06 12:07:05 -04:00
Chris Meyers 63fbfbe11f expose session settings to user 2015-10-06 12:01:07 -04:00
John Mitchell 21ff08e4a5 fixed ui implementation of get adhoc permission label 2015-10-06 11:25:04 -04:00
Matthew Jones c55741f6c6 Bump version number for devel to 3.0 2015-10-06 10:38:08 -04:00
Chris Meyers a7d9eea942 Merge pull request #461 from chrismeyersfsu/fix-requirements_eggs 
correct egg names for pip dependency resolution
 2015-10-05 16:31:15 -04:00
jlmitch5 9fe710d01a fixed tmp dir deletion in make clean 2015-10-05 15:24:43 -04:00
Matthew Jones 6353277a16 Include new social auth settings in compose 2015-10-05 14:02:38 -04:00
Matthew Jones 2c873e0d1d Fix up docker compose local settings 2015-10-05 14:00:11 -04:00
Chris Meyers 51b534ae2e correct egg names for pip dependency resolution 2015-10-05 13:58:55 -04:00
Matthew Jones b937a4729b Also remove .deps_built with make clean 2015-10-05 13:55:59 -04:00
Matthew Jones 4c632d5f59 Add swig to dependencies for compose 2015-10-05 13:21:38 -04:00
Matthew Jones a49263ba41 Add libxmlsec1-dev to the docker compose workflow 2015-10-05 12:07:17 -04:00
Chris Church 51fd41da2c Merge pull request #458 from jlmitch5/plugAuthUIAPIIntegration 
inegration of ui with api on pluggable auth
 2015-10-02 17:29:58 -04:00
Chris Church 8d2f6eaf06 Merge pull request #459 from cchurch/slammin-saml 
OAuth2/SAML/RADIUS Authentication
 2015-10-02 17:29:45 -04:00
Chris Church 32604f1338 Fix for 500 error at /api/v1/me. 2015-10-02 17:29:16 -04:00
Matthew Jones 0fdb5e035c Merge pull request #460 from matburt/improve_mongo_efficiency 
Improve mongo efficiency
 2015-10-02 16:56:36 -04:00
Matthew Jones b06f7fb883 Remove logging from fact init 2015-10-02 16:56:13 -04:00
Matthew Jones dbd0a01410 Merge branch 'release_2.3.1' into devel 
* release_2.3.1:
  Add 2.3.1 to the reprepro distribution manifest
  Update version to 2.3.1 and update changelog
  Remove unused time import
  Fix proot controlpersist cleanup issue
  Propagate necessary build changes from devel
  Update reprepro components
  Reenable the reprepro i386 repository
  Fix supervisor migration
  Fix reprepro/conf path in Makefile
  prefer the first version when packages are ambiguous
  Correct error message
  Fix omission
  Correct conditional stmt
  Improve logging when sourcerpm fails
  Fix typo
  Fix OFFICIAL deb Makefile
 2015-10-02 16:37:45 -04:00
Matthew Jones 4bcd19f833 Merge branch 'release_2.3.1' into stable 
* release_2.3.1:
  Add 2.3.1 to the reprepro distribution manifest
  Update version to 2.3.1 and update changelog
  Remove unused time import
  Fix proot controlpersist cleanup issue
 2015-10-02 16:33:31 -04:00
Chris Church 84e89ab6f8 Fix auth-related errors breaking unit tests. 2015-10-02 16:16:30 -04:00
Matthew Jones ac37667649 Clean up fact module imports 2015-10-02 16:08:02 -04:00
Matthew Jones c65d068d55 Add note about wanting to use register_connection 
I think this would be the cleaner way to go about things but there are
some unanswered questions about that route.
 2015-10-02 16:04:47 -04:00
Matthew Jones 1425718d9e Improve the efficiency of mongo connections 
- Remove the connect action in the fact __init__ module
- Monkeypatch mongoengine.Document's _get_db to force a new connection
  or raise an error if we don't have the proper settings.
 2015-10-02 15:57:50 -04:00
Chris Church 0c7a4b9f60 Disable flake8 checks in settings. 2015-10-02 15:24:49 -04:00