External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-14 07:50:09 -02:30
Code Issues Packages Projects Releases Wiki Activity
7,407 Commits 64 Branches 102 Tags
32db96c17628fb875759d7b0dbacbe0749166399
Commit Graph
99 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek 4c0f4363be Merge pull request #1794 from anoek/migration-fixes 
Fixed JobTemplate migration when inventory is NULL
 2016-05-03 16:25:49 -04:00
Akita Noek 1b0e3719f1 Merge pull request #1785 from anoek/1689 
Filter out a users own Admin Role from their roles list
 2016-05-03 14:40:33 -04:00
Akita Noek 7e445124a4 Merge pull request #1783 from anoek/1713 
Special case handling for team access list to prevent "read" role shwing up as a direct team role
 2016-05-03 14:40:25 -04:00
Akita Noek e237648f4c Merge pull request #1761 from anoek/migration-fixes 
Migration fixes
 2016-05-03 11:32:38 -04:00
Akita Noek 45a3ccaa50 Merge pull request #1743 from anoek/migration-fixes 
RBAC Migration fixes
 2016-04-29 16:08:03 -04:00
Akita Noek 110a500938 Merge pull request #1723 from anoek/activity-stream-delete-fix 
Fixed and updated activity stream delete operations
 2016-04-28 10:43:30 -04:00
Akita Noek 077db7931f Merge pull request #1693 from anoek/devel 
Fixed duplicate active_roles entries
 2016-04-25 20:54:28 -04:00
Akita Noek 48f61b43e7 Merge pull request #1685 from anoek/1295 
Fixed up 2.4.5 -> 3.0 no_log merge
 2016-04-25 16:09:55 -04:00
Akita Noek 1bf23e2acc Merge pull request #1683 from anoek/1676 
Added resource information summary fields to the Role serializer
 2016-04-25 16:02:12 -04:00
Akita Noek 6ad8a14703 Merge pull request #1680 from anoek/performance 
hosts and roles query performance improvements
 2016-04-25 15:08:19 -04:00
Akita Noek e697a5441c Merge pull request #1663 from anoek/distinct-removal 
.distinct() removal from global filter_queryset method
 2016-04-25 08:46:01 -04:00
Akita Noek 2d4e9f15df Merge pull request #1650 from anoek/performance 
More RBAC optimizations
 2016-04-22 14:51:42 -04:00
Akita Noek 545fa95d87 Merge pull request #1617 from anoek/unit-test-cleanup 
Test cleanup and slow test separation
 2016-04-20 13:18:07 -04:00
Akita Noek 969782fdca Merge pull request #1560 from anoek/11th-hour 
RBAC RolePermission removal updates
 2016-04-18 21:08:54 -04:00
Akita Noek fa98b59b6c Merge pull request #9 from AlanCoding/11th-hour 
Merge devel, update job launch behavior to newest permissions stuff
 2016-04-18 15:03:58 -04:00
Akita Noek 6c47aed852 Merge pull request #8 from AlanCoding/11th-hour-org-counts 
Thorough organization counts testing, un-skip
 2016-04-18 11:41:51 -04:00
Akita Noek a678927d76 Merge pull request #7 from wwitzel3/11th-hour 
fixing credential access
 2016-04-15 15:32:49 -04:00
Akita Noek 262de7cdc9 Merge pull request #6 from wwitzel3/11th-hour 
fix team tests
 2016-04-15 15:29:28 -04:00
Akita Noek 7b301e11f3 Merge pull request #5 from wwitzel3/11th-hour 
fix User.accessible_objects
 2016-04-15 14:59:55 -04:00
Akita Noek 54a6cbdab5 Merge pull request #4 from wwitzel3/11th-hour 
test fixes and read_role
 2016-04-15 11:58:05 -04:00
Akita Noek 47a6daacc7 Merge pull request #3 from wwitzel3/11th-hour 
Role rename bonanza
 2016-04-15 11:04:48 -04:00
