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

6266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek
ddbf4dff80 Merge pull request #1110 from anoek/rbac 
Role description fields and some api lock down
 2016-03-03 16:20:34 -05:00
Akita Noek
db6117a56d Added role description fields 
Completes #1096
 2016-03-03 16:19:10 -05:00
Akita Noek
048e65eab3 Add test to help detect incorrect role rebuilding 2016-03-03 13:54:45 -05:00
Akita Noek
c15d48a640 Locked down user/team role listing and role membership management api endpoints 2016-03-02 16:36:16 -05:00
Akita Noek
9699f34976 Made org admin role a parent of org member role so admins pick up everything members are granted 2016-03-02 09:44:55 -05:00
Akita Noek
f025b8412d Merge pull request #1085 from anoek/rbac 
Merging devel into rbac
 2016-03-02 09:04:25 -05:00
Akita Noek
444aed1ab2 Switch make init to use manage.py directly instead of awx-manage, saves from having to install in order to do an init 2016-03-01 15:37:00 -05:00
Akita Noek
3db13bc33c Updated fact tests to use the divergent group fixture 
A group fixture was created in different ways, one on devel and one on
rbac, this patch just normalizes to the one usage
 2016-03-01 15:34:26 -05:00
Akita Noek
2c690c82d9 Renamed rbac migrations to be after the notification and fact migrations 2016-03-01 15:34:06 -05:00
Akita Noek
c6c176cb5c Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-03-01 15:10:07 -05:00
Akita Noek
ea2cabe4d4 Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-03-01 15:09:58 -05:00
Matthew Jones
1f19c13ac9 Fix up a Notification unit test issue after the merge 2016-03-01 12:16:10 -05:00
Akita Noek
7b949b36ff Merge pull request #1083 from anoek/rbac 
Automatic RBAC hierarchy adjustment code for save/delete
 2016-03-01 11:49:01 -05:00
Chris Meyers
67d1aa6c86 migration with correct help_text 2016-03-01 10:39:51 -05:00
Graham Mainwaring
2f00260f47 Merge pull request #1076 from ghjm/ami_centos 
Update base AMI to use CentOS rather than Ubuntu
 2016-03-01 10:12:06 -05:00
Chris Meyers
b5d8aa52c9 get accepts data param, use it 2016-03-01 10:08:08 -05:00
Akita Noek
f5e311f5ac Undo some more automatic work that we're suppsoed to test with our migrations 2016-03-01 09:56:43 -05:00
Akita Noek
41c06dc2d0 Update user migration to not bomb out when a UserResource already exists for a user 2016-03-01 09:54:35 -05:00
Chris Meyers
5340af2335 updated api tests to use new get fixture format 2016-03-01 09:48:58 -05:00
Akita Noek
73dc061716 Patch up our credential migration tests to undo some automatic work that needs to be done in the migration 2016-03-01 09:47:26 -05:00
Chris Meyers
f6fa11e383 fix Fact migration 2016-03-01 09:16:48 -05:00
Chris Meyers
356b9c99b3 Merge branch 'mongoectomy_implementation' into devel 2016-03-01 08:22:40 -05:00
Matthew Jones
533c629040 Add irc requirements dependency 2016-02-29 23:50:16 -05:00
Akita Noek
e94d441fb0 Add support for following parental changes on save and delete in the RBAC system 2016-02-29 16:59:20 -05:00
Matthew Jones
99ec07b8a5 Merge branch 'notifications_work' into devel 
* notifications_work: (23 commits)
  Updates to notification unit tests after @wwitzel3's feedback
  Fix some notifications issues and write some tests
  Add notification system documentation
  Clean up flake8 related issues
  Fixing up some unicode issues
  Implement tower ui view url on models
  Sanity check and force proper types in admin check
  Proper type for in check
  Adding migration and base notification type
  Add a periodic administrative notification
  Refactor message generator
  Support notification password field encryption
  Notification configuration type checking
  Refactor NotificationTemplate to Notifier
  Implement irc notification backend
  Add webhook notification backend
  Pagerduty and Hipchat backends plus some cleanup
  Notification serializers, views, and tasks
  Implement notification serializer and validations
  Notification endpoints and url expositions
  ...
 2016-02-29 16:50:33 -05:00
Matthew Jones
b892ee5f96 Updates to notification unit tests after @wwitzel3's feedback 2016-02-29 13:25:49 -05:00
Matthew Jones
0ee12901fe Fix some notifications issues and write some tests 
* Fixes some notifier merging issues
* Fixes some more unicode problems
* Implements unit tests
 2016-02-29 12:30:00 -05:00
Michael Abashian
479f106820 Merge pull request #1065 from mabashian/summary-fields-id 
Summary fields
 2016-02-26 13:28:02 -05:00
Michael Abashian
38463673d5 Updated out-dated comment to reflect code 2016-02-26 12:25:24 -05:00
Michael Abashian
6870a5d60c Swap out regex on related for IDs in summary_fields 2016-02-26 12:21:01 -05:00
Michael Abashian
fc16473c03 Merge branch 'log-viewer-cleanup' into devel 
# Conflicts:
#	awx/ui/client/src/helpers.js
 2016-02-26 11:45:18 -05:00
Matthew Jones
a9bf29d2a7 Add the id field to the default summary fields 
This is to support the UI.

ref: #1063
 2016-02-26 11:30:34 -05:00
Akita Noek
c5b7d3363b Merge pull request #1062 from anoek/rbac 
Added some resource type and name information to the access list for the UI
 2016-02-26 10:47:16 -05:00
Akita Noek
9c1694f187 Added resource type to our roles in our access list 2016-02-26 10:46:01 -05:00
Akita Noek
5bb241bfd4 Added resource name and related field to the roles listed in an access_list 2016-02-26 10:42:07 -05:00
Chris Church
3228b41eea Merge pull request #1020 from cchurch/ad-hoc-check-mode-fixes 
Fix error with ad hoc command events when running in check mode.
 2016-02-25 16:45:25 -05:00
Leigh
9555967bc7 Merge pull request #1051 from leigh-johnson/TrailingSlashFix 
quick config-line fix to #1039
 2016-02-25 15:14:14 -05:00
Chris Church
60c3eeaef3 Include @anoek's changes from #1029. 2016-02-25 15:01:29 -05:00
Leigh Johnson
ad204f45e1 quick config-line fix to #1039 2016-02-25 13:30:20 -05:00
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