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

12572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III
633b27b66b add test for CustomInventoryScript serializer 2016-07-25 17:39:19 -04:00
Michael Abashian
48b31079af Fixed bug where hitting enter in a password field in the job launch/survey maker modal would toggle the show/hide. 2016-07-25 17:39:19 -04:00
AlanCoding
2d2b426374 add read_role to organization select_related 2016-07-25 17:39:19 -04:00
Wayne Witzel III
a801ee7d52 ensure system admin/auditor can see orphan inventory scripts 2016-07-25 17:39:19 -04:00
Michael Abashian
f0bfcd78d9 Merge pull request #3104 from mabashian/2299-completed-jobs-search 
Completed Jobs search filters
 2016-07-25 17:28:49 -04:00
James Laska
13bd9211ae Add copyright back with utf-8 encoding 
Fixes encoding exception
 2016-07-25 15:18:10 -04:00
James Laska
11d68d1ebe Complete Sat6 integration 
Various fixes to get sat-6 integration working.

* inventory_import.py - the inventory script is called foreman.py
* tasks.py - be sure to call `add_section()` before using it
* defaults.py - Add various SATELLITE6_* enablement variables

Relates #3119
 2016-07-25 15:13:39 -04:00
Matthew Jones
60e012f75b Force requests to emit application/json 
When sending webhook notifications
 2016-07-25 12:46:12 -04:00
Graham Mainwaring
30ed7b487b Merge pull request #3112 from ghjm/scl_install_rhel_rhsm 
Enable software collections repo on RHEL 6 + RHSM
 2016-07-25 12:22:35 -04:00
James Laska
f1c4a919bc Merge pull request #3117 from wwitzel3/3.0.1 
fix issue with rbac_migrations logger
 2016-07-25 12:15:53 -04:00
jlmitch5
e66a1606db Merge pull request #3102 from jlmitch5/fixWrapping 
fix wrapping of name columns
 2016-07-25 11:38:29 -04:00
Wayne Witzel III
81c4a82db8 fix issue with rbac_migrations logger 2016-07-25 11:22:50 -04:00
Alan Rominger
f5fa53d89a Merge pull request #3098 from AlanCoding/3033_AS_updates 
Reorganize activity stream access around org admin/auditors (3.0.2)
 2016-07-25 11:04:05 -04:00
Ken Hoes
f28e0fdc45 Removed bottom border radius from open select2 dropdown 2016-07-25 10:16:59 -04:00
Akita Noek
eeaa325b10 Merge pull request #3108 from anoek/3107 
Fixed credential migration issue involving null inventory fields in job templates
 2016-07-25 09:43:58 -04:00
Akita Noek
94052c2b2b Fixed credential migration issue involving null inventory fields in job templates 
Don't attempt to derive credential organization information from a job
template when the inventory field is null for that job template

 #3107
 2016-07-22 16:44:00 -04:00
John Mitchell
abd606e2c8 fixed word wrapping 2016-07-22 16:32:11 -04:00
Alan Rominger
4b3f1d44de Merge pull request #3105 from AlanCoding/new_job_cancel 
Fixes for "new" job things in 3.0.1
 2016-07-22 16:13:39 -04:00
AlanCoding
94c8dfd506 Allow instant cancel for new jobs 2016-07-22 15:49:24 -04:00
AlanCoding
4bea2aa627 Show new jobs in UI Jobs tab 2016-07-22 15:48:37 -04:00
Chris Meyers
7c16c8c6e7 Merge pull request #3103 from chrismeyersfsu/fix-travis_network_cred_test 
fixes network cred failure in travis
 2016-07-22 15:47:54 -04:00
Michael Abashian
b1b9767a95 Made type and name not searchable on the job templates completed jobs list 2016-07-22 15:45:31 -04:00
Chris Meyers
c7524892c0 fixes network cred failure in travis 2016-07-22 15:36:08 -04:00
Michael Abashian
6edc3abce2 Merge pull request #3094 from mabashian/2935-backspace-inv-cred-jt 
awlookup timeout instead of GET with every keystroke
 2016-07-22 15:11:45 -04:00
Chris Meyers
564aa86bd5 Merge pull request #3101 from chrismeyersfsu/fix-fact_version_get_param_ordering 
fix travis
 2016-07-22 15:08:03 -04:00
