External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 08:20:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
18,006 Commits 63 Branches 102 Tags
5c44bf4ef989b64f77c02efd2e7bd7eed2fc0922
Commit Graph
54 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Adams 39c0ed4ad6 Merge pull request #2291 from rooftopcellist/revert_radius_110 
Revert Django-radius to 1.1.0
 2018-06-25 08:59:36 -04:00
Christian Adams 8bd2217a49 Merge pull request #2278 from rooftopcellist/fix_dot_oauth2_error 
Fix dot oauth2 error
 2018-06-22 12:54:39 -04:00
Christian Adams 7aa835abd4 Merge pull request #2210 from rooftopcellist/fix_refresh_token_fallout 
fix oauth2 refresh tests for dat112
 2018-06-18 14:31:35 -04:00
Christian Adams 1b5ea07745 Merge pull request #2171 from rooftopcellist/upgrade_oauth_112 
Upgrade Django-oauth-toolkit to 1.1.2
 2018-06-15 10:22:20 -04:00
Christian Adams 5ee4333fb0 Merge pull request #2163 from rooftopcellist/related_token_endpoint 
Add Related token link
 2018-06-14 14:39:13 -04:00
Christian Adams 485ce3f994 Merge pull request #2164 from rooftopcellist/update_pytest 
update dev pytest
 2018-06-14 11:45:57 -04:00
Christian Adams 4f3c45ac59 Merge pull request #2087 from rooftopcellist/add_DDT_to_docs 
Info on setting up DDT
 2018-06-07 18:26:11 -04:00
Christian Adams 17bc2a42ab Merge pull request #2040 from rooftopcellist/oauth2_doc_clean 
updates oauth docs with quickstart
 2018-06-04 11:14:18 -04:00
Christian Adams 69a507ae19 Merge pull request #2008 from rooftopcellist/default_scope 
Default scope
 2018-06-01 13:43:11 -04:00
Christian Adams b065593e49 Merge pull request #1932 from rooftopcellist/validate_scope 
Validate scope
 2018-05-25 10:49:02 -04:00
Christian Adams 0e4b0e86bf Merge pull request #1642 from rooftopcellist/session_parity 
add auth cookies
 2018-05-02 11:47:59 -04:00
Christian Adams fd4f78a64c Merge pull request #1637 from rooftopcellist/exp_setting_update 
Token Expiration Setting Update
 2018-05-01 15:05:33 -04:00
Christian Adams dab766239f Merge pull request #1613 from rooftopcellist/update_oauth2_filter 
granularly prevent filtering oauth secrets
 2018-04-30 12:11:24 -04:00
Christian Adams 5d82ee5a27 Merge pull request #1572 from rooftopcellist/radius_auth_fix 
Radius auth fix
 2018-04-25 16:17:31 -04:00
Christian Adams 136a58ee85 Merge pull request #1465 from rooftopcellist/update_oauth2_docs 
Update oauth2 docs
 2018-04-20 16:50:12 -04:00
Christian Adams b9d5f96f00 Merge pull request #1460 from rooftopcellist/saml_auth_issue 
fix multiple auth backends
 2018-04-20 14:04:36 -04:00
Christian Adams d08790a5b4 Merge pull request #1420 from rooftopcellist/act_stream_access 
Act stream access
 2018-04-19 11:51:33 -04:00
Christian Adams 87ba56ba67 Merge pull request #1409 from rooftopcellist/validate_scopes 
adds help-text for scopes
 2018-04-18 10:09:59 -04:00
Christian Adams 2db44cbf17 Merge pull request #1404 from rooftopcellist/application_id_act_stream 
Fix app json error
 2018-04-17 13:49:57 -04:00
Christian Adams a1dbd4dd57 Merge pull request #1371 from rooftopcellist/fix_app_change_id 
Fix id in activity_stream
 2018-04-13 15:11:48 -04:00
Christian Adams 087ac17c90 Merge pull request #1308 from rooftopcellist/fix_censor 
Fix censor
 2018-04-12 11:56:44 -04:00
Christian Adams a2cc357f21 Merge pull request #1333 from rooftopcellist/app_help_text 
add oauth2 help text
 2018-04-11 16:12:45 -04:00
Christian Adams 2b7ad578d5 Merge pull request #1121 from rooftopcellist/organization_based_permission 
Organization based permission
 2018-04-04 10:39:40 -04:00
Christian Adams 8646aa8c34 Merge pull request #1673 from HNKNTA/devel 
Fixed parentless function
 2018-03-26 09:06:18 -04:00
Christian Adams 2abf4ccf3b Merge pull request #1562 from rooftopcellist/python_saml_upgrade 
add xmlsec flag to docker installs
 2018-03-14 14:53:26 -04:00
Christian Adams f995b99af6 Merge pull request #1531 from rooftopcellist/application_description 
add description to app serializer
 2018-03-12 17:19:54 -04:00