Akita Noek c76976e466 Merge pull request #2 from wwitzel3/11th-hour 
update access calls to new RBAC roles
 2016-04-15 10:49:57 -04:00
Akita Noek 40731f6fc8 Merge pull request #1513 from anoek/1499 
Fix erronous singleton role created for users
 2016-04-12 16:54:19 -04:00
Akita Noek 3f0ea18e10 Merge pull request #1516 from anoek/devel 
Fix bad migration from #1496
 2016-04-12 16:52:38 -04:00
Akita Noek 2ccd46de11 Merge pull request #1511 from anoek/explicit-implicit-parents 
Switch to explicitly stored implicit role parents
 2016-04-12 16:34:10 -04:00
Akita Noek d6d8390f8c Merge pull request #1480 from anoek/migration 
Migration fixes
 2016-04-12 16:33:54 -04:00
Akita Noek 563917a217 Merge pull request #1509 from anoek/devel 
Fix faulty activitystream test
 2016-04-12 15:41:25 -04:00
Akita Noek dc70262d39 Merge pull request #1435 from anoek/user-activity-stream-updates 
Added activity stream events for User
 2016-04-12 09:10:52 -04:00
Akita Noek c4a1f55f53 Merge pull request #1414 from anoek/access-list-updates 
Updated access_list to include team information for indirect access
 2016-04-11 17:04:53 -04:00
Akita Noek 2d31021296 Merge pull request #1411 from wwitzel3/more-rht-integration 
RedHat Inventory Integrations
 2016-04-07 12:56:12 -05:00
Akita Noek 2466fd0ca5 Merge pull request #1439 from wwitzel3/rbac-bug-1390 
Update User/Team Roles API documentation.
 2016-04-07 12:32:51 -05:00
Akita Noek f6e36258bd Merge pull request #1437 from wwitzel3/rbac-bug-1427 
fix 500 errors for credential and role lists
 2016-04-07 12:32:44 -05:00
Akita Noek 93fd398793 Merge pull request #1436 from wwitzel3/rbac-bug-1421 
superuser should be able to delete users without an org
 2016-04-07 12:32:40 -05:00
Akita Noek 38927206c7 Merge pull request #1413 from anoek/credential-api 
Added organization to Credential summary and related fields
 2016-04-06 15:11:35 -05:00
Akita Noek e2b01740fb Merge pull request #1389 from anoek/credential-api 
Added and updated several credential creation and listing API endpoints
 2016-04-04 14:11:21 -05:00
Akita Noek 82c55a4ea4 Merge pull request #1384 from wwitzel3/devel 
RBAC Fixes
 2016-04-04 12:38:31 -05:00
Akita Noek a4ee862b6a Merge pull request #1372 from wwitzel3/rbac 
RBAC migration fixes
 2016-04-01 09:25:39 -04:00
Akita Noek 935e3921ca Merge pull request #1365 from anoek/rbac 
Reverted attempted fix of ActivityStreamAccess
 2016-03-31 14:29:17 -04:00
Akita Noek ca6a71d76a Merge pull request #1361 from anoek/rbac 
Merge devel
 2016-03-31 11:34:05 -04:00
Akita Noek 0ca3c62273 Merge pull request #1360 from anoek/rbac 
Fixed up unified jobs/job templates api endpoints
 2016-03-31 11:32:17 -04:00
Akita Noek 0360093622 Merge pull request #1356 from jlmitch5/rbac_perm_ui 
Rbac perm ui
 2016-03-31 10:51:14 -04:00
Akita Noek f9cc986d85 Merge pull request #1355 from wwitzel3/rbac 
RBAC PR Fixes
 2016-03-31 10:46:47 -04:00
Akita Noek 2bb9b8a6fe Merge pull request #1352 from wwitzel3/rbac 
RBAC PR Fixes
 2016-03-31 10:06:20 -04:00
Akita Noek 330acc85ae Merge pull request #1346 from wwitzel3/rbac 
make migrations unicode safe, fixes #1345
 2016-03-31 09:08:41 -04:00
