shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 06:51:10 +03:00
Code Releases Activity
12,500 Commits 40 Branches 19 Tags 380 MiB
8734ad738f
Commit Graph

12500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones
e1e83598e9 Merge branch 'release_3.1.3' into devel 
* release_3.1.3: (52 commits)
  ack fact scan messages
  making ldap user/group search fields into codemirror instances
  removing UI parsing for LDAP User and Group Search fields
  Allow exception view to accept all valid HTTP methods.
  Restore ability of parsing extra_vars string for provisioning callback.
  Fix up backup/restore role broken in f7a8e45809758322d9ee41c5305850dd70ed5faf
  Stop / start ansible-tower-service during restores
  value_to_python should encode lookup fields as ascii
  fix brace interpolation on standard out pane
  Adjust some hardcoded usages of 'awx' to use 'aw_user' and 'aw_group'.
  Pull Spanish updates from Zanata
  Temporarily grant awx user createdb role
  Stop giving ownership of backups to postgres
  don't display chunked lines'
  Add dropdown li truncation with ellipsis
  CTiT -> adhoc modules should allow the user to add new modules
  Remove task that was replacing the supervisor systemd tmp file
  Fix failing supervisorctl commands on RH-based distros
  Give ownership of the supervisor socket to awx
  Setting for external log emissions cert verification
  ...
 2017-04-28 13:57:04 -04:00
Chris Meyers
3c0d4bf134 Merge pull request #6132 from chrismeyersfsu/fix-ack_fact_scan_messages 
ack fact scan messages
 2017-04-28 13:49:09 -04:00
Chris Meyers
d14a55911b ack fact scan messages 
* Fixes a bug where fact rabbit messages would build up because we never
explicitly ack them.
 2017-04-28 13:46:54 -04:00
Marliana Lara
a7dbb78c2e Autofill organization in a new notification template 
Issue #2943
When navigating from an organization to a new
notification template, the organization field should automatically
populate the organization name.
 2017-04-28 13:42:00 -04:00
Wayne Witzel III
b651983045 also add inventory_source_id to websocket data 2017-04-28 12:22:49 -04:00
Wayne Witzel III
1248be9b7c Add inventory_id to websocket data 2017-04-28 11:50:07 -04:00
Ryan Petrello
987448c917 Merge pull request #6127 from ryanpetrello/reserved_tower_ns 
treat `tower` as a reserved field name for custom CredentialTypes
 2017-04-28 11:38:20 -04:00
Ryan Petrello
03460b311e treat tower as a reserved field name for custom CredentialTypes 2017-04-28 11:26:18 -04:00
Aaron Tan
89f239ce66 Merge pull request #6119 from jangsutsr/5658_enforce_org_dependency_of_notification_template 
Enforce org dependency of notification template
 2017-04-28 11:08:21 -04:00
Aaron Tan
d0d201863b Enforce org dependency of notification template. 2017-04-28 10:14:21 -04:00
Aaron Tan
77915423c2 Merge pull request #6122 from jangsutsr/6012_prevent_workflow_resources_from_returning_402_with_basic_license 
Prevent workflow resources from returning 402 with basic license
 2017-04-28 09:38:34 -04:00
Aaron Tan
209acc3278 Merge pull request #6121 from jangsutsr/6118_allow_drf_parser_to_accept_trailing_commas 
Allow DRF parser to accept trailing commas
 2017-04-28 09:37:23 -04:00
Alan Rominger
0e2bf3486a Merge pull request #6123 from AlanCoding/allow_templated_ct 
Make Credential Type validator aware of `tower` var
 2017-04-28 09:23:51 -04:00
AlanCoding
1169d19f8c Make Credential Type validator aware of "tower" var 2017-04-28 07:56:49 -04:00
Aaron Tan
0dc6bbe5a0 Prevent workflow resources from returning 402 with basic license. 2017-04-27 16:50:16 -04:00
Aaron Tan
c2d26c918a Allow DRF parser to accept trailing commas. 2017-04-27 16:16:05 -04:00
Marliana Lara
25fae0eafd Merge pull request #6112 from marshmalien/fix/addTooltipToJobsPanel 
Add tooltip to Job Panel status dots
 2017-04-26 16:21:21 -04:00
Marliana Lara
9189252724 Add tooltip to Job Panel status dots 2017-04-26 15:25:14 -04:00
Matthew Jones
a39b1e8436 Fix ipython version in dev container to 5.2.1 2017-04-26 09:57:51 -04:00
Ryan Petrello
c96b1d87ee Merge pull request #6106 from ryanpetrello/more_cred_migration 
fix a few more migration-related issues for credentials
 2017-04-26 09:40:09 -04:00
Ryan Petrello
66e004a9db fix a few more migration-related issues for credentials 2017-04-26 09:24:33 -04:00
Jared Tabor
9d307bc75e Merge pull request #6108 from jaredevantabor/ldap-user-group-search 
making ldap user/group search fields into codemirror instances
 2017-04-25 17:26:38 -07:00
