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,995 Commits 64 Branches 102 Tags
6a0ef366f3f4dde005c55152a189bfb0805340d8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek a92056dfa4 Merge pull request #2322 from anoek/2135 
Attach labels instead of erroring on creation if label already exists
 2016-06-10 14:06:37 -04:00
Akita Noek 67cfc35c79 Merge pull request #2294 from anoek/2263 
Fixed permissions dialog not opening on job template page
 2016-06-10 09:41:31 -04:00
Akita Noek 9580a7322f Merge pull request #2230 from anoek/1752 
Added CodeMirror for notification http headers field
 2016-06-09 13:20:35 -04:00
Akita Noek d6b0a08f32 Merge pull request #2265 from anoek/2076 
Display error when trying to delete a job you don't have access to
 2016-06-09 13:20:11 -04:00
Akita Noek 59c169ff27 Merge pull request #2262 from anoek/2028 
Fix stdout height issue on firefox
 2016-06-09 12:21:25 -04:00
Akita Noek 5dcf49f40e Merge pull request #2240 from anoek/2237 
Nuked obsolete multi-org project help tooltip on projects page
 2016-06-08 15:42:45 -04:00
Akita Noek f4df24647c Merge pull request #2194 from anoek/1742 
Behave better when deleting items you are currently editing
 2016-06-08 14:53:25 -04:00
Akita Noek be014f012a Merge pull request #2178 from anoek/1445 
Added default values to the required job template survey questions
 2016-06-07 14:23:46 -04:00
Akita Noek 8a884894c5 Merge pull request #2169 from anoek/1192 
Fixed stdout viewing on management job pages
 2016-06-07 13:09:04 -04:00
Akita Noek 7fc62cd401 Merge pull request #2163 from anoek/2162 
Fix monkey-punching soft-XSS
 2016-06-06 15:56:00 -04:00
Akita Noek d63cb61fff Merge pull request #2171 from anoek/extra-vars-styling 
Styled extra-vars on management jobs
 2016-06-06 15:55:55 -04:00
Akita Noek 52ba5792df Merge pull request #2172 from anoek/2167 
Fixed stdout fullscreen functionality
 2016-06-06 15:55:50 -04:00
Akita Noek 0a5b2aea0a Merge pull request #2158 from anoek/2148 
Fixed XSS for project and jt scheduling
 2016-06-03 16:06:19 -04:00
Akita Noek 81be04e847 Merge pull request #2161 from anoek/862 
Fix en-au date format problem
 2016-06-03 15:54:42 -04:00
Akita Noek 7a7e894d2b jshint 2016-06-03 14:52:42 -04:00
Akita Noek b999206ffd Merge pull request #2146 from anoek/stdout-styling 
Stdout styling updates
 2016-06-03 14:24:21 -04:00
Akita Noek 76d9c2d192 Merge pull request #2157 from anoek/object_roles 
Disambiguate usage of `/roles` in various endpoints
 2016-06-03 14:17:53 -04:00
Akita Noek fe56b11243 Merge pull request #2139 from anoek/2107 
Fixed job template verbosity select2 syncing
 2016-06-02 22:01:30 -04:00
Akita Noek a6e06588b4 Merge pull request #2138 from anoek/migration 
Fixed up multi-org project migrations
 2016-06-02 13:43:14 -04:00
Akita Noek d813a8a680 Merge pull request #2122 from anoek/jshint 
JShint fixes and tests
 2016-06-02 08:42:07 -04:00
Akita Noek 4f4724d1c5 Merge pull request #2097 from leigh-johnson/JobDetailHostEvents 
Host event/events/summary UX work items & bug fixes
 2016-06-01 15:52:32 -04:00
Akita Noek c009a21c24 Merge pull request #2055 from leigh-johnson/JobDetailsAudit 
Job Details UX items
 2016-06-01 09:29:56 -04:00
Akita Noek de8adc2a05 Merge pull request #2083 from leigh-johnson/JobDetailFilters 
Fix Job Details play/task/host filters
 2016-06-01 09:23:53 -04:00
Akita Noek 0948375763 Merge pull request #2109 from anoek/858 
Fixed/enhanced scan job type selection process
 2016-06-01 09:22:48 -04:00
Akita Noek 32b6553cea Merge pull request #2057 from leigh-johnson/SyncFailureStateParams 
Add $stateParams to filter inventories / projects with sync failures
 2016-05-31 17:04:59 -04:00
Akita Noek a857692456 Merge pull request #2044 from leigh-johnson/StdOutPagination 
Fix infinite scrolling of job run standard out
 2016-05-31 16:43:14 -04:00
Akita Noek c00a010f14 Merge pull request #2066 from leigh-johnson/JobTemplateCloudCredentialLookup 
Fix Cloud Credential lookup modal in Job Template > Add/Edit
 2016-05-31 16:42:39 -04:00
Akita Noek ba78427fef Merge pull request #2081 from leigh-johnson/HipChatAddEdit 
Fix adding/editing of HipChat notification templates
 2016-05-31 16:39:49 -04:00
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