Akita Noek 33a31a1da7 Merge pull request #1336 from wwitzel3/rbac 
add rbac migration logging and reduce memory consumption
 2016-03-29 20:45:40 -04:00
Akita Noek 1c5ea258ed Merge pull request #1316 from anoek/rbac 
Merge in new label code from devel
 2016-03-28 10:47:45 -04:00
Akita Noek 051ef4220e Merge pull request #1310 from anoek/rbac 
Fixed up some missing select_related cases on RBAC
 2016-03-26 11:41:39 -04:00
Akita Noek 036044038f Merge pull request #1306 from anoek/rbac 
More test fixes on rbac branch
 2016-03-24 22:47:54 -04:00
Akita Noek c9ab92bd84 Merge pull request #1 from AlanCoding/org_detail_rbac_update 
Update organization detail view counts for RBAC
 2016-03-24 16:43:14 -04:00
Akita Noek 64e080ba53 Merge pull request #1301 from AlanCoding/647_org_detail_counts 
Add organization counts in detail view
 2016-03-24 16:07:04 -04:00
Akita Noek 1a96d9705f Merge pull request #1294 from anoek/rbac 
Various updates for tests on RBAC branch
 2016-03-24 11:13:22 -04:00
Akita Noek 8db915794d Merge pull request #1298 from AlanCoding/1254_org_counts_update 
Update organization counts for RBAC branch
 2016-03-23 15:15:17 -04:00
Akita Noek 80560fffc9 Merge pull request #1283 from anoek/rbac 
Fixed up migrations
 2016-03-18 16:33:24 -04:00
Akita Noek edabf23c6a Merge pull request #1282 from anoek/devel 
Renamed migrations to be a little more descriptive
 2016-03-18 16:32:26 -04:00
Akita Noek 5a444d4b2c Merge pull request #1281 from anoek/rbac 
Merging devel into rbac
 2016-03-18 15:43:48 -04:00
Akita Noek 9dc4f3e07d Merge pull request #1280 from anoek/rbac 
Refactored ImplicitRoleField
 2016-03-18 15:41:54 -04:00
Akita Noek cf56ada34d Merge pull request #1249 from wwitzel3/rbac 
flake8 fixup
 2016-03-15 11:48:34 -04:00
Akita Noek d805697093 Merge pull request #1247 from wwitzel3/rbac 
RBAC Fixes
 2016-03-15 09:56:46 -04:00
Akita Noek 44bfc44555 Merge pull request #1238 from wwitzel3/rbac 
RBAC Updates
 2016-03-14 14:43:28 -04:00
Akita Noek 34fd07de7a Merge pull request #1225 from wwitzel3/rbac 
Fixed up m2m_changed for rbac, added User.admin_role
 2016-03-11 16:04:40 -05:00
Akita Noek 4024bbfe2b Merge pull request #1222 from wwitzel3/rbac 
Remove UserResource and ensure RolePermission during migration
 2016-03-11 11:00:29 -05:00
Akita Noek 55dc21e97d Merge pull request #1219 from wwitzel3/rbac 
Allow org.admin_role.members to administer org.member_role.members
 2016-03-11 10:53:02 -05:00
Akita Noek a45e5b9eab Merge pull request #1217 from wwitzel3/rbac 
Added user role creation, accessible methods, and fixed up m2m_update
 2016-03-11 09:40:31 -05:00
Akita Noek 8ff766f5df Merge pull request #1203 from wwitzel3/rbac 
test fixups and re-add can_access
 2016-03-09 15:35:26 -05:00
Akita Noek 0d0d87073e Merge pull request #1197 from anoek/rbac 
Fixed up migrations after last merge
 2016-03-09 13:11:10 -05:00
Akita Noek f59e603c18 Merge pull request #1195 from anoek/rbac 
Merging in devel
 2016-03-09 12:05:06 -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 38f22cc839 Merge pull request #1121 from anoek/rbac 
