External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 17:00:12 -02:30
Code Issues Packages Projects Releases Wiki Activity
17,303 Commits 63 Branches 102 Tags
8e85a57c1acc2911826ed05787382bb626d75159
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III 9319bbce8d Merge pull request #1565 from wwitzel3/fix-703 
Allow real null to be searched in host_filter
 2018-04-25 13:47:29 -04:00
Wayne Witzel III 14b0298217 Merge pull request #1566 from wwitzel3/make-awx-link 
Add awx-link make target
 2018-04-25 12:39:25 -04:00
Wayne Witzel III 7151071779 Add awx-link make target 2018-04-25 11:55:57 -04:00
Wayne Witzel III 404b476576 Allow real null to be searched in host_filter 2018-04-25 11:46:21 -04:00
Wayne Witzel III ce65914143 Merge pull request #1556 from ryanpetrello/fix-1490 
fix a bug in custom virtualenv when Project.organization is None
 2018-04-25 07:01:47 -04:00
Wayne Witzel III 765ad07d9e Fix migration name/ordering 2018-04-23 11:00:21 -04:00
Wayne Witzel III f1b37ff53a Fix order become methods render and migration query 2018-04-23 10:33:59 -04:00
Wayne Witzel III c1a8d8670f Pop the type to be consistent 2018-04-23 10:33:59 -04:00
Wayne Witzel III 07474d5b21 Extend become_method to model field validation as well 2018-04-23 10:33:59 -04:00
Wayne Witzel III d6ac9b6e3d Restore previous choices, clean up some minor things 2018-04-23 10:33:59 -04:00
Wayne Witzel III 8fa98d0d54 Add new credential become methods, inject instead of set in database 2018-04-23 10:33:59 -04:00
Wayne Witzel III df4f6ecfd6 Merge pull request #1480 from wwitzel3/release_3.3.0 
Fixup migrations.
 2018-04-23 06:01:06 -07:00
Wayne Witzel III 44470200a2 Fix migration numbering 2018-04-23 07:51:36 -04:00
Wayne Witzel III c37ed32c55 Merge pull request #1204 from AlanCoding/org_members_team 
allow org members to see teams in org
 2018-04-23 04:15:38 -07:00
Wayne Witzel III ab311d5c2f Merge pull request #1422 from wwitzel3/release_3.3.0 
Remove unused code, OrderedDictLoader
 2018-04-19 08:33:16 -07:00
Wayne Witzel III a23aadf346 Remove unused code, OrderedDictLoader 2018-04-19 08:07:09 -04:00
Wayne Witzel III 3c5928fe5b Merge pull request #1405 from wenottingham/sending-out-an-sos-to-the-world 
Update sosreport plugin to pull in more information
 2018-04-19 04:10:54 -07:00
Wayne Witzel III 250e036d0b Merge pull request #1412 from AlanCoding/yaml_json_cats_dogs 
Add protection for job-compatible vars
 2018-04-19 04:04:42 -07:00
Wayne Witzel III a088621425 Merge pull request #1250 from wwitzel3/fix-1228 
Update role hierarchy when a JobTemplate moves orgs.
 2018-04-06 15:31:23 -04:00
Wayne Witzel III 99fb0fa4cd Extract update_role_parentage_for_instance 2018-04-06 15:19:41 -04:00
Wayne Witzel III 81fe778676 Collect roles and update parentage instead of saving JT 2018-04-06 13:35:24 -04:00
Wayne Witzel III 0bd9919108 Make use of callback explicitly for Project and Inventory 2018-04-05 11:05:48 -04:00
Wayne Witzel III 3411389d00 Added JobTemplate ownership change test 2018-04-05 11:00:13 -04:00
Wayne Witzel III 524343870b Added Project & Inventory signals for JobTemplate RBAC 2018-04-05 09:46:03 -04:00
Wayne Witzel III 6c7a7dbbc0 Merge pull request #1151 from wwitzel3/release_3.3.0 
Fix issue with adding new RBAC fields
 2018-04-04 08:03:52 -04:00
Wayne Witzel III bab2745392 Refresh the old instance so the returned obj is up-to-date 2018-04-04 07:49:29 -04:00
Wayne Witzel III 5f888d8400 Fix issue with adding new RBAC fields 2018-04-04 07:48:21 -04:00
Wayne Witzel III f64587cd1c Merge pull request #1207 from wwitzel3/fix-32-1189 
Back port of 3.3.0 fix
 2018-04-03 09:29:38 -04:00
Wayne Witzel III c4635fa683 Merge pull request #1199 from wwitzel3/fix-1189 
Fixes RBAC issue, ensures can admin of sub_obj when needed
 2018-04-02 16:06:11 -04:00
Wayne Witzel III b905aec1d4 Merge pull request #1199 from wwitzel3/fix-1189 
Fixes RBAC issue, ensures can admin of sub_obj when needed
 2018-04-02 16:03:00 -04:00
