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

6201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek
5551ec29ec Merge pull request #1037 from anoek/rbac 
Merging devel into rbac
 2016-02-25 13:06:50 -05:00
Akita Noek
4724d0c067 Merge branch 'devel' into rbac 2016-02-25 13:05:59 -05:00
kensible
4f5d7d0015 Merge pull request #1004 from kensible/952-lookup-modal-styling 
Lookup modal styling to match given design
 2016-02-25 12:17:51 -05:00
kensible
2c6cf4c2fe Merge pull request #1041 from kensible/#957-subform-styling 
Create sub forms for dropdowns. Dropdowns affected: SCM source and credentials details.
 2016-02-25 12:17:29 -05:00
Ken Hoes
393db691ed Cleaned up indentation. 2016-02-25 12:15:07 -05:00
Ken Hoes
f8fe6d9ae4 Removed Alert dependency. 2016-02-25 12:12:28 -05:00
Leigh
0cab5ac2e2 Merge pull request #995 from leigh-johnson/MgmtJobsSchd 
Hook up Management Jobs to new Scheduler module
 2016-02-25 10:36:24 -05:00
Leigh
5d35563c92 Merge pull request #1005 from leigh-johnson/AdhocInvFOrm 
Moved adhoc form to inventoryManage view, fixed adhoc form's styles + undefined fields
 2016-02-25 10:23:24 -05:00
Leigh Johnson
a99e21521b force jenkins rebuild 2016-02-25 10:16:15 -05:00
Leigh Johnson
908bc92f94 more misc styles #951 #999 2016-02-25 09:58:35 -05:00
Leigh Johnson
28f693b7bd #951 #999 add missing dependency injection to unit test, fix misc styles 2016-02-25 09:43:20 -05:00
Ken Hoes
c69534de14 Attached sub form work to source control form in projects.js, added title plus some styling 
Added some breathing room at the bottom of the sub form
 2016-02-25 08:02:47 -05:00
Ken Hoes
3d858b68cd Moved LESS code around per comments. Modularized. Removed old lookup helper and references. 
Modularized Lookup, put in own folder, removed old Lookup.js
 2016-02-25 07:59:33 -05:00
Chris Church
460c7e852a Merge pull request #1038 from cchurch/no-more-500-errors 
API fixes for 500 errors
 2016-02-25 01:05:20 -05:00
Chris Church
a2595dcf12 API fixes for 500 errors. 2016-02-24 18:38:04 -05:00
Michael Abashian
040bcd3462 Merge pull request #1032 from mabashian/stdout-details-links 
Stdout details links
 2016-02-24 18:34:59 -05:00
Chris Church
5b89c5e126 Merge pull request #1016 from cchurch/fix-job-template-launch-fields 
Remove write-only fields from GET response for job template launch.
 2016-02-24 18:12:47 -05:00
Akita Noek
46e1839ab1 Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-02-24 16:14:41 -05:00
Akita Noek
e18592fa87 Merge branch 'devel' into rbac 2016-02-24 16:14:32 -05:00
Wayne Witzel III
9c363c85fc Merge pull request #1034 from wwitzel3/rbac 
Added RBAC sync for Organization.admins
 2016-02-24 15:11:10 -05:00
Wayne Witzel III
5eee8e3a84 Added RBAC sync for Organization.admins 2016-02-24 15:04:21 -05:00
Akita Noek
ced41c64de Merge pull request #1033 from wwitzel3/rbac 
Added UserResource
 2016-02-24 14:13:02 -05:00
Wayne Witzel III
180911dfa8 Added UserResource 2016-02-24 14:09:56 -05:00
Michael Abashian
8dbe24cb4f Merge pull request #1022 from mabashian/stdout-details-responsive 
Standard out details responsive strategy
 2016-02-24 13:38:42 -05:00