Merging devel
 2016-03-04 14:03:43 -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 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 f025b8412d Merge pull request #1085 from anoek/rbac 
Merging devel into rbac
 2016-03-02 09:04:25 -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
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 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
Akita Noek 5551ec29ec Merge pull request #1037 from anoek/rbac 
Merging devel into rbac
 2016-02-25 13:06:50 -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
Akita Noek ced41c64de Merge pull request #1033 from wwitzel3/rbac 
Added UserResource
 2016-02-24 14:13:02 -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 dc8ec283d2 Merge pull request #1014 from anoek/rbac 
Added several related fields to the RBAC API
 2016-02-23 16:08:07 -05:00
Akita Noek aa3a33447e Automatically add users with is_superuser to System Admin role 
Also fixed issue with System Admin role name not being set and made some
constants for the singleton names we use
 2016-02-22 09:44:00 -05:00
Akita Noek d3c620926a Merge pull request #990 from anoek/devel 
Updated API test fixtures
 2016-02-18 13:37:04 -05:00
Akita Noek e1c1904218 Merge pull request #964 from anoek/rbac 
Merge devel
 2016-02-15 13:41:23 -05:00
Akita Noek d5c41d02ea Merge branch 'devel' into merge-devel 2016-02-15 13:38:01 -05:00
Akita Noek 380ba8a41d Merge pull request #962 from anoek/rbac 
"Completion" of RBAC migrations; resource_field elimination
 2016-02-15 13:36:31 -05:00
Akita Noek aafe521986 doc: ImplicitRoleField after the elimination of resource_field 
Completes #926
 2016-02-15 12:55:51 -05:00
Akita Noek e2a428b9f5 Removed resource_field ImplicitRoleField 
We just now assume that this field is always named 'resource'

 Completes functionality of #926, documentation next
 2016-02-15 12:38:17 -05:00
Akita Noek c77620f1ae Added support in ImplicitRoleField to handle following reverse m2m maps 2016-02-15 11:49:54 -05:00
Akita Noek 243b78ee25 Job template migration and migration tests 2016-02-15 11:48:17 -05:00
Akita Noek e0371f3745 Switched back to multiple-organizations for Projects 2016-02-15 10:43:50 -05:00
Akita Noek ec3f184737 Merge pull request #922 from anoek/rbac 
RBAC refactoring and first pass at ORMification
 2016-02-12 10:19:30 -05:00
Akita Noek 4bc9ca2096 Merge pull request #905 from wwitzel3/rbac 
RBAC tests and fixes
 2016-02-10 15:22:11 -05:00
Akita Noek 2de6bdd5c3 Merge pull request #886 from anoek/rbac-devel-integration 
Pull in latest patches on devel
 2016-02-09 09:51:14 -05:00
Akita Noek 6df8017cb1 Merge pull request #877 from wwitzel3/rbac-port-migrations 
Convert migrate_to_rbac method to Migrations
 2016-02-08 16:30:35 -05:00
Akita Noek 1418e95155 Merge pull request #813 from anoek/rbac 2016-02-05 17:05:30 -05:00
Akita Noek f6357cbfe5 Merge pull request #737 from anoek/645_no_log_ansible 
Added missing 'skipped' field for our no_log white list
 2016-01-28 12:48:48 -05:00
Akita Noek 6b973896ee Merge pull request #734 from anoek/645_no_log_ansible 
Obey no_log even more when using ansible 2.0
 2016-01-28 11:49:52 -05:00
Akita Noek 74dc4a59c2 Merge pull request #683 from anoek/test_performance_rrule 
5% performance boost on make test
 2016-01-26 11:11:38 -05:00
Akita Noek c8d7778ed5 Merge pull request #665 from anoek/documentation 
Minor documentation fixes
 2016-01-20 15:30:21 -05:00
Akita Noek 9a10a29016 Merge pull request #662 from anoek/645_no_log_ansible 
Obey no_log with ansible 2.0
 2016-01-20 15:29:43 -05:00