summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Moved awx packages inside venv, restructured spec file, restructured MakefileGraham Mainwaring2016-03-252-18/+14
* Preliminary EL6 SCL Python 2.7 supportGraham Mainwaring2016-03-238-31/+26
* Merge branch 'python27_el6' of github.com:ghjm/ansible-tower into python27_el6Graham Mainwaring2016-03-210-0/+0
|\
| * MergeGraham Mainwaring2016-03-210-0/+0
| |\
| | * Merge pull request #1200 from matburt/python27_el6Matthew Jones2016-03-0913-177/+184
| | |\
| | | * Changes for Tower virtualenv supportMatthew Jones2016-03-0913-177/+184
| | |/
| * | Add script wrapper to establish Tower SCL and venv before running PythonGraham Mainwaring2016-03-211-0/+18
| * | Builds an RPM for EL6 with SCL python27 and httpd24Graham Mainwaring2016-03-212-11/+28
| * | Changes for Tower virtualenv supportMatthew Jones2016-03-2113-168/+180
* | | Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6Graham Mainwaring2016-03-21138-158565/+4412
|\ \ \
| * \ \ Merge pull request #1282 from anoek/develAkita Noek2016-03-185-5/+5
| |\ \ \
| | * | | Renamed migrations to be a little more descriptiveAkita Noek2016-03-185-5/+5
| |/ / /
| * | | Merge pull request #1275 from chrismeyersfsu/playbook_state_admin_passwordChris Meyers2016-03-180-0/+0
| |\ \ \
| * | | | Merge pull request #1277 from chrismeyersfsu/playbook_fix_redisChris Meyers2016-03-180-0/+0
| |\| | |
| * | | | fixes MONGO_HOST not found errorChris Meyers2016-03-181-1/+1
| * | | | Merge pull request #1274 from ansible/revert-1213-revert-1208-mongoectomy_pac...Chris Meyers2016-03-180-0/+0
| * | | | Merge pull request #1272 from AlanCoding/container_tower_packageAlan Rominger2016-03-182-3/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix regression of development package namingAlanCoding2016-03-182-3/+2
| |/ / /
| * | | Merge pull request #1205 from chrismeyersfsu/mongoectomy_playbookChris Meyers2016-03-170-0/+0
| |\ \ \
| * \ \ \ Merge pull request #1264 from kensible/688-orgCards-countskensible2016-03-1714-438/+618
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Removed unused routesKen Hoes2016-03-171-55/+0
| | * | | Added counts to organizations listingKen Hoes2016-03-162-7/+13
| | * | | Merge branch '1259-organizations-modules' into 688-orgCards-countsKen Hoes2016-03-1614-437/+666
| | |\ \ \
| | | * | | Split up and modularized organizationsKen Hoes2016-03-1514-437/+666
| * | | | | Remove unneeded fetch for r/o fieldsMatthew Jones2016-03-161-18/+0
| * | | | | Disallow related elements to be treated as choicesMatthew Jones2016-03-161-14/+25
| * | | | | Fix up the docker-refresh Makefile targetMatthew Jones2016-03-161-4/+6
| |/ / / /
| * | | | Merge pull request #1230 from AlanCoding/647_org_summary_numbersAlan Rominger2016-03-163-0/+228
| |\ \ \ \
| | * | | | reduce test to only check project inventory connectionAlanCoding2016-03-151-32/+21
| | * | | | org counts code restructing to better prepare for RBAC mergeAlanCoding2016-03-153-38/+86
| | * | | | style tweaks, add one more assertionAlanCoding2016-03-142-4/+3
| | * | | | test and fix for POST to empty list scenaro and JT count fixAlanCoding2016-03-143-11/+67
| | * | | | fix for POST scenarioAlanCoding2016-03-131-12/+8
| | * | | | Added queries that calculate counts for organization resourcesAlanCoding2016-03-133-0/+140
| * | | | | Merge pull request #1237 from kensible/1231-lookupModal-specskensible2016-03-162-0/+5
| |\ \ \ \ \
| | * | | | | Lookup modal not-resizableKen Hoes2016-03-141-1/+1
| | * | | | | Increase specificity and keep y-scrollbar for long name edge cases.Ken Hoes2016-03-142-3/+4
| * | | | | | Merge pull request #1246 from leigh-johnson/JobDetailServiceLeigh2016-03-155-59/+160
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Yoink REST calls from Job Details controller into modular service, resolves #...Leigh Johnson2016-03-155-59/+160
| | | |/ / / | | |/| | |
| * | | | | Pass, don't return pass when checking mongo connectivityMatthew Jones2016-03-141-1/+1
| * | | | | Handle a mongo OperationFailureMatthew Jones2016-03-141-0/+7
| * | | | | Merge pull request #1235 from ansible/revert-1234-1231-lookupModal-specskensible2016-03-142-4/+0
| |\ \ \ \ \
| | * | | | | Revert "Lookup modal feedback from demo prep"kensible2016-03-142-4/+0
| |/ / / / /
| * | | | | Merge pull request #1234 from kensible/1231-lookupModal-specskensible2016-03-142-0/+4
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * / / Lookup modal feedback from demo prepKen Hoes2016-03-142-0/+4
| |/ / /
| * | | Merge pull request #1226 from leigh-johnson/CopyJobTemplate2Leigh2016-03-1215-208/+175
| |\ \ \
| | * | | revert unintended change to awx-munin.confLeigh Johnson2016-03-111-4/+9
| | * | | refactor delete-job-template.service-test, integrate jobTemplate.copy, resolv...Leigh Johnson2016-03-1115-215/+177
| * | | | Make sure we are covering system jobs and template on notificationsMatthew Jones2016-03-117-1/+58
| * | | | Fix fact database migrationMatthew Jones2016-03-114-3/+8