summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixing code of conduct urlGreg DeKoenigsberg2017-09-081-1/+1
* Merge pull request #46 from swills/install-req-gmake-gitWayne Witzel III2017-09-081-0/+2
|\
| * add missing build depsSteve Wills2017-09-071-0/+2
* | Merge pull request #61 from Numblesix/develWayne Witzel III2017-09-081-0/+5
|\ \
| * | Ensure Docker is running fixes #59Sandro Emma2017-09-081-0/+5
* | | Merge pull request #60 from FooBarQuaxx/patch-1Wayne Witzel III2017-09-081-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed typo in supervisor autorestart optionMAA2017-09-081-1/+1
|/ /
* | Merge pull request #51 from puiterwijk/fixbackportRyan Petrello2017-09-081-2/+2
|\ \
| * | Use distutils find_executable instead of whichPatrick Uiterwijk2017-09-081-2/+2
|/ /
* | Merge pull request #42 from geerlingguy/installer-whitespace-cleanupMatthew Jones2017-09-087-21/+16
|\ \
| * | Whitespace cleanup for installer.Jeff Geerling2017-09-077-21/+16
| |/
* | Merge pull request #39 from puiterwijk/fix-nameidMatthew Jones2017-09-071-1/+3
|\ \ | |/ |/|
| * Fix using SAML NameIDPatrick Uiterwijk2017-09-071-1/+3
* | Merge pull request #36 from Zokormazo/fix-typoBill Nottingham2017-09-071-1/+1
|\ \ | |/ |/|
| * Fix typo in contributing guideJulen Landa Alustiza2017-09-071-1/+1
|/
* Merge pull request #29 from bjoernfan/doc-install-fixesBill Nottingham2017-09-071-23/+23
|\
| * doc: Add missing bracket to anchor linkBjörn Pettersson2017-09-071-1/+1
| * doc: Fix docker anchor linksBjörn Pettersson2017-09-071-2/+2
| * doc: Remove trailing whitespaceBjörn Pettersson2017-09-071-19/+19
| * doc: intalling -> installingBjörn Pettersson2017-09-071-1/+1
* | Merge pull request #32 from wenottingham/develBill Nottingham2017-09-071-19/+0
|\ \
| * | Nuke old license file.Bill Nottingham2017-09-071-19/+0
|/ /
* | Merge pull request #18 from jangsutsr/wrap_up_ctint_unit_testsAaron Tan2017-09-075-1/+393
|\ \ | |/ |/|
| * Wrap up Tower configuration unit testsAaron Tan2017-09-055-1/+393
* | Merge pull request #25 from ryanpetrello/develRyan Petrello2017-09-071-1/+1
|\ \
| * | add a badge for shippable build statusRyan Petrello2017-09-071-1/+1
|/ /
* | Merge pull request #24 from ryanpetrello/develRyan Petrello2017-09-073-4/+3
|\ \
| * | fix broken shippable test suiteRyan Petrello2017-09-073-4/+3
|/ /
* | Merge pull request #16 from jlmitch5/newNavjlmitch52017-09-0649-1539/+676
|\ \
| * | implement componenitized navigation and remove old nav and layout codeJohn Mitchell2017-09-0649-1539/+676
| |/
* | Merge pull request #22 from jaredevantabor/spud-logo-placementJared Tabor2017-09-061-1/+1
|\ \
| * | adjusting placement of spud on login screenJared Tabor2017-09-061-1/+1
| |/
* | Merge branch 'awx_installer' into develMatthew Jones2017-09-0625-164/+1244
|\ \
| * | Adds docker installation steps (#15)Chris Houseknecht2017-09-0110-59/+450
| * | Call out eval for setting up the minishift environmentMatthew Jones2017-08-301-1/+1
| * | Support official image builds with awx logosMatthew Jones2017-08-302-5/+33
| * | Add support for standalone docker installMatthew Jones2017-08-297-7/+281
| * | Merge pull request #9 from chouseknecht/awx_installerChris Houseknecht2017-08-294-2/+137
| |\ \
| | * | First iteration on INSTALLChris Houseknecht2017-08-281-2/+112
| | * | Adds edge terminated routeChris Houseknecht2017-08-281-0/+17
| | * | Ignore Pycharm droppingsChris Houseknecht2017-08-282-0/+8
| |/ /
| * | Force reauth docker registry login in installerMatthew Jones2017-08-251-0/+1
| * | Reduce the size of the production container imageMatthew Jones2017-08-223-14/+11
| * | Initial awx installerMatthew Jones2017-08-1816-57/+312
* | | Merge branch 'release_3.2.0' into develMatthew Jones2017-09-06161-6825/+20250
|\ \ \ | |_|/ |/| |
| * | Pull Dutch and Spanish translationsShane McDonald2017-09-064-1518/+12864
| * | Merge pull request #389 from mabashian/7574-smart-inv-host-listMichael Abashian2017-09-063-7/+11
| |\ \
| | * | Remove delete and edit buttons from smart inventory host list. Only option s...mabashian2017-09-013-7/+11
| * | | Merge pull request #394 from marshmalien/fix/7579-test-error-handlingMarliana Lara2017-09-061-1/+4
| |\ \ \
| | * | | Increase verbosity of CTiT Logging test error handlingMarliana Lara2017-09-061-1/+4
| |/ / /