summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable' into develMatthew Jones2016-07-210-0/+0
|\ | | | | | | | | | | | | | | | | * stable: Update 3.0 changelogs Spacing in sh script on merge conflict Update setup for bundled ansible-2 dependencies fix ansible2.0 bundle deps bootstrap Use yum's compare_providers() function instead of just pulling the latest alphabetically.
| * Merge branch 'release_3.0.0' into stableMatthew Jones2016-07-191481-227828/+123087
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release_3.0.0: (2364 commits) remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058) fix missing URI encoding in event summary serch, kickback on #2980 (#3050) Switch base class for StateConflict Fixed password show/hide on enter for survey maker password type previews Fixed password show/hide on enter for survey taker survey questions where type is password Prevent populate_user from being registered multiple times. Fixing iterator used when jobs list refreshes Explicit super user check for JT can_delete Fix for populating teams for LDAP user. Update hubspot template for marketting Fix up flake8 Rolled back the onExit solution previously implemented to handle the backspace navigation on the job launch modal. New solution listens for state changes within the directive and cleans itself up. Switch disallowed object delete to 409 Password enter show/hide fix add test for CustomInventoryScript serializer Fixed bug where hitting enter in a password field in the job launch/survey maker modal would toggle the show/hide. Setting the local var CredentialList to the deep clone seems to be problematic. Moving this out so that the original object itself is overwritten which is how it's done in other places. (#3017) Jobs list page size (#3019) resolves kickback on #2980 (#3008) Use the correct yum attribute name ...
| * \ Merge branch 'release_2.4.5' into stableMatthew Jones2016-06-010-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * release_2.4.5: Update setup for bundled ansible-2 dependencies fix ansible2.0 bundle deps bootstrap Use yum's compare_providers() function instead of just pulling the latest alphabetically.
| * | | Merge branch 'release_2.4.5' into stableMatthew Jones2016-04-2211-26/+80
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release_2.4.5: Remove distribute from the setup virtualenv if installed (#1631) Update changelogs for 2.4.5 release Only export changed targets in reprepro Improve the efficiency of the stdout dump database migration Added logic to not show the loop summary events in the UI by looking at event_data.event_loop. Handle runner items from ansible v2 bump boto fix case of Ansible v2 _result.cmd is list for release 2.4.5 Handle both string and list hosts in our hosts->name conversion Default play names to the hosts the play was run against Use better isinstance(x) type checking Backporting test fixes from PR #1020: Fix error with ad hoc command events when running in check mode. Fix for tasks breaking when using 'yum' with ansible 1.9.4 Bump 2.4.5 version, changelogs, and reprepo
* | | | Merge branch 'release_3.0.0' into develMatthew Jones2016-07-1927-144/+129
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release_3.0.0: (22 commits) remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058) fix missing URI encoding in event summary serch, kickback on #2980 (#3050) Switch base class for StateConflict Fixed password show/hide on enter for survey maker password type previews Fixed password show/hide on enter for survey taker survey questions where type is password Prevent populate_user from being registered multiple times. Fixing iterator used when jobs list refreshes Explicit super user check for JT can_delete Fix for populating teams for LDAP user. Update hubspot template for marketting Fix up flake8 Rolled back the onExit solution previously implemented to handle the backspace navigation on the job launch modal. New solution listens for state changes within the directive and cleans itself up. Switch disallowed object delete to 409 Password enter show/hide fix add test for CustomInventoryScript serializer Fixed bug where hitting enter in a password field in the job launch/survey maker modal would toggle the show/hide. Setting the local var CredentialList to the deep clone seems to be problematic. Moving this out so that the original object itself is overwritten which is how it's done in other places. (#3017) Jobs list page size (#3019) resolves kickback on #2980 (#3008) add read_role to organization select_related ...
| * | | remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058)Leigh Johnson2016-07-181-5/+0
| | | |
| * | | fix missing URI encoding in event summary serch, kickback on #2980 (#3050)Leigh Johnson2016-07-181-1/+1
| | | |
| * | | Switch base class for StateConflictMatthew Jones2016-07-181-3/+2
| | | | | | | | | | | | | | | | This fixes the output format for the 409 exception return
| * | | Merge pull request #3045 from mabashian/password-show-hideMichael Abashian2016-07-182-2/+2
| |\ \ \ | | | | | | | | | | Fixed password show/hide on enter for survey taker password
| | * | | Fixed password show/hide on enter for survey maker password type previewsMichael Abashian2016-07-181-1/+1
| | | | |
| | * | | Fixed password show/hide on enter for survey taker survey questions where ↵Michael Abashian2016-07-181-1/+1
| |/ / / | | | | | | | | | | | | type is password
| * | | Prevent populate_user from being registered multiple times.Chris Church2016-07-151-1/+1
| | | |
| * | | Merge pull request #3015 from AlanCoding/org_read_roleAlan Rominger2016-07-151-1/+1
| |\ \ \ | | | | | | | | | | Add read_role to organization select_related
| | * | | add read_role to organization select_relatedAlanCoding2016-07-141-1/+1
| | | | |
| * | | | Merge pull request #3022 from wwitzel3/issue-2979Wayne Witzel III2016-07-152-3/+49
| |\ \ \ \ | | | | | | | | | | | | Fix sysadmin and sysauditor viewing orphan inventory script.
| | * | | | add test for CustomInventoryScript serializerWayne Witzel III2016-07-151-2/+46
| | | | | |
| | * | | | ensure system admin/auditor can see orphan inventory scriptsWayne Witzel III2016-07-141-1/+3
| | | | | |
| * | | | | Merge pull request #3025 from jaredevantabor/jobs-list-page-sizeJared Tabor2016-07-151-3/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixing iterator used when jobs list refreshes
| | * | | | | Fixing iterator used when jobs list refreshesJared Tabor2016-07-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it was still using the iterators used when there were four job panes
| * | | | | | Merge pull request #3026 from mabashian/backspace-job-launchMichael Abashian2016-07-159-85/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Better fix for the job launch modal backspace bug
| | * | | | | | Rolled back the onExit solution previously implemented to handle the ↵Michael Abashian2016-07-159-85/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backspace navigation on the job launch modal. New solution listens for state changes within the directive and cleans itself up.
| * | | | | | | Merge pull request #3023 from mabashian/job-launch-password-enterMichael Abashian2016-07-153-10/+10
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Job Launch/Survey Maker enter in password fields would show/hide password
| | * | | | | | Password enter show/hide fixMichael Abashian2016-07-151-1/+1
| | | | | | | |
| | * | | | | | Fixed bug where hitting enter in a password field in the job launch/survey ↵Michael Abashian2016-07-152-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maker modal would toggle the show/hide.
| * | | | | | | Explicit super user check for JT can_deleteMatthew Jones2016-07-151-1/+1
| | | | | | | |
| * | | | | | | Fix for populating teams for LDAP user.Chris Church2016-07-151-1/+1
| | | | | | | |
| * | | | | | | Fix up flake8Matthew Jones2016-07-151-1/+1
| | |/ / / / / | |/| | | | |
| * | | | | | Switch disallowed object delete to 409Matthew Jones2016-07-153-25/+45
| |/ / / / / | | | | | | | | | | | | | | | | | | In the case of running job conflicts
| * | | | | Setting the local var CredentialList to the deep clone seems to be ↵Michael Abashian2016-07-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | problematic. Moving this out so that the original object itself is overwritten which is how it's done in other places. (#3017)
| * | | | | Jobs list page size (#3019)Jared Tabor2016-07-152-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changing jobs list page size to 20 by default it was previously set to 10 * adjustment to tag search check for null id
| * | | | | resolves kickback on #2980 (#3008)Leigh Johnson2016-07-152-4/+4
| | | | | |
| * | | | | Merge pull request #3014 from AlanCoding/migration_touchupAlan Rominger2016-07-141-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Switch order in migration 0026
| | * | | | switch order in migrationAlanCoding2016-07-141-1/+1
| |/ / / /
* | | | | Merge branch 'release_3.0.0' into develMatthew Jones2016-07-14123-1368/+1975
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * release_3.0.0: (129 commits) Use the correct yum attribute name Fix NaN / invalid end date value in schedule edit forms (#3007) resolves kickback on #2976 (#3009) Additional UI/JS licenses (#2974) Install at when configuring on-book AMI conf Added patch tests for updating project organizations Make development environment use ATOMIC_REQUESTS Team organization field made non-null Don't let normal users create orgless projects Fix up some flake8 issues Add delete protection from certain objects Cascade delete teams when their organization is deleted Updated tests to reflect credential access after migrations Changed conditonal to repair console error and page loade error Remove socket binding when the scope is destroyed so that we don't make errant GET requests in future instances of this controller. updated EULA text from rnalen Fix team credential role access in rbac migration Orphan handling in _old_access.py Normalized CustomInventoryScriptAccess.can_admin Use simplified epel-release links ...
| * | | | Fix NaN / invalid end date value in schedule edit forms (#3007)Leigh Johnson2016-07-141-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix NAN on end date issue affecting schedule edit form, resolves #2817 * remove debug statement
| * | | | resolves kickback on #2976 (#3009)Leigh Johnson2016-07-145-1/+7
| | | | |
| * | | | Additional UI/JS licenses (#2974)Graham Mainwaring2016-07-142-0/+39
| | | | | | | | | | | | | | | * Additional UI/JS licenses
| * | | | Merge pull request #3010 from anoek/3006Akita Noek2016-07-142-0/+29
| |\ \ \ \ | | | | | | | | | | | | Don't let normal users create orgless projects
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | #3006
| * | | | | Merge pull request #3003 from AlanCoding/2988_team_cascadeAlan Rominger2016-07-144-2/+73
| |\ \ \ \ \ | | | | | | | | | | | | | | Cascade delete teams from organization
| | * | | | | 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_REQUESTS
| | * | | | | | Make development environment use ATOMIC_REQUESTSAlanCoding2016-07-141-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #3005 from matburt/delete_protectionMatthew Jones2016-07-143-9/+46
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add delete protection from certain objects
| | * | | | | | Fix up some flake8 issuesMatthew Jones2016-07-142-4/+1
| | | | | | | |
| | * | | | | | Add delete protection from certain objectsMatthew Jones2016-07-142-6/+46
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Certain objects can be sensitive to being deleted while jobs are running, this protects those objects
| * | | | | | Merge pull request #2996 from jaredevantabor/missing-jtJared Tabor2016-07-143-64/+79
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Show proper error message for missing job template form
| | * | | | | Show proper error message for missing job template formJared Tabor2016-07-143-64/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | when visiting the job template page for a job template that has been deleted or doesn't exist, we want to show the 404 error message, not an error message about tags or labels.