External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 08:20:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
7,722 Commits 63 Branches 102 Tags
85ead1435ff89e4dd433ef0dbb9571aeaba7df4a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek 42fe1d8c47 Merge pull request #2094 from anoek/jshint 
JSHint fixes
 2016-05-27 15:08:57 -04:00
Akita Noek 1a9fece262 Merge pull request #2075 from anoek/1981 
Better control what JT admins are allowed to do
 2016-05-27 15:00:09 -04:00
Akita Noek c0758d4134 Merge pull request #2082 from anoek/733 
Show stdout download button for canceled jobs
 2016-05-26 21:00:54 -04:00
Akita Noek 4f6fd558a0 Merge pull request #2074 from anoek/test-fixes 
Test fixes for slow tests
 2016-05-26 14:48:45 -04:00
Akita Noek 11443eb22d Merge pull request #2060 from wwitzel3/3.0 
Test refactoring
 2016-05-26 11:23:56 -04:00
Akita Noek 085560567a Merge pull request #2037 from anoek/2032 
Resurrect global .distinct() call (mostly)
 2016-05-25 15:11:51 -04:00
Akita Noek 957eed5849 Merge pull request #2020 from anoek/migration-fixes 
RBAC migration fixes
 2016-05-25 12:30:53 -04:00
Akita Noek 3425c1d4d1 Merge pull request #2000 from anoek/1503 
Disable custom inventory script input when you have no access
 2016-05-20 15:54:24 -04:00
Akita Noek a276b9271d Merge pull request #2001 from AlanCoding/1998_inv_prompted_jt 
All non-superusers to create prompted JTs
 2016-05-20 15:52:41 -04:00
Akita Noek 1bf50e95b0 Merge pull request #2002 from AlanCoding/fix_inv_use_role 
Cleanup stray exec -> use role for inventory list
 2016-05-20 15:39:08 -04:00
Akita Noek df62b85a2f Merge pull request #1996 from anoek/1959 
Executed the inventory execute_role
 2016-05-20 14:29:22 -04:00
Akita Noek 2648265711 Merge pull request #1991 from anoek/1932 
Fix access list to return complete team role list
 2016-05-20 13:34:26 -04:00
Akita Noek b13870fd29 Merge pull request #1987 from anoek/1986 
Split permissions list into two columns
 2016-05-20 13:33:54 -04:00
Akita Noek e98dc484a7 Merge pull request #1984 from anoek/1955 
Show selected playbook in JT's even if you can't read the project
 2016-05-20 13:33:47 -04:00
Akita Noek 89be33dac1 Merge pull request #1983 from anoek/noselect 
Don't allow text selection on checkbox labels nor buttons
 2016-05-20 13:33:38 -04:00
Akita Noek ba19e0e105 Merge pull request #1975 from anoek/auditor-support 
Add support for creating system auditors
 2016-05-20 13:33:21 -04:00
Akita Noek 150c98de18 Merge pull request #1988 from anoek/1919-v2 
Text update for team role removal confirmation message
 2016-05-19 14:47:24 -04:00
Akita Noek 727dc580c7 Merge pull request #1968 from wwitzel3/issue-1938 
adds related `roles` for InventoryScript
 2016-05-19 09:25:53 -04:00
Akita Noek 9dc662e3b2 Merge pull request #1972 from wwitzel3/issue-1890 
ensure superusers can still see JTs even if proj/inv/org are deleted
 2016-05-19 09:17:58 -04:00
Akita Noek e8a3e7456d Merge pull request #1944 from wwitzel3/issue-1910 
Fix access to JT for admin and superuser
 2016-05-19 09:17:29 -04:00
Akita Noek 3347bcac79 Merge pull request #1942 from anoek/cowsay 
Fixed our beloved cow
 2016-05-17 11:59:00 -04:00
Akita Noek 3862d6d1be Merge pull request #1935 from anoek/1929 
Fix project update permissions
 2016-05-17 10:15:20 -04:00
Akita Noek b2d7918912 Merge pull request #1924 from anoek/devel 
Turn off activity stream flag in the UI if we have it explicitly disabled in our settings file
 2016-05-17 09:02:59 -04:00
Akita Noek a532e63539 Merge pull request #1931 from anoek/1919 
Implemented team role removal
 2016-05-16 16:25:45 -04:00
Akita Noek f1e92719e7 Merge pull request #1923 from anoek/1791 
Hide AS/Dashboard button for basic licenses
 2016-05-16 14:54:58 -04:00
Akita Noek 2435de6261 Merge pull request #1925 from anoek/1692 
Fixed duplicate entries in active_roles (again)
 2016-05-16 11:23:58 -04:00
Akita Noek 8bcab8e748 Merge pull request #1915 from anoek/doc-updates 
RBAC doc updates
 2016-05-13 13:57:22 -04:00
Akita Noek 1e26df639f Merge pull request #1909 from anoek/devel 
Filled in RBAC descriptions
 2016-05-13 10:32:59 -04:00
Akita Noek 6d871afd4a Merge pull request #1904 from anoek/migration-fixes 
Job template migration fixes
 2016-05-12 16:33:24 -04:00
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