External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 03:10:42 -03:30
Code Issues Packages Projects Releases Wiki Activity
7,999 Commits 54 Branches 19 Tags
Commit Graph

7999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III
587b243ebb Merge pull request #2340 from wwitzel3/issue-2186 
fixes access issue for InventoryScript.admin_role
 2016-06-10 14:11:22 -07:00
Wayne Witzel III
ca0f533b82 fixes access issue for InventoryScript.admin_role 2016-06-10 16:33:02 -04:00
Matthew Jones
753b338205 Make sure project team list is filtered for access 2016-06-10 15:10:37 -04:00
Matthew Jones
b612f65479 Fix up the project teams list 
This was still referencing the old mechanism for pulling associative
information.  This updates it to query against the new role system
 2016-06-10 15:06:14 -04:00
Wayne Witzel III
0f59314116 Merge pull request #2329 from wwitzel3/issue-2269 
Add Organization FK to Credential
 2016-06-10 11:32:24 -07:00
Wayne Witzel III
358998c4b4 fix api test 2016-06-10 14:17:48 -04:00
Akita Noek
a92056dfa4 Merge pull request #2322 from anoek/2135 
Attach labels instead of erroring on creation if label already exists
 2016-06-10 14:06:37 -04:00
Wayne Witzel III
e243c8319d fix tests with refreshes 2016-06-10 13:41:22 -04:00
Wayne Witzel III
5754b4bb2c adjusting Credential model and migrations 2016-06-10 13:23:32 -04:00
Wayne Witzel III
2c05df064b adjusting API for new Credential.organization 2016-06-10 13:23:02 -04:00
Graham Mainwaring
ac8b8dbfb6 Fix Openstack inventory on Ubuntu 12 (#2318) 
* Update setuptools and pip when creating venvs
 2016-06-10 09:21:41 -07:00
Akita Noek
175c010296 Attach labels instead of erroring on creation if label already exists 
If a label already exists, don't error out when trying to post to the
job_templates/n/labels endpoint, instad just lookup the ID and attach
it. This is primarily to benefit the UI, but in general seems like a
good behavior for this endpoint anyways.

 Fixes #2135
 2016-06-10 11:56:19 -04:00
James Laska
8aa14af228 Fix system-tracking typo 2016-06-10 11:42:34 -04:00
Alan Rominger
74b6ea82fb Merge pull request #2315 from AlanCoding/fix_test_rbac_api 
update test_rbac_api to new object_roles naming
 2016-06-10 10:58:21 -04:00
Alan Rominger
41e231852a Merge pull request #2313 from wwitzel3/release_3.0.0 
Fixing Credential access issue
 2016-06-10 10:51:05 -04:00
AlanCoding
996b75b978 update test_rbac_api to new object_roles naming 2016-06-10 10:48:34 -04:00
Wayne Witzel III
3cf4d1feb8 Fixing Credential access issue 2016-06-10 10:30:22 -04:00
Matthew Jones
f545640f58 Fix an issue calling build_env for system jobs 2016-06-10 10:21:36 -04:00
Leigh
902787b63b remove dead fields from Groups > Add manual source type, resovles #2288 (#2305) 2016-06-10 10:09:47 -04:00
Leigh
47a81e63f5 fixes regression on license expiresOn display, resolves #2277 (#2287) 2016-06-10 10:09:32 -04:00
Leigh
3113ae584d fix edit action in Jobs > Schedules tab view, resolves #2258 (#2292) 2016-06-10 10:08:55 -04:00
Akita Noek
67cfc35c79 Merge pull request #2294 from anoek/2263 
Fixed permissions dialog not opening on job template page
 2016-06-10 09:41:31 -04:00
Michael Abashian
e9b14eff45 Merge branch 'mabashian-management-jobs-schedule-edit' into release_3.0.0 2016-06-10 09:31:26 -04:00
Michael Abashian
b0ccd4c815 Merge branch 'management-jobs-schedule-edit' of https://github.com/mabashian/ansible-tower into mabashian-management-jobs-schedule-edit 
# Conflicts:
#	awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
 2016-06-10 09:30:56 -04:00
Michael Abashian
bdafd78c07 Merge pull request #2306 from mabashian/add-permission-wrong-user 
Add permissions checkbox fixes
 2016-06-10 09:22:45 -04:00
Michael Abashian
7ef4ecc062 Merge pull request #2273 from mabashian/job-list-resize-search 
Removed the resize logic from the jobs list
 2016-06-09 17:57:48 -04:00
Michael Abashian
099d618d85 Merge pull request #2257 from mabashian/scheduler-nan 
Fixed aN/aN/NaN string error on JT schedule add
 2016-06-09 17:57:35 -04:00
Michael Abashian
f0d1c91cf1 Merge pull request #2283 from mabashian/job-launch-redirect 
Redirect after job launch
 2016-06-09 17:57:24 -04:00
Michael Abashian
086fffe98c Fixed several bugs with adding permissions where checkboxes weren't checked properly or were disappearing when paging was involved. 2016-06-09 17:46:28 -04:00
Chris Meyers
6fb82c0dbd Merge pull request #2297 from chrismeyersfsu/fix-installer_anible_1_9_default_bug 
specify playbook vars in a way that works with 1.9
 2016-06-09 16:50:50 -04:00
Matthew Jones
c124aeaf14 Change ldap and other sso defaults to remove from team/admin 
Previously the default was not to remove an sso user from a team or as
an admin if they were removed from the SSO service.  This changes that
and updates some readme-type lines.
 2016-06-09 16:02:29 -04:00
Akita Noek
3becfeaaa8 Fixed permissions dialog not opening on job template page 
#2263
 2016-06-09 16:01:10 -04:00
kensible
5a145ddd47 Merge pull request #2279 from kensible/2008-apiColors 
QA feedback, button color changes
 2016-06-09 15:04:08 -04:00
Wayne Witzel III
73acf006cf Merge pull request #2282 from wwitzel3/cred-owners 
add credential owner endpoints
 2016-06-09 12:01:09 -07:00
Wayne Witzel III
698085353b addressing review comments 2016-06-09 14:47:54 -04:00
Wayne Witzel III
ccc510110d add credential owner endpoints 2016-06-09 14:41:35 -04:00
Matthew Jones
3cb8c26381 Force rackspace inventory to not verify ssl 2016-06-09 14:41:19 -04:00
Leigh
d95a43ae82 fix base path name for inventory sync schedules > add, resolves #2260 (#2281) 2016-06-09 14:30:33 -04:00
Alan Rominger
d55bff4c10 Merge pull request #2197 from AlanCoding/2141_survey_passwords 
Hide passwords in job_args and activity stream
 2016-06-09 14:28:36 -04:00
Michael Abashian
1e42211b62 Check the launch response for specific attributes which indicate which type of job it is and route the user to the appropriate stdout/detail page. 2016-06-09 14:23:59 -04:00
Matthew Jones
ebbadbf8da Upgrade python-saml for security issue 2016-06-09 14:23:10 -04:00
Matthew Jones
ad0915a6d0 Add libcloud dependency to tower venv 2016-06-09 14:20:34 -04:00
Jared Tabor
c64d0f0748 Merge pull request #2280 from jaredevantabor/session 
Loading the viewport after /config response is returned from the API
 2016-06-09 10:56:30 -07:00
Jared Tabor
70318f23cb Loading the viewport after /config response is returned from the API 2016-06-09 10:24:58 -07:00
Akita Noek
9580a7322f Merge pull request #2230 from anoek/1752 
Added CodeMirror for notification http headers field
 2016-06-09 13:20:35 -04:00
Akita Noek
d6b0a08f32 Merge pull request #2265 from anoek/2076 
Display error when trying to delete a job you don't have access to
 2016-06-09 13:20:11 -04:00
Ken Hoes
70ede54c2f QA feedback, button color changes 2016-06-09 13:04:07 -04:00
Leigh
4d826c2b41 remove padding when no host summary results are visible, use @default-interface-txt, resolves #2045 (#2235) 2016-06-09 12:36:26 -04:00
Akita Noek
dd9351b226 jshint 2016-06-09 12:25:39 -04:00
Akita Noek
59c169ff27 Merge pull request #2262 from anoek/2028 
Fix stdout height issue on firefox
 2016-06-09 12:21:25 -04:00