John Mitchell
03204f8dc0 fixed merge conflict 2016-07-22 15:01:58 -04:00
John Mitchell
22a96240a3 fix wrapping of name columns 2016-07-22 14:37:16 -04:00
Chris Meyers
37ddf2a4d9 fix unit test on travis 2016-07-22 14:00:28 -04:00
James Laska
2a791b8e90 Merge pull request #3099 from jlaska/tox 
Add travis-ci integration using tox
 2016-07-22 13:56:26 -04:00
James Laska
1f9df1fdf3 Default to not running old tests 2016-07-22 13:19:57 -04:00
James Laska
77202ec696 Only run unit and function tests 2016-07-22 13:19:57 -04:00
James Laska
29778538c3 Be sure to install ansible 
Enable the mongodb travis service too
 2016-07-22 13:19:57 -04:00
James Laska
6140c8c500 Additional travis/tox tweaks 
* Enable travis caching
* Disable coverage after_build
* Call setup.py develop first
* Include pytest config and enable skipsdist
 2016-07-22 13:19:57 -04:00
Shane McDonald
5c516b60b3 ¯\_(ツ)_/¯ 
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
 2016-07-22 13:19:57 -04:00
James Laska
f3c186310b First pass at getting tox and travis working 2016-07-22 13:19:57 -04:00
Chris Meyers
a1b29d8f4b Merge pull request #3087 from chrismeyersfsu/fix-migration_log 
log migration to standard tower log dir
 2016-07-22 13:10:42 -04:00
Chris Meyers
e5b031e533 use existing logging infrastructure 2016-07-22 12:52:25 -04:00
AlanCoding
6fee46fb66 Reorganize activity stream around org admin/auditors 2016-07-22 12:50:14 -04:00
Chris Meyers
b6ff1d8c21 Merge pull request #3092 from chrismeyersfsu/remove-label_cleanup_job 
forgot to remove label cleanup periodic task
 2016-07-22 12:20:27 -04:00
Chris Meyers
6ea24dea34 Merge pull request #3091 from chrismeyersfsu/fix-#2847 
Always create fact cleanup job
 2016-07-22 12:14:20 -04:00
Chris Meyers
32229e1af8 Merge pull request #3080 from chrismeyersfsu/fix-superuser_license_host_add 
check license permission on host create
 2016-07-22 11:47:41 -04:00
Michael Abashian
6da3ac0cc1 Improvements to awlookup directive to prevent making rest calls every time a character is added/removed 2016-07-22 11:39:21 -04:00
Akita Noek
50ada022b5 Merge pull request #3082 from anoek/3077 
Fixed the need for elevated permissions to make changes to job templates under some scenarios
 2016-07-22 10:55:51 -04:00
Chris Meyers
c42af3c61a forgot to remove label cleanup periodic task 2016-07-22 10:33:30 -04:00
Akita Noek
64d653bc61 Equate '' to None for foreign key references when PUTing to a job template 
The UI will sometimes send an empty string instead of null, we already
handle this in our serializer and treat it as null, so this change
brings our access system in line with the expectation that those two
things should be equal.

 Possibly related to #3077
 2016-07-22 10:11:33 -04:00
Chris Meyers
eb89cf98cc Always create fact cleanup job 2016-07-22 10:05:00 -04:00
Chris Meyers
811d6dfe3d add missed log and fix dev env 2016-07-22 10:04:02 -04:00
Michael Abashian
fde13c6a46 Prevent the page from reloading when an alert modal is open but not focused and the user hits enter 2016-07-22 09:55:14 -04:00
Akita Noek
2934cbbbae Allow users to post some ignored read only fields to job templates without elevated permissions 
Previously, posting these fields would cause us to check and see if the
user has not only admin access to the job template but use access on
anything used by the job template (because the fields wern't white
listed as being ok to modify without comprehensive use access). It's
convenient for the QA team to be allowed include these fields in PUT's,
and since they're ignored, this patch is fairly benign and shouldn't
alter any behavior.

 #3076
 2016-07-22 09:51:00 -04:00
Chris Meyers
fd098e64dc log migration to standard tower log dir 2016-07-22 09:29:07 -04:00