Marliana Lara
babe59a9cc Merge pull request #6104 from marshmalien/fix/addContrastToRowShading 
Add more contrast to row shading in Tower
 2017-04-25 18:56:05 -04:00
jaredevantabor
b5d36e4038 making ldap user/group search fields into codemirror instances 2017-04-25 14:47:14 -07:00
Marliana Lara
79791a4fbc Remove ng-class-odd and ng-class-even directives 2017-04-25 16:22:18 -04:00
Matthew Jones
52fa9410f2 Merge pull request #6084 from cchurch/paginate_this 
Add custom paginator to avoid separate COUNT(*) query
 2017-04-25 16:05:48 -04:00
Marliana Lara
59ff065a65 fixes #3636 2017-04-25 15:54:07 -04:00
Ryan Petrello
9a4b972bab Merge pull request #6102 from ryanpetrello/vault_migration 
properly migrate vault credentials to the new credentialtype model
 2017-04-25 15:35:16 -04:00
Aaron Tan
dd3e373c34 Merge pull request #6095 from jangsutsr/6066_allow_exception_view_to_accept_all_valid_http_methods 
Allow exception view to accept all valid HTTP methods.
 2017-04-25 15:11:14 -04:00
Ryan Petrello
c0add33212 properly migrate vault credentials to the new credentialtype model 2017-04-25 15:03:16 -04:00
Jared Tabor
76e21e3d38 Merge pull request #6100 from jaredevantabor/ldap-user-group-search 
removing UI parsing for LDAP User and Group Search fields
 2017-04-25 10:55:15 -07:00
jaredevantabor
86ae3082a4 removing UI parsing for LDAP User and Group Search fields 
the UI parsing was formatting the user input in a way that
makes the API angry
 2017-04-25 10:37:45 -07:00
Aaron Tan
48934461c4 Merge pull request #5783 from jangsutsr/5718_enable_udp_communication_to_log_aggregators 
Enable TCP/UDP communication to log aggregators
 2017-04-25 13:37:23 -04:00
Aaron Tan
381b47201b Allow exception view to accept all valid HTTP methods. 2017-04-25 13:35:21 -04:00
Bill Nottingham
293648590a Merge pull request #6086 from wenottingham/release_3.1.3 
Fix up backup/restore role broken in 57e7ec
 2017-04-25 11:37:21 -04:00
Aaron Tan
8d2ee8c30f Refactor log handler and support TCP/UDP communications 2017-04-25 11:07:57 -04:00
Chris Meyers
1f99a0df85 Merge pull request #6098 from chrismeyersfsu/fix-facts_query_performance 
coarse json queries to use gin index
 2017-04-25 10:58:09 -04:00
Ryan Petrello
7037daa799 Merge pull request #6096 from ryanpetrello/api_new_in_v2 
refactor API v2 version detection
 2017-04-25 10:48:00 -04:00
Ryan Petrello
f0f859f553 Merge pull request #6088 from ryanpetrello/v1_custom_credentials 
for /api/v1/ requests, filter out v2 (custom) credentials
 2017-04-25 10:30:02 -04:00
Ryan Petrello
12f244495c Merge pull request #6089 from ryanpetrello/credential_type_injectors 
Implement custom credential type injectors
 2017-04-25 10:27:00 -04:00
Chris Meyers
d69ae2cc92 coarse json queries to use gin index 2017-04-25 10:21:22 -04:00
Alan Rominger
e1a96092fc Merge pull request #6094 from ansible/AlanCoding-patch-2-1 
Fix 500 error in ProjectScmInventorySources
 2017-04-25 10:10:48 -04:00
Aaron Tan
113a352af3 Merge pull request #6097 from jangsutsr/6066_restore_ability_of_parsing_extra_var_strings_for_provisioning_callback 
Restore ability of parsing extra var strings for provisioning callback
 2017-04-25 09:42:29 -04:00
Ryan Petrello
80df1523b0 refactor API v2 version detection and feature inclusion 2017-04-25 09:35:03 -04:00
Aaron Tan
3a81ca0dce Restore ability of parsing extra_vars string for provisioning callback. 2017-04-24 17:43:20 -04:00
Alan Rominger
34b697ce17 Fix 500 error in ProjectScmInventorySources 2017-04-24 16:54:17 -04:00
Ryan Petrello
83dc4f6757 for /api/v1/ requests, filter out v2 (custom) credentials 
see: #5877
 2017-04-24 15:21:30 -04:00
Ryan Petrello
aff25c914e blacklist special env vars from being used in CredentialType injectors 
see: #5877
 2017-04-24 15:03:50 -04:00
Ryan Petrello
a36a53fe40 implement CredentialType env, file, and extra_vars injectors 
see: #5877
 2017-04-24 15:03:33 -04:00
Ryan Petrello
e65ef35acf Merge pull request #6001 from ryanpetrello/new_credential_model 
Introduce a new CredentialTemplate model
 2017-04-24 14:54:27 -04:00