Wayne Witzel III 067ead35ac Extend test and fix to include the admin_role 2018-04-02 15:39:01 -04:00
Wayne Witzel III ea7a0b2f58 Fixes RBAC issue, ensures can admin of sub_obj when needed 2018-04-02 14:10:14 -04:00
Wayne Witzel III 3936b5e7a3 Merge pull request #1690 from ryanpetrello/coc 
add a link to the community code of conduct
 2018-03-28 08:55:57 -04:00
Wayne Witzel III f4e57e2906 Merge pull request #1608 from wwitzel3/devel 
System Setting for Orgainization User/Team permissions.
 2018-03-20 17:17:49 -04:00
Wayne Witzel III d7f26f417d Reword help text for manage org auth 2018-03-20 07:31:08 -04:00
Wayne Witzel III d5564e8d81 Fix user capabilities when MANAGE_ORGANIZATION_AUTH is disabled 2018-03-19 15:16:54 -04:00
Wayne Witzel III a9da494904 switch to single toggle and change name 2018-03-19 14:45:52 -04:00
Wayne Witzel III 771108e298 Protect team assignment for the roles access point 2018-03-19 12:10:13 -04:00
Wayne Witzel III eb3b518507 Add Organization User/Team toggle to UI 2018-03-19 11:25:14 -04:00
Wayne Witzel III 33ac8a9668 System wide toggle for org admin user/team abilities 2018-03-19 11:24:36 -04:00
Wayne Witzel III 16aa3d724f Merge pull request #1586 from wwitzel3/devel 
Moved RelatedJobMixin impl to Project instead of ProjectUpdate
 2018-03-16 09:58:34 -04:00
Wayne Witzel III 6231742f71 Move RelatedJob mixin to Project 2018-03-16 09:42:32 -04:00
Wayne Witzel III c628e9de0a Filter active jobs by WFT/JT 2018-03-16 09:32:42 -04:00
Wayne Witzel III c54d9a9445 Fix query using self -> self.project and fix imports 2018-03-16 09:24:46 -04:00
Wayne Witzel III f594f62dfc Project needs to expose all of its ProjectUpdate jobs in an active state 2018-03-16 09:12:20 -04:00
Wayne Witzel III 4b27b05fd2 Merge pull request #1541 from wwitzel3/devel 
Fix member_role parent to include credential_admin_role
 2018-03-13 13:52:58 -04:00
Wayne Witzel III db38cf8f93 Fix member_role parent to include credential_admin_role 2018-03-13 12:20:40 -04:00
Wayne Witzel III a3b2f29478 Merge pull request #1454 from wwitzel3/fix-role-summary 
Fix role summary when role description is overloaded
 2018-03-06 14:03:22 -05:00
Wayne Witzel III 8dce5c826c Fix role summary when role description is overloaded 2018-03-06 13:07:29 -05:00
Wayne Witzel III dba78e6bfb Merge pull request #1398 from wwitzel3/devel 
Update to latest asgi-amqp
 2018-02-28 15:20:55 -05:00
Wayne Witzel III 73f0a0d147 Update to latest asgi-amqp 2018-02-28 14:43:37 -05:00
Wayne Witzel III 91c6d406c5 Rollback celery 2018-02-22 09:37:14 -05:00
Wayne Witzel III 2c71a27630 Merge pull request #1123 from wwitzel3/new-permissions 
New RBAC Roles
 2018-02-15 16:56:03 -05:00
Wayne Witzel III 30a5617825 Address PR feedback 2018-02-14 22:53:33 +00:00
Wayne Witzel III 13e777f01b Rename migration files 2018-02-10 02:52:26 +00:00
Wayne Witzel III 819b318fe5 Add Org Execute 2018-02-10 02:52:26 +00:00
Wayne Witzel III 9e7bd55579 Add Notification Admin 2018-02-10 02:52:26 +00:00
Wayne Witzel III fbece6bdde Updating and adding tests for new RBAC roles 2018-02-10 02:52:26 +00:00
Wayne Witzel III 9fdd00785f Add new RBAC role migrations 2018-02-10 02:52:26 +00:00
Wayne Witzel III b478740f28 Add Workflow Admin 2018-02-10 02:52:25 +00:00
Wayne Witzel III 109841c350 Add Credential Admin role 2018-02-10 02:52:25 +00:00
Wayne Witzel III 6c951aa883 Add Inventory Admin role 2018-02-10 02:52:25 +00:00
Wayne Witzel III e7e83afd00 Add Project Admin role 2018-02-10 02:52:25 +00:00
Wayne Witzel III bad8c65321 Merge pull request #1074 from wwitzel3/devel 
Load Celery inspector manually when needed
 2018-01-29 12:00:24 -05:00
Wayne Witzel III 55a616cba6 Load Celery inspector manually when needed 2018-01-29 14:57:03 +00:00
Wayne Witzel III b205630490 Merge pull request #622 from wwitzel3/release_3.2.3 
Wait for Slack RTM API websocket connection to be established
 2018-01-24 08:59:45 -05:00