Michael Abashian
c65d795b3b Fixed this other /home/groups href by removing the extra slash 2016-02-24 13:37:27 -05:00
Michael Abashian
e8b890ac45 Fixed this /home/groups route. Having the extra slash before the query params was resulting in a redirect to the dashboard. 2016-02-24 13:28:46 -05:00
Michael Abashian
1de32b987f Added missing query parameters to /home/hosts and /home/groups 2016-02-24 13:23:04 -05:00
Chris Meyers
c2d2c57aad add newer version of proot 
Use proot version that is used in production (5.1.0). Solves the ansible-playbook 2.0 symlink issue we see in our container when launching jobs.
 2016-02-24 08:58:41 -05:00
Chris Meyers
62d0e8f6a5 Update Dockerfile 
Add dateutils python package for `private/license_writer.py` to succeed
 2016-02-24 08:52:16 -05:00
Michael Abashian
382368f8db Made standard out details responsive. Removed the /stdout on the end of some of the standard out routes. 2016-02-24 08:33:56 -05:00
Akita Noek
47dfc09cb2 Merge pull request #1017 from anoek/rbac 
Added 'resource_access_list' related field to resources
 2016-02-23 16:12:54 -05:00
Akita Noek
384b8b9542 Added 'resource_access_list' related field to resources 2016-02-23 16:11:34 -05:00
Akita Noek
dc8ec283d2 Merge pull request #1014 from anoek/rbac 
Added several related fields to the RBAC API
 2016-02-23 16:08:07 -05:00
Chris Church
90d1a3d020 Remove write-only fields from GET response for job template launch, update raw data form to show any fields/passwords needed to launch the job. 2016-02-23 14:04:30 -05:00
Chris Meyers
cad54a43a1 Merge pull request #1001 from chrismeyersfsu/fix-options_choices 
bring back meta choice options lost in upgrade
 2016-02-23 13:55:53 -05:00
Chris Meyers
61fd645d25 Revert "add error to requirements.txt for jenkins testing" 
This reverts commit b1543763a4c195c857ec82bda058e06a0becf816.
 2016-02-23 12:49:28 -05:00
Chris Meyers
3535cf3b08 add error to requirements.txt for jenkins testing 2016-02-23 12:35:54 -05:00
Chris Meyers
3013bcbebb remove duplicate shade 2016-02-23 12:27:51 -05:00
Chris Church
6f988452c3 Merge pull request #977 from cchurch/api-raw-data-form-fixes 
API Raw Data Form & Validation Fixes
 2016-02-23 12:23:14 -05:00
Chris Church
9f44888c00 Update existing settings migration with minor field change. 2016-02-23 12:15:39 -05:00
Chris Church
718f70af23 Merge pull request #987 from AlanCoding/conn_err 
Step 1 to allow jobs to run in dev server again
 2016-02-23 12:04:07 -05:00
Akita Noek
606501749c Added several related fields to the RBAC API 2016-02-23 11:49:53 -05:00
Chris Meyers
244d1ac73d keystone dep fix 2016-02-23 11:47:26 -05:00
Chris Meyers
1915347aff fix req 2016-02-23 10:32:39 -05:00
Wayne Witzel III
21482fc294 Merge pull request #1011 from anoek/rbac 
Initial RBAC API implementation
 2016-02-23 10:24:03 -05:00
Akita Noek
9be9cf9b72 Fixed RBAC migration tests considering new signal handlers that are a bit too helpful during testing 
We have some signal handlers now that perform work that do work
automatically that we want to explicitly test in our migration path, so
we have to undo some things in order to test the migration code.
 2016-02-22 16:50:13 -05:00
Akita Noek
73b2105a30 Switch to using const's for system admin / system auditor singleton names 2016-02-22 16:27:11 -05:00
Akita Noek
26dc430c59 Look for and report on transaction errors within our implicit RBAC fields 
When a transaction is in a failed state these fields will not be able to
create new role/resource entries. This check just makes it easier to see
what's going on and aids in debugging.
 2016-02-22 16:25:09 -05:00
Akita Noek
b08809f7cc Initial RBAC API implementation 2016-02-22 16:21:56 -05:00
Akita Noek
dce474ec5e get_absolute_url implemenation for Role 2016-02-22 14:55:32 -05:00