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
8,051 Commits 54 Branches 19 Tags
Commit Graph

8051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III
8a2c8d59a5 Merge pull request #2388 from wwitzel3/test-refactoring 
More testing clean up
 2016-06-14 13:44:53 -04:00
Wayne Witzel III
6013a853f5 Merge pull request #2387 from wwitzel3/issue-2316 
remove User.object_roles endpoint and discovery
 2016-06-14 13:43:58 -04:00
Michael Abashian
a592cb53f2 Merge branch 'mabashian-remove-scan-job-templates-inv-edit' into release_3.0.0 2016-06-14 11:49:07 -04:00
Michael Abashian
ceef22dae6 Merge branch 'remove-scan-job-templates-inv-edit' of https://github.com/mabashian/ansible-tower into mabashian-remove-scan-job-templates-inv-edit 
# Conflicts:
#	awx/ui/client/src/system-tracking/system-tracking.partial.html
 2016-06-14 11:48:25 -04:00
Wayne Witzel III
1b37818eba removing old, duplicated tests 2016-06-14 11:45:34 -04:00
Wayne Witzel III
203ebd20e8 remove the User.object_roles view 2016-06-14 11:42:23 -04:00
Wayne Witzel III
a47f47b790 remove URL and related mapping for User.object_roles 2016-06-14 11:42:08 -04:00
Alan Rominger
0583a7c435 Merge pull request #2353 from AlanCoding/2226_user_roles_access 
Fixes for role assignment permissions
 2016-06-14 11:25:33 -04:00
Leigh
3c887768c1 fix azure regions multiselect, resolves #2289 (#2330) 2016-06-14 11:18:39 -04:00
Graham Mainwaring
387a487325 Merge pull request #2365 from ghjm/preflight_passwords 
Add preflight check that password is set on fresh install
 2016-06-14 10:56:35 -04:00
Michael Abashian
b9c2567cf7 Merge pull request #2311 from mabashian/search-close-dropdown 
Hide search dropdown after selection
 2016-06-14 10:31:54 -04:00
Ken Hoes
c0a2955b7e Changed no module data message in system tracking 2016-06-14 10:28:45 -04:00
Wayne Witzel III
b24ad639bf Merge pull request #2354 from wwitzel3/issue-2124 
anyone with read_role should be able to view /update
 2016-06-14 10:16:19 -04:00
Wayne Witzel III
db7cfb23f8 added False return for permission check 2016-06-14 09:53:07 -04:00
kensible
9f39477724 Merge pull request #2362 from kensible/2321-audit 
UI Audit updates
 2016-06-14 07:49:20 -04:00
Jared Tabor
4743723ec0 Merge pull request #2375 from jaredevantabor/license-validity 
updating license page for license that exists, but is not valid
 2016-06-13 16:20:38 -07:00
Jared Tabor
a5634b24a7 updating license page for license that exists, but is not valid 2016-06-13 14:05:12 -07:00
Bill Nottingham
37b3ed8c3e Merge pull request #2337 from wenottingham/pop-pop 
Assorted popover/inline help fixes.
 2016-06-13 16:37:19 -04:00
Michael Abashian
e23ae8fbff Merge pull request #2334 from mabashian/labels-uppercase 
Removed text-transform: uppercase from search tags and labels
 2016-06-13 16:26:35 -04:00
Michael Abashian
99ea3c63fb Merge pull request #2317 from mabashian/sort-search-results 
Sort tagsearch results
 2016-06-13 16:25:30 -04:00
Michael Abashian
9ad5810140 Have to pass the $event in order to stop bubbling 2016-06-13 16:23:23 -04:00
Graham Mainwaring
850455efe0 Merge pull request #2356 from ghjm/el6_tower_bundle 
Build EL6 bundle correctly for SCL
 2016-06-13 14:31:56 -04:00
AlanCoding
9d86fb0a09 change wording to reflect team sublist endpoint 2016-06-13 14:11:02 -04:00
Shane McDonald
1df83e8853 Align logo in API browser 
By default, bootstrap pads the “navbar-brand” element with 15px, and sets margin-left to -15px. Since we had removed all the padding, it meant that the logo was -15px to the left of the main page margin.
 2016-06-13 14:08:39 -04:00
Ken Hoes
d1a8b6493c UI Audit updates 2016-06-13 13:08:42 -04:00
Matthew Jones
9e56913893 Capture some change info in activity stream for associate/disassociate events 2016-06-13 12:41:50 -04:00
AlanCoding
c631761091 check team permissions if attaching user roles 2016-06-13 12:34:10 -04:00
Wayne Witzel III
568de86423 anyone with read_role should be able to view the can_update flag for a project 2016-06-13 12:07:39 -04:00
Matthew Jones
4d52d0748f Include core ec2 fix for tag sync limit 2016-06-13 11:24:47 -04:00
AlanCoding
b485b85076 TeamRolesList permission tests and fix, organize tests 2016-06-13 11:09:48 -04:00
Alan Rominger
ec154765d2 Merge pull request #2303 from AlanCoding/1958_jt_access 
Job Template can_add updates
 2016-06-13 11:04:48 -04:00
Wayne Witzel III
74518379c6 Merge pull request #2344 from wwitzel3/issue-2327 
fix issue with Team.roles and ActivityStream
 2016-06-13 07:05:53 -07:00
Wayne Witzel III
019c5bac04 fix tests to be more specific about AS query 2016-06-13 09:39:52 -04:00
AlanCoding
7f38227e11 fix bug in RoleTeamsList 2016-06-11 18:04:05 -04:00
Leigh
dc3d1e7e7a Inventory Manage > copy/move groups disable copy option where impossible, add to Root Group target, resolves #1749 (#2218) 2016-06-10 18:36:53 -04:00
Wayne Witzel III
db16478830 only special case team when sender is Role_parents 2016-06-10 17:27:11 -04:00
AlanCoding
3e97bdae7f add reverse attach access checks pointing toward roles 2016-06-10 17:12:26 -04:00
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
00698b82fc fix issue with Team.roles and ActivityStream 2016-06-10 17:03:55 -04:00
Wayne Witzel III
ca0f533b82 fixes access issue for InventoryScript.admin_role 2016-06-10 16:33:02 -04:00
Bill Nottingham
cb80702e4a Add examples for HipChat 'color' field. 
re: #2271
 2016-06-10 15:54:47 -04:00
Bill Nottingham
9a1bcb3384 Update Credential popover help for network credentials, add some more verbiage to the 'Other' section. 
re: #2252
 2016-06-10 15:49:01 -04:00
Bill Nottingham
bcdc17dc06 Drop key hints, as they are redundant with the popovers. 
re: #2249
 2016-06-10 15:40:53 -04:00
Bill Nottingham
2068665c4e Fix Twilio popover help. 
re: #2272
 2016-06-10 15:35:35 -04:00
Matthew Jones
753b338205 Make sure project team list is filtered for access 2016-06-10 15:10:37 -04:00
Michael Abashian
e18e5e6044 Removed text-transform: uppercase from search tags and labels 2016-06-10 15:07:46 -04:00
Bill Nottingham
6a0ef366f3 Tweak wording on custom inventory script Environment variables popover to describe environment vars. 
Also use the standard JSON/YAML verbiage (this should be a constant somewhere).

re: #2290
 2016-06-10 15:06:58 -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
Bill Nottingham
5fea282954 Add 'Tag None' help to AWS 'Only Group By' popover. 
re: #2291
 2016-06-10 14:51:51 -04:00
Bill Nottingham
d136ee8f26 Standardize <code></code> around 'ansible-playbook' and arguments. 2016-06-10 14:49:10 -04:00