Christian Adams cee12c4e6c Merge pull request #1378 from rooftopcellist/no_patch_app 
disallow changing token-app
 2018-03-09 10:33:24 -05:00
Christian Adams 8a25342ce5 Merge pull request #1373 from rooftopcellist/oauth_doc_csrf 
update docs
 2018-03-08 18:15:04 -05:00
Christian Adams 095515bb56 Merge pull request #1458 from rooftopcellist/fix_expiration 
Fix expiration
 2018-03-07 08:13:25 -05:00
Christian Adams db91e30464 Merge pull request #1449 from rooftopcellist/fix_exp_time 
fix token expiration time
 2018-03-06 14:55:38 -05:00
Christian Adams 953850a0d7 Merge pull request #1427 from rooftopcellist/hide_client_secret 
Hide client_secret from activity stream
 2018-03-02 15:43:49 -05:00
Christian Adams d1319b7394 Merge pull request #1414 from rooftopcellist/testing_oauth 
fix token creation at `api/o/token`
 2018-03-02 11:36:59 -05:00
Christian Adams 6e39388090 Merge pull request #1380 from rooftopcellist/csrf_flag 
adds csrf flag to support http
 2018-02-27 16:36:23 -05:00
Christian Adams 47c4eb38df Merge pull request #1377 from rooftopcellist/remove_authtoken_model 
Removes Auth token
 2018-02-27 16:33:20 -05:00
Christian Adams 9493b72f29 Merge pull request #904 from ansible/oauth_n_session 
Implement session-based  and OAuth 2 authentications
 2018-02-26 12:12:38 -05:00
Christian Adams d0fec0f19c Merge pull request #1013 from rooftopcellist/rdb_docs 
added RDB info to docs
 2018-01-18 12:33:00 -05:00
Christian Adams ccb40c8c68 Merge pull request #986 from rooftopcellist/xtra_vars 
extends JT xtra var error msg
 2018-01-16 00:58:59 -05:00
Christian Adams 7e261b5246 Merge pull request #847 from rooftopcellist/contributing_typos 
Fixed Typos
 2017-12-15 11:09:43 -05:00
Christian Adams 49aa43f8e4 Merge pull request #312 from rooftopcellist/auth_text_fix 
Removes auth field from Access List serializer
 2017-08-21 11:10:40 -04:00
Christian Adams 944e0bb304 Merge pull request #230 from rooftopcellist/si_no_match 
Fix for no_match on grouped hosts in smart inventories
 2017-08-11 15:33:10 -04:00
Christian Adams ff01ab063c Merge pull request #121 from rooftopcellist/smart_inventory_revert 
Inventory update endpoint now returns empty list
 2017-07-31 14:30:10 -04:00
Christian Adams fb850d9644 Merge pull request #113 from rooftopcellist/smart_inventory_edit 
Changes Smart Inventory Error Message
 2017-07-31 11:57:53 -04:00
Christian Adams 9816ac418a Merge pull request #82 from rooftopcellist/smart_inventory 
Blocks creation of Hosts, Groups, and IS for Smart Inventories
 2017-07-28 16:33:50 -04:00
Christian Adams 86210b611c Merge pull request #7222 from rooftopcellist/inventory_update_not_manual 
Inventory Update All no longer includes manual sources
 2017-07-21 13:04:14 -04:00
Christian Adams e955f9d32b Merge pull request #7241 from rooftopcellist/inventory_refresh_update 
Updates docs to include Inventory Refresh All info.
 2017-07-21 12:10:54 -04:00
Christian Adams f5bbccf0cd Merge pull request #6979 from rooftopcellist/IntegrityError 
Fix IntegrityError on Source Update
 2017-07-14 06:45:31 -07:00
Christian Adams e6c004babb Merge pull request #6951 from rooftopcellist/diff_help_text 
Add help_text for diff mode
 2017-07-12 14:57:00 -04:00
Christian Adams c821df7fd5 Amended diff mode addition 2017-07-10 10:28:47 -04:00
Christian Adams 13d46899d1 Add --diff mode 2017-07-10 10:25:54 -04:00
Christian Adams b79600d2e5 Merge pull request #6529 from rooftopcellist/contributing_update 
Adds information on creating a super user and preloading demo data when initializing a development environment.
 2017-07-08 21:09:28 -04:00
Christian Adams 3ae9578725 Merge pull request #6933 from rooftopcellist/diff_mode_feature 
Diff mode feature
 2017-07-07 16:04:40 -04:00
Christian Adams f1b0702aa0 Merge pull request #6872 from rooftopcellist/duplicate_instances_fix 
Fix duplicate Instances in API
 2017-07-03 16:41:03 -04:00
Christian Adams 5bbfda0189 Merge pull request #6671 from rooftopcellist/missing-proc-fix 
Missing Procfile docker-compose-cluster fix
 2017-06-21 14:38:54 -04:00
Christian Adams e7885edaa1 Merge pull request #6628 from rooftopcellist/cap-fix 
Capacity percentage fix
 2017-06-20 11:47:32 -04:00