zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-17 03:58:35 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,098 Commits 35 Branches 71 Tags
161f4f22cf6657c0cb76cb10fcfff23cf74ac5a5
Commit Graph

6098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek 161f4f22cf Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-02-22 09:37:14 -05:00
Michael Abashian 5ee78d7fec Merge pull request #1000 from mabashian/stdout-breadcrumbs 
Added breadcrumbs to stdout pages
 2016-02-22 08:44:14 -05:00
Wayne Witzel III dcb378fff9 Merge pull request #974 from wwitzel3/rbac 
RBAC Testing Fixes
 2016-02-19 16:39:28 -05:00
Michael Abashian fa29608f50 Configured standard out breadcrumbs for adhoc, inventory sync, management jobs and scm updates. 2016-02-19 16:17:16 -05:00
Wayne Witzel III fa1137d371 Use TransactionTestCase with Django 1.8+ 2016-02-19 15:05:07 -05:00
Jared Tabor 30633cc82e Merge pull request #998 from jaredevantabor/job-detail-results 
Job detail results
 2016-02-19 10:47:07 -08:00
Jared Tabor 93719094ea Using aliases for colors instead of hard coded pigments 2016-02-19 10:39:17 -08:00
Jared Tabor 68f619e358 Job Detail Results panel tweaks after UX review 2016-02-19 10:23:18 -08:00
Michael Abashian fffa590a82 Merge pull request #994 from mabashian/stdout-results 
Added standard out details to inventory sync, management jobs and scm updates
 2016-02-19 13:02:48 -05:00
Michael Abashian 81e044c97c Added standard out details to inventory sync, management jobs and scm updates. 2016-02-19 10:41:17 -05:00
Jared Tabor 95467a6b97 Restyling of job detail results panel 2016-02-18 19:38:49 -08:00
Wayne Witzel III fb5369404d (HACK) bump values while we investigate slowness 2016-02-18 15:33:27 -05:00
Jared Tabor 8f1c88e35d adding less file 2016-02-18 12:27:30 -08:00
Akita Noek d3c620926a Merge pull request #990 from anoek/devel 
Updated API test fixtures
 2016-02-18 13:37:04 -05:00
Wayne Witzel III 65c20e9de2 use objects instead of _default_manager 2016-02-18 13:36:36 -05:00
Akita Noek 0051464525 Added put,head,options,delete, & patch test fixtures for api related tests 2016-02-18 11:23:31 -05:00
Akita Noek 6aeaec2b76 Switch to resolve in api test fixtures to automatically resolve View's and their arguments 
Also changed the signature of the post/get methods to better align with
libraries like `requests`
 2016-02-18 11:19:27 -05:00
Michael Abashian 7dbb69dd6d Accidentally included JobDetailController in app.js during my last merge. This is now pulled in via the job detail module. 2016-02-18 10:04:12 -05:00
Wayne Witzel III 30f88b6e30 Added redis in-memory fixture for functional tests 2016-02-18 09:51:32 -05:00
Michael Abashian ce8f40277c Merge branch 'remove-standalone-stdout' into devel 2016-02-18 09:47:01 -05:00
Jared Tabor 673611b7bd Merge pull request #985 from jaredevantabor/job-detail-results 
Initial restructuring of Job Detail code
 2016-02-17 14:25:55 -08:00
Jared Tabor 8ec19f9226 Initial restructuring of Job Detail code 
To use our new modular approach to organizing code by feature
 2016-02-17 13:53:18 -08:00
Michael Abashian e9899c278f Modularized Standard Out/Job details for all jobs that are not playbook runs. This is mostly scaffolding. 2016-02-17 15:54:53 -05:00
Wayne Witzel III d464ea0f56 Merge branch 'devel' into rbac 2016-02-17 14:26:05 -05:00
Wayne Witzel III 74e1554463 Only touch the attribute if it does not exist to avoid recursion in activity streams 2016-02-17 11:59:06 -05:00
Wayne Witzel III 241ee09fff Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-02-17 11:23:18 -05:00
Chris Church 8b2e699ea7 Merge pull request #972 from AlanCoding/755_related_job_templates 
Add job_template related list to inventory endpoint
 2016-02-16 23:04:11 -05:00
Wayne Witzel III 5306eaa98c more access tests and a Makefile driveby 2016-02-16 21:04:33 -05:00
Chris Meyers 6434171977 add -y to ansible ppa adding 2016-02-16 13:51:16 -05:00
Wayne Witzel III 40ec6a2da2 Fix rbac cred tests 2016-02-16 10:59:53 -05:00
AlanCoding 33e84d03ef add job_template related list to inventory endpoint 2016-02-16 10:12:35 -05:00
Michael Abashian 67b5dcd817 Merge pull request #929 from jlmitch5/schedulerFormStylingFinal 
Scheduler form styling fixes
 2016-02-16 10:07:02 -05:00
Wayne Witzel III a8a0cd380d Merge pull request #970 from wwitzel3/rbac 
RBAC: access unit tests and new migration
 2016-02-16 10:02:01 -05:00
John Mitchell b3667ce56a combine sleect2 creation into single class 2016-02-16 14:37:57 +00:00
John Mitchell ffcb8ec65d update less to improve color default 2016-02-16 14:30:11 +00:00
Wayne Witzel III 017a7ee060 Updating RBAC migrations 2016-02-16 08:53:35 -05:00
Wayne Witzel III 7260c1cc0e Added credential access tests 2016-02-15 16:32:42 -05:00
Leigh bed6c666ae Merge pull request #928 from leigh-johnson/OrgPaginate 
#646 Handle case where page 2 of OrganizationList was being hidden
 2016-02-15 15:01:27 -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
Leigh f7ec61f452 Merge pull request #959 from leigh-johnson/ModalBackdrop 
#875 add backdrop: static  to modal.Constructor.DEFAULTS
 2016-02-15 12:17:18 -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
Leigh Johnson 9278a50029 remove EDIT from edit org breadcrumb label, trim whitespace, add text-uppercase to .BreadCrumb-item 2016-02-15 11:36:46 -05:00
Michael Abashian 5e3e8862f3 Merge pull request #960 from mabashian/stream-awfeature 
Hide Activity Stream button when the feature is turned off
 2016-02-15 11:08:37 -05:00
Michael Abashian f2f9dc4703 Removed jshint comment 2016-02-15 11:04:38 -05:00
Akita Noek e0371f3745 Switched back to multiple-organizations for Projects 2016-02-15 10:43:50 -05:00