Wayne Witzel III aa469d730e Wait for Slack RTM API websocket connection to be established 2018-01-24 13:48:42 +00:00
Wayne Witzel III 1af0ee2f8c first-parent requires git >= 1.8.4 2018-01-18 16:12:23 +00:00
Wayne Witzel III fc5c5400cd Merge pull request #1003 from wwitzel3/devel 
Fix notification_data attempting to access name property of an int
 2018-01-18 08:55:50 -05:00
Wayne Witzel III 95bead2bb2 Extend notification_data test 2018-01-18 13:30:12 +00:00
Wayne Witzel III 4a28065dbb Fix notification_data attempting to access name property of an int 2018-01-17 21:46:49 +00:00
Wayne Witzel III 1690938dfb Update asgi-amqp requirement 2018-01-09 23:54:30 +00:00
Wayne Witzel III f3310236e4 Merge pull request #599 from wwitzel3/release_3.2.2 
Fix git project sync bug.
 2017-11-30 11:22:29 -05:00
Wayne Witzel III ed28faa3db Use TMP instead of TMPDIR and only set it in RunProjectUpdate 2017-11-30 16:10:12 +00:00
Wayne Witzel III 53460db4d7 Merge pull request #736 from ewjoachim/fix-social-core 
Fix import of social_core.exceptions in sso/pipeline.py
 2017-11-29 09:26:43 -05:00
Wayne Witzel III 3202e77b57 Merge pull request #720 from wwitzel3/devel 
Update to asgi_amqp 1.0.1
 2017-11-27 14:57:39 -05:00
Wayne Witzel III a858093db8 Update to asgi_amqp 1.0.1 2017-11-27 19:41:30 +00:00
Wayne Witzel III 79c196fc08 Merge pull request #588 from wwitzel3/release_3.2.2 
Include all previously run operations to satisfy Django migration planner
 2017-11-17 12:12:21 -05:00
Wayne Witzel III 249a5e5e4d Include all previously run operations to satisfy Django migration planner. 2017-11-17 12:02:07 -05:00
Wayne Witzel III e5d86419c8 Merge pull request #582 from AlanCoding/smart_computed2 
update smart inventory computed fields
 2017-11-16 19:36:08 -05:00
Wayne Witzel III 9ed2a0da8f Merge pull request #627 from wwitzel3/devel 
Fix image_build
 2017-11-14 08:53:21 -05:00
Wayne Witzel III d696f6c3f6 Fix image_build 2017-11-13 19:11:58 -05:00
Wayne Witzel III 3cdeb446c4 Merge pull request #622 from wwitzel3/devel 
Using metavar with a flag is not allowed or useful
 2017-11-13 17:12:03 -05:00
Wayne Witzel III 58737a8e28 Using metavar with a flag is not allowed or useful 2017-11-13 16:05:54 -05:00
Wayne Witzel III 2fb74f5b02 Merge pull request #621 from wwitzel3/devel 
Fix mgmt cmds, use real types not strings
 2017-11-13 15:38:19 -05:00
Wayne Witzel III 768a3f62f1 Fix mgmt cmds, use real types not strings 2017-11-13 15:32:31 -05:00
Wayne Witzel III d9f8f7721a Fix installer references to asgi_amqp 2017-11-13 13:39:39 -05:00
Wayne Witzel III d2711f4af0 Merge pull request #618 from wwitzel3/devel 
Silence models.E006 until rename the Project and InventorySource
 2017-11-13 13:23:15 -05:00
Wayne Witzel III 77fd7ea4a8 Silence models.E006 until we can rename the Project and InventorySource models 2017-11-13 13:19:29 -05:00
Wayne Witzel III faa5a5e024 Merge pull request #600 from wwitzel3/django111 
Upgrade AWX major dependencies
 2017-11-13 12:26:04 -05:00
Wayne Witzel III 798d27c2cb Fix task_manager test 2017-11-13 12:02:00 -05:00
Wayne Witzel III 5b4dc9e7ee Disable group sending in consumer (Issue ansible/awx#615) 2017-11-13 10:19:14 -05:00
Wayne Witzel III f118e27047 Flake8 fixes and URL updates 2017-11-10 17:04:33 -05:00
Wayne Witzel III 96904968d8 Fix migration issues, tests, and templates 2017-11-09 17:29:48 -05:00
Wayne Witzel III 6d6bbbb627 Update URL strucuture, fixed string based calls 2017-11-09 17:24:04 -05:00
Wayne Witzel III 14c5123fda Update celery environ and tasks 2017-11-09 17:21:19 -05:00
Wayne Witzel III de376292ba Update management commands 2017-11-09 17:18:18 -05:00
Wayne Witzel III 8faf588775 Update package versions, settings, and tooling 2017-11-09 17:17:30 -05:00
Wayne Witzel III 7149c41804 Merge pull request #570 from wwitzel3/release_3.2.2 
Handle ProgrammingError in squashed helpers
 2017-11-03 10:45:09 -04:00
Wayne Witzel III 1a5b5c32b8 Handle ProgrammingError in squashed helpers 2017-11-03 10:34:25 -04:00