summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Additional UI/JS licenses (#2974)Graham Mainwaring2016-07-142-0/+39
* Merge pull request #3010 from anoek/3006Akita Noek2016-07-142-0/+29
|\
| * Added patch tests for updating project organizationsAkita Noek2016-07-141-0/+8
| * Don't let normal users create orgless projectsAkita Noek2016-07-142-0/+21
* | Merge pull request #3003 from AlanCoding/2988_team_cascadeAlan Rominger2016-07-144-2/+73
|\ \
| * | Team organization field made non-nullAlanCoding2016-07-142-2/+3
| * | Cascade delete teams when their organization is deletedAlanCoding2016-07-144-1/+71
* | | Merge pull request #3011 from AlanCoding/docker_atomicAlan Rominger2016-07-141-0/+1
|\ \ \
| * | | Make development environment use ATOMIC_REQUESTSAlanCoding2016-07-141-0/+1
|/ / /
* | | Merge pull request #3005 from matburt/delete_protectionMatthew Jones2016-07-143-9/+46
|\ \ \
| * | | Fix up some flake8 issuesMatthew Jones2016-07-142-4/+1
| * | | Add delete protection from certain objectsMatthew Jones2016-07-142-6/+46
| | |/ | |/|
* | | Merge pull request #2996 from jaredevantabor/missing-jtJared Tabor2016-07-143-64/+79
|\ \ \ | |/ / |/| |
| * | Show proper error message for missing job template formJared Tabor2016-07-143-64/+79
* | | Merge pull request #3000 from kensible/2999-JT-cloud-credentialskensible2016-07-141-1/+1
|\ \ \
| * | | Changed conditonal to repair console error and page loade errorKen Hoes2016-07-141-1/+1
* | | | Merge pull request #3001 from anoek/misc-fixesAkita Noek2016-07-144-6/+9
|\ \ \ \
| * | | | Updated tests to reflect credential access after migrationsAkita Noek2016-07-141-3/+5
| * | | | Fix team credential role access in rbac migrationAkita Noek2016-07-141-1/+2
| * | | | Orphan handling in _old_access.pyAkita Noek2016-07-141-1/+1
| * | | | Normalized CustomInventoryScriptAccess.can_adminAkita Noek2016-07-141-1/+1
* | | | | Merge pull request #2998 from mabashian/adhoc-lots-of-getsMichael Abashian2016-07-141-0/+6
|\ \ \ \ \
| * | | | | Remove socket binding when the scope is destroyed so that we don't make erran...Michael Abashian2016-07-141-0/+6
|/ / / / /
* | | | | Merge pull request #2997 from wenottingham/you-laBill Nottingham2016-07-141-2/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | updated EULA text from rnalenBill Nottingham2016-07-141-2/+18
|/ / / /
* | | | Merge pull request #2993 from kensible/2969-JT-edit-accesskensible2016-07-141-10/+3
|\ \ \ \
| * | | | Added condition based off PR feedbackKen Hoes2016-07-141-1/+1
| * | | | Retrieved cloud credential from job template summary fieldsKen Hoes2016-07-131-10/+3
* | | | | Merge pull request #2986 from mabashian/callback-url-promptMichael Abashian2016-07-141-1/+1
|\ \ \ \ \
| * | | | | Fixed callback url prompt stylingMichael Abashian2016-07-131-1/+1
| |/ / / /
* | | | | Merge pull request #2983 from mabashian/job-launch-state-exitMichael Abashian2016-07-148-1/+99
|\ \ \ \ \
| * | | | | Added onExit functions to routes where the job launch and survey maker modals...Michael Abashian2016-07-138-1/+99
* | | | | | Merge pull request #2971 from kensible/2964-inventory-history-xsskensible2016-07-141-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Added sanitize filter to other name instancesKen Hoes2016-07-131-2/+2
| * | | | | Sanitizing name in popupKen Hoes2016-07-131-1/+1
* | | | | | remove type search field from single-type credential lookup modals, resolves ...Leigh Johnson2016-07-136-0/+22
| |_|/ / / |/| | | |
* | | | | URI-encode text searches, resolves #2980 (#2982)Leigh Johnson2016-07-131-1/+1
| |/ / / |/| | |
* | | | supply correct params to ParseTypeChange call, resolves #2966 (#2977)Leigh Johnson2016-07-131-1/+2
* | | | Merge pull request #2973 from mabashian/owner-machine-credentialMichael Abashian2016-07-131-0/+1
|\ \ \ \
| * | | | Credential owners are no longer searchableMichael Abashian2016-07-131-0/+1
* | | | | Revert required org on notification templatesMatthew Jones2016-07-131-8/+0
|/ / / /
* / / / Fix an ommitted fields 500 errorMatthew Jones2016-07-131-0/+4
|/ / /
* | / Fix typo in sub_list_create_api_viewJames Laska2016-07-131-1/+1
| |/ |/|
* | Merge pull request #2963 from jaredevantabor/missing-jtJared Tabor2016-07-132-4/+3
|\ \
| * | removing logic in job detail page related to scm updatesJared Tabor2016-07-132-4/+2
| * | Check for object keys to avoid console errorJared Tabor2016-07-131-1/+2
|/ /
* | Merge branch 'release_3.0.0' of github.com:ansible/ansible-tower into release...Leigh Johnson2016-07-121-0/+5
|\ \
| * | avoid building urls to deleted resources, resolves #2948 (#2956)Leigh Johnson2016-07-121-0/+5
* | | Merge branch '2947' into release_3.0.0Leigh Johnson2016-07-122-0/+3
|\ \ \ | |/ / |/| |
| * | fix prompt-for machine cred query params tooLeigh Johnson2016-07-121-1/+2