1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

6550 Commits

Author SHA1 Message Date
Akita Noek
9d4e6dfc16 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-09 12:04:05 -05:00
Akita Noek
9c78a85a70 Removed old test assertion 2016-03-09 12:03:20 -05:00
Akita Noek
5c8c6fe491 Merge pull request #1187 from anoek/rbac
Replaced Resource table with a GenericForeignKey  on RolePermission
2016-03-09 12:02:46 -05:00
Akita Noek
1989012fd5 Moved access_list url to <whatever>/id/access_list
Eg: organizations/1/access_list will now return a list of all users who
have access to that organization.

This replaces our initial implementation which was resources/id/access_list
2016-03-09 11:41:42 -05:00
Akita Noek
efcd4efda2 Moved the rbac field removal migration to happen after the migrate script part of the rbac migration 2016-03-09 11:31:00 -05:00
Akita Noek
87219135af Removed unneeded import 2016-03-09 10:39:31 -05:00
Akita Noek
b486c8d658 Merge branch 'rbac-resource-gfk' into rbac 2016-03-09 10:17:58 -05:00
Akita Noek
9aae2979d9 Replaced our 'Resource' table with a GenericForeignKey in RolePermission 2016-03-09 10:12:05 -05:00
Bill Nottingham
943dda231d Merge pull request #1118 from wenottingham/copyright-fix
Welcome to 2016!
2016-03-08 16:36:11 -05:00
Bill Nottingham
3c0254a941 Welcome to 2016! 2016-03-08 16:35:18 -05:00
Matthew Jones
823e54a0b9 Fix an error sending success notifications 2016-03-08 14:14:57 -05:00
Wayne Witzel III
0e641e0ace Merge pull request #1173 from wwitzel3/rbac
RBAC Access Updates
2016-03-08 14:10:27 -05:00
Wayne Witzel III
3df4c4ec93 fixing tests and migration issues 2016-03-08 14:09:16 -05:00
Wayne Witzel III
fd2212dd33 More updates to access, use RBAC for permission checks 2016-03-08 13:47:11 -05:00
Michael Abashian
0a4570ae0a Merge branch 'extra-vars' into devel 2016-03-08 11:03:10 -05:00
Michael Abashian
f2667598f0 Merge pull request #1129 from jaredevantabor/notifications
Adding initial notifications files
2016-03-08 10:52:22 -05:00
Leigh Johnson
8712666143 fix merge conflicts between 170a033 and leigh-johnson/Sprint3DemoFeedback 2016-03-08 10:06:00 -05:00
Michael Abashian
6cba39733b Merge pull request #1123 from mabashian/stdout-responsive
Styling tweaks to standard out and license views/dynamic details reload
2016-03-07 14:58:40 -05:00
Michael Abashian
ccaae088d6 Updated comments to reflect actual factory locations 2016-03-07 13:06:25 -05:00
Leigh Johnson
e5b50f182e remove ref to removed function #1112 2016-03-07 11:36:28 -05:00
Michael Abashian
976d242075 Reduced the space between the extra vars label and the code mirror instance down to 10px. 2016-03-07 11:00:07 -05:00
Leigh Johnson
d74e475332 comment out ngAnimate dependency #1112 2016-03-07 10:55:05 -05:00
Leigh Johnson
1bc3657fe7 fixes demo feedback bugs in #1112 2016-03-07 10:46:11 -05:00
Michael Abashian
73d80f7179 Leveraging CodeMirror to display extra variables for management jobs 2016-03-07 10:32:30 -05:00
Wayne Witzel III
39a1e893fb Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-03-07 08:49:48 -05:00
Chris Church
51cb262a84 Merge pull request #1125 from cchurch/job-template-callback-parser-fix
Fix job template callback view to accept URL-encoded form data.
2016-03-05 12:22:15 -05:00
Chris Church
8ae639d165 Merge pull request #1124 from cchurch/system-jobs-migration
Add migration to create system job templates for a new database.
2016-03-05 11:23:45 -05:00
Jared Tabor
a35368f558 Adding initial notifications files 2016-03-04 15:39:23 -08:00
Chris Church
60b6b6bfea Fix job template callback view to accept URL-encoded form data. 2016-03-04 16:36:02 -05:00
James Laska
ee5694b175 Add ISSUE_TEMPLATE.md
fixes #1106
2016-03-04 16:19:00 -05:00
Chris Church
f1c13e0837 Add migration to create system job templates for a new database. 2016-03-04 15:41:40 -05:00
Michael Abashian
08c33a8c6b Refresh the job details when the job finishes running. This pulls in details not available at the beginning of a job. One plus two styling tweaks 2016-03-04 14:29:15 -05:00
Chris Meyers
5759db1229 flake8 fix 2016-03-04 14:14:10 -05:00
Akita Noek
38f22cc839 Merge pull request #1121 from anoek/rbac
Merging devel
2016-03-04 14:03:43 -05:00
Akita Noek
e9c3d98a44 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-04 14:02:01 -05:00
Akita Noek
e5b0e2aeb3 Merge pull request #1064 from anoek/devel
Fixed pagination nav issue
2016-03-04 14:00:24 -05:00
Akita Noek
5a31804330 Just use num_pages when we're at the end of a nav list 2016-03-04 13:37:07 -05:00
Chris Meyers
29e0652bfc Merge pull request #1117 from chrismeyersfsu/fix-fact_cache_receiver
find correct fact to update
2016-03-04 11:51:40 -05:00
Chris Meyers
451a633b3f Merge pull request #1115 from chrismeyersfsu/fix-mongo_off
do not require mongo to be on
2016-03-04 11:44:37 -05:00
Chris Meyers
7494b13704 find correct fact to update
* The fact cache receiver needs to look for an exact match, rather than
* a relative, most recent fact.
2016-03-04 11:41:08 -05:00
Akita Noek
e28eec4a56 Fix missing semicolons 2016-03-04 11:37:47 -05:00
Akita Noek
cf5d718fa8 Fixed pagination nav issue
Fixes #1021
2016-03-04 11:36:57 -05:00
Chris Meyers
2d2940fabc Merge pull request #1109 from chrismeyersfsu/fix-system_tracking_unit_tests
mock system tracking feature enabled
2016-03-04 11:15:10 -05:00
Chris Meyers
d56dc25314 do not require mongo to be on 2016-03-04 10:52:12 -05:00
Jared Tabor
75ecafb6ff Merge pull request #1114 from jaredevantabor/job-detail-stdout
Adding Standard Out and other Job Detail things
2016-03-04 07:43:33 -08:00
Jared Tabor
656f77c0de clean up stale code 2016-03-04 07:42:56 -08:00
Chris Meyers
cfeae51254 deny endpoint access to system tracking feature based on license 2016-03-04 10:14:13 -05:00
Chris Meyers
09c5a189ed remove forgotten print 2016-03-04 07:56:29 -05:00
Jared Tabor
fdaee0242a Adding Standard Out and other Job Detail things
This includes the work from the Job Detail standard out panel along with fixes from feedback from UX and other UI devs.
This includes:
- result panel CSS fixes
- selected row styling
- stop job button functionality
- websockets for job detail
- everthing for adding stdout to the job detail: panel, styling, toggle, and websockets
2016-03-03 22:31:40 -08:00
Michael Abashian
de83011954 Merge pull request #1103 from mabashian/activity-stream-responsive
Activity Stream/General List header responsive styling
2016-03-03 16:24:07 -05:00