External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-27 00:21:30 -03:30
Code Issues Packages Projects Releases Wiki Activity
12,630 Commits 55 Branches 19 Tags
Commit Graph

12630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Meyers
5a7b78220d pin twisted and asgiref for asgi-amqp 
* asgi-amqp translation layer needs a specific version of channels which
requires a specific version of daphne and all of the fall out.
 2017-04-19 13:56:36 -04:00
Shane McDonald
9831c4551d Merge pull request #6057 from shanemcd/external-db-restore 
Fix external database restores
 2017-04-19 10:09:46 -04:00
Jared Tabor
5b20b0a02f Merge pull request #6048 from jaredevantabor/adhoc-modules 
CTiT -> adhoc modules should allow the user to add new modules
 2017-04-18 15:46:18 -07:00
Greg Considine
c8394bbca3 Merge pull request #6050 from gconsidine/fix/dropdown-text-truncation 
Add dropdown li truncation with ellipsis
 2017-04-18 15:23:06 -04:00
Michael Abashian
58cc33481e Merge pull request #6000 from mabashian/5926-survey-password-minlength 
Fixed min/max length survey password bug
 2017-04-18 14:09:08 -04:00
jlmitch5
9b3036f150 Merge pull request #6051 from jlmitch5/fixCappedLines 
don't display chunked lines'
 2017-04-18 13:46:32 -04:00
Greg Considine
820bc6f630 Merge pull request #6035 from gconsidine/fix/permission-mod-basic-license 
Fix permission modal in team settings
 2017-04-18 13:32:02 -04:00
John Mitchell
ea0f7ad0de don't display chunked lines' 2017-04-18 12:56:22 -04:00
Chris Meyers
8c8ccba5a5 add mock to ansible dev env requirements 2017-04-18 12:31:05 -04:00
gconsidine
da0a721a2d Add dropdown li truncation with ellipsis 
Display the full text on hover by expanding the list item
container.
 2017-04-18 12:07:18 -04:00
Chris Meyers
a64f8a7660 Merge pull request #6045 from chrismeyersfsu/fix-hosts_list 
return count, results, next, prev
 2017-04-18 09:08:05 -04:00
jaredevantabor
90a45c8fc3 CTiT -> adhoc modules should allow the user to add new modules 
the adhoc module field was not setup to allow users to input
additional options.
 2017-04-17 15:48:41 -07:00
Shane McDonald
7de092ff37 Merge pull request #6044 from shanemcd/awx-user-supervisorctl 
Give awx ownership of supervisor.sock
 2017-04-17 17:31:55 -04:00
Alan Rominger
31c18f2e16 Merge pull request #6039 from AlanCoding/log_certs 
Setting for external logging cert verification
 2017-04-17 16:59:33 -04:00
Chris Meyers
70a8ccef0f return count, results, next, prev 
* This returns /api/vx/hosts/ to having all the nice response items like
count, results, next, prev. I had "chopped" that off by explicitly only
returning result.
 2017-04-17 16:43:29 -04:00
Greg Considine
52afc377cd Merge pull request #6038 from gconsidine/uxi/improvements 
Fix layout/padding and font sizing
 2017-04-17 16:40:14 -04:00
Alan Rominger
1011e54689 Merge pull request #5985 from AlanCoding/scm_inv5 
SCM file-based inventory sources
 2017-04-17 16:22:24 -04:00
Alan Rominger
6ff6948688 Merge pull request #6043 from AlanCoding/v1_group_fixes 
Group V1 serializer fixes from QE feedback
 2017-04-17 15:44:35 -04:00
AlanCoding
6d92c56da5 SCM Inventory model, view, and task system changes 
Inventory source file-type combined with a linked project
will allow the inventory source to be updated when the
project is updated. The inventory update runs in the
post-run hook of the project update.
 2017-04-17 15:01:19 -04:00
Chris Meyers
2c34aef661 Merge pull request #6041 from chrismeyersfsu/feature-jsonsearch 
remove facts_latest in favor of ansible_facts
 2017-04-17 14:52:02 -04:00
AlanCoding
3af0f505d8 Setting for external log emissions cert verification 
Stopgap solution for issue for 3.1.3 where Splunk servers with a
self-signed certificate could not receive logs from Tower.
Users should set `LOG_AGGREGATOR_VERIFY_CERT = False` in settings
to use this.
 2017-04-17 14:50:01 -04:00
AlanCoding
29de1056e7 Group V1 serializer fixes from QE feedback 
Straightforward bug fixes and edits to be more consistent with
the 3.1 v1 API structure
 - remove `inventory_source` as a field from group
 - add inventory source as a group summary field
 - fix user_capabilities bug for group start permission
 - fix 500 error on /inventory_sources/N/update/
 2017-04-17 14:43:17 -04:00
Chris Meyers
55268a8ff0 remove facts_latest in favor of ansible_facts 
* Closer align our facts data structure with ansible facts data
structure for purposes of ... wait for it ... 2-way fact caching
 2017-04-17 14:27:33 -04:00
Chris Meyers
42a4bfa926 Merge pull request #5944 from chrismeyersfsu/improvement-pyparsing 
add pyparsing a top level dep and fix other deps
 2017-04-17 14:26:31 -04:00
gconsidine
7f84a58bd2 Fix layout/padding and font sizing 2017-04-17 13:48:47 -04:00
Chris Meyers
880f4a77a4 Merge pull request #6036 from chrismeyersfsu/fix-hosts_v2 
run host listing through v1 vs. v2 logic
 2017-04-17 12:12:24 -04:00
Chris Meyers
775093294e run host listing through v1 vs. v2 logic 
* api/v1/hosts related fields were getting v2 in the related urls. The
context is now included in the serializer instantiation.
 2017-04-17 11:43:44 -04:00
Alan Rominger
14a03d2cb5 Merge pull request #6029 from AlanCoding/group_v1 
Group serializer special v1 functionality
 2017-04-17 11:37:26 -04:00
gconsidine
6c06344fdb Fix permission modal in team settings 
A GET request is made to check permissions on job templates, workflow
templates, inventories, etc. With a basic license, the workflow
template request returns a 402. The logic in place accounted for
500-ish errors and 200s. Now if a 402 response is returned, it's
excluded from the UI without affecting the other successful responses.
 2017-04-17 11:22:03 -04:00
Aaron Tan
30193ffea5 Merge pull request #5970 from jangsutsr/5628_update_ctit_serializer_fields_to_handle_html_cornercase 
Update CTinT serializer integer field to handle html cornercase
 2017-04-17 11:21:02 -04:00
Alan Rominger
6d17158b34 Merge pull request #5973 from AlanCoding/survey_choices_string 
When survey choices are strings, don't just check "X in choices"
 2017-04-17 11:05:50 -04:00
AlanCoding
7223177684 Group serializer special v1 functionality 
Returns a related `inventory_source` and related link for groups
if accessed from /api/v1/, but not for API v2.
Also inserts corresponding fields to inventory source serializer.
Keep migrated manual sources and auto-create in API v1.
 2017-04-17 10:30:07 -04:00
Chris Meyers
4b537870b4 Merge pull request #6030 from chrismeyersfsu/fix-6016 
add json a=null support and still support a="null"
 2017-04-16 21:09:58 -04:00
Chris Meyers
5ff4966526 add json a=null support and still support a="null" 
related to #6016
 2017-04-13 16:26:35 -04:00
Chris Meyers
f20bf127b4 Merge pull request #6028 from chrismeyersfsu/fix-multiple_and_or 
support > 2 sequential and, also or
 2017-04-13 13:48:45 -04:00
Chris Meyers
040f9dd545 support > 2 sequential and, also or 
* Fixed a bug in the fact search language parser where it would not loop
over all the <and, or> operations. The result, we can support (a=b or
a=c or a=d) also support (a=b and b=b and c=b)
 2017-04-13 13:36:38 -04:00
Alan Rominger
7dd69a36d8 Merge pull request #6017 from AlanCoding/supervisor_verbosity 
Add supervisorctl logs
 2017-04-13 11:07:41 -04:00
Alan Rominger
4c5222b16b Merge pull request #6007 from AlanCoding/inv_src_changelog 
Add removal of inventory_source link to CHANGELOG
 2017-04-13 10:58:11 -04:00
Chris Meyers
56442b2364 Merge pull request #6014 from chrismeyersfsu/improvement-graceful_query_fail 
400 on invalid host filter query instead of 500
 2017-04-13 10:52:24 -04:00
Chris Meyers
23ce5ab9de fix up test 2017-04-13 10:44:28 -04:00
Aaron Tan
250ffca3ea Merge pull request #5920 from jangsutsr/5762_tacacsplus_auth_backend 
A working TACACS+ backend and related CTiT settings
 2017-04-13 10:42:25 -04:00
Chris Meyers
bd1f8b088f 400 on invalid host filter query instead of 500 2017-04-13 09:40:11 -04:00
AlanCoding
6f0a8949a6 Add supervisorctl logs 
In some systems, the tower service process may not have sufficient
permissions to communicate with the supervisorctl socket, in which
case an automated restart will not be possible.
 2017-04-12 16:46:58 -04:00
Aaron Tan
07198a5ba6 Acceptance Docs. 2017-04-12 16:19:42 -04:00
Aaron Tan
fd4aaa6ca9 Implement tacacs+ auth backend. 2017-04-12 16:19:42 -04:00
Aaron Tan
f2c99eeaf5 Basic tacacs+ CTiT. 2017-04-12 16:19:42 -04:00
Aaron Tan
84c6d41bd4 Merge pull request #6013 from ryanpetrello/tacacs_requirements 
add tacacs_plus package as a dependency
 2017-04-12 15:44:40 -04:00
Ryan Petrello
9f46b3c704 add tacacs_plus package as a dependency 2017-04-12 15:39:11 -04:00
Chris Meyers
1a2cbaf5e1 flake8 fix 2017-04-12 15:35:42 -04:00
Chris Meyers
a2b37aa7e6 add not logic to json search 
* Also fix up single contains [] logic. Values with a single contains
should be wrapped in [] and not, like I thought before, \"\"
 2017-04-12 15:11:36 -04:00