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

8427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wayne Witzel III
7033542910 Updated Invetory access 2016-03-01 15:01:33 -05:00
Wayne Witzel III
1d179574af Updated Organization and Credential access 2016-03-01 15:01:33 -05:00
Wayne Witzel III
380ccec687 started access refactoring, added UserAccess and updated how ALL permissions is checked 2016-03-01 15:01:33 -05:00
Wayne Witzel III
a4b3567619 Added migration to remove users/admins FK from Org/Teams 2016-03-01 15:00:53 -05:00
Michael Abashian
fb0b760216 Moved standard out log to directive 2016-03-01 13:49:25 -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
Jared Tabor
78baabf676 Job Details--details panel and events summary 
This PR consists of the restyling for the Job Details page, specifically for the details panel and for the events summary panel. It includes, but is not limited to changes to the tables, icons, status representations, expendables panels, positioning on screen, the search bars, the toggles, and the pie chart. I also added a CodeMirror instance for the Results panel as a follow up to my last PR.

Remaining items: Responsiveness is the main one, a lot of JS side styling was done on the job detail page to make it fit on one screen. I'll need to have a deeper dive with UX to figure out what we want to do when this page is displayed on smaller browsers. I also have not gotten to the stdout out for htis page.
 2016-02-29 22:11:29 -08: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
Leigh Johnson
211ae9afad create 1/3+2/3 LESS layout, normalize site-wide footer positioning, move CheckLicense factory to separate file, upgrade URL, add file picker + form reset behavior, #1055, #1057, #1007 2016-02-29 15:01:44 -05:00
Alan Rominger
56b8696641 Merge pull request #1058 from AlanCoding/1025_ansible_v2_err_release245 
Fix warning caused by Ansible v2 callback dictionary
 2016-02-29 14:41:41 -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
AlanCoding
24f7194648 fix case of Ansible v2 _result.cmd is list for release 2.4.5 2016-02-26 09:23:41 -05:00
Akita Noek
6d41eb681d Merge pull request #1042 from anoek/release_2.4.5 
Default play names to the hosts the play was run against
 2016-02-25 20:53:42 -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
Akita Noek
5dc164bb76 Handle both string and list hosts in our hosts->name conversion 
Base our play.name fix off of what Ansible will be doing in the next
release: e2d2798a42
 2016-02-25 11:38:09 -05:00
Akita Noek
26d11b2fb7 Default play names to the hosts the play was run against 
Fixes #1030
 2016-02-25 11:23:00 -05:00
Akita Noek
f7b5e85413 Merge pull request #1029 from anoek/release_2.4.5 
Fix for tasks breaking when using 'yum' with ansible 1.9.4
 2016-02-25 10:43:28 -05:00