External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity
15,275 Commits 54 Branches 19 Tags
Commit Graph

15275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Ladd
84c439b774
Merge pull request #542 from jladdjr/awx_349_acceptance_doc 
Update custom credential document for mult-file injection
 2017-10-31 19:14:37 -04:00
Jim Ladd
655759a5fc
Update custom credential document for mult-file injection 2017-10-31 16:34:03 -04:00
Jake McDermott
6c85902ce8
Merge pull request #541 from jakemcdermott/update-credentials-title-selector 
fix credentials form title selector
 2017-10-31 16:30:00 -04:00
Jake McDermott
ef0c2086eb
fix credentials form title selector when running container chrome 2017-10-31 16:11:44 -04:00
Matthew Jones
ffb148aaa9
Merge pull request #534 from dleehr/fix-install-2.3 
Updates INSTALL.md to reflect Ansible 2.4 requirement
 2017-10-31 15:07:06 -04:00
Dan Leehr
641897713f
Updates INSTALL.md to reflect Ansible 2.4 requirement 2017-10-30 22:41:58 -04:00
Ryan Petrello
0876d7825c
Merge pull request #520 from ryanpetrello/phantom-version-comment 
help people avoid mistakenly inputting their version info as a comment
 2017-10-27 14:59:11 -04:00
Ryan Petrello
3953366a9e
help people avoid mistakenly inputting their version info as a comment 2017-10-27 14:43:20 -04:00
Alan Rominger
d7f5ef6564
Merge pull request #511 from AlanCoding/wrong_type_error 
raise error for invalid type lookup
 2017-10-27 14:14:11 -04:00
Matthew Jones
63cf681369
Merge pull request #418 from Comradephate/patch-1 
Divorce the "local docker install" portion of the install playbook from the image build + push logic
 2017-10-27 12:31:09 -04:00
Jared Tabor
a0f1c8fc7c Merge pull request #499 from jaredevantabor/project-based-nav 
Adding Project Based Navigation of Job Templates
 2017-10-26 18:11:34 -07:00
Jared Tabor
4fbfddaa93
changes from PR feedback: removing ghost action icon 
and fixing a bug where the list of job templates was improperly
updated when a job was running and live events were received.
 2017-10-26 16:50:12 -07:00
Alan Rominger
bc7793def1 Merge pull request #494 from AlanCoding/get_queryset_modest_refactor 
Refactor get_queryset inside of access.py
 2017-10-26 13:52:08 -04:00
AlanCoding
4e16b19ae6
Refactor access.py get_queryset into filtering method 
Use BaseAccess class to enforce the superuser and system
  auditor conditions, as well as the optimizations.
Declare optimizations on access class as tuple.
Limit role of access class method narrowly to RBAC filtering.
 2017-10-26 11:40:08 -04:00
AlanCoding
b4a446dba0
raise error for invalid type lookup 2017-10-26 11:25:40 -04:00
Alan Rominger
641b18fe13 Merge pull request #509 from AlanCoding/lib_test_fixes 
update tests to new Ansible core code
 2017-10-26 09:28:52 -04:00
Bill Nottingham
c680327ec3 Merge pull request #506 from wenottingham/its-log 
Remove accidentally committed log files
 2017-10-26 09:17:30 -04:00
AlanCoding
e5d2eb9f3d
update tests to new Ansible core code 2017-10-26 08:34:00 -04:00
Bill Nottingham
da25f4104c Update .gitignore for npm log files. 2017-10-25 21:37:29 -04:00
Bill Nottingham
a8947c3b96 Remove accidentally committed log files 2017-10-25 16:38:56 -04:00
Greg Considine
565d116955 Merge pull request #505 from gconsidine/ui/fix/multiple-dependency-include 
Update dependencies that share Angular as a dependency
 2017-10-25 16:07:29 -04:00
Jake McDermott
1fe9f43690 Merge pull request #502 from jakemcdermott/update_test_config 
test config cleanup and tooling updates
 2017-10-25 15:39:55 -04:00
gconsidine
4a522fd10f
Update dependencies that share Angular as a dependency 2017-10-25 14:48:18 -04:00
Jared Tabor
5e349590fd making JOB TEMPLATES tab the last tab on the projects form 2017-10-25 11:21:36 -07:00
Jared Tabor
625c0ad578 Adding Project Based Navigation of Job Templates 
This adds a Job Templates tab onto the Project form that gives
the user the ability to see all the job templates using a project.
Clicking the add button on this list will take the user to the job
template form with the project field auto-filled with the project.
 2017-10-25 11:21:36 -07:00
Jake McDermott
3800a16f3e
refactor e2e settings and config modules 
This should make the settings and configuration logic less implicit and
a little easier to follow. Some familiarity with the configuration behavior
of nightwatch is still necessary in places - specifically, one should know
that all test_settings defined for non-default environments are treated as
overrides to the values defined for the default environment.
 2017-10-25 10:58:39 -04:00
Jake McDermott
d70a0c8c24
cleanup e2e test development tooling and add readme examples 2017-10-25 10:22:18 -04:00
Aaron Tan
e999b35c42 Merge pull request #493 from jangsutsr/fix-474 
Add protection against credential getattr
 2017-10-25 09:45:25 -04:00
Aaron Tan
553e81f888
Add protection against credential getattr 
Relates #474.

Add protection in `__getattr__` method to prevent possible infinite
recursion loop.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
 2017-10-24 12:08:41 -04:00
Alan Rominger
73ece87e68 Merge pull request #487 from AlanCoding/E722 
flake8: comply with new E722 rule
 2017-10-23 14:58:27 -04:00
AlanCoding
90f63774f4
flake8: comply with new E722 rule 2017-10-23 14:36:48 -04:00
Marliana Lara
17aecc17d2 Merge pull request #472 from marshmalien/angular_upgrade_1_6_6 
Upgrade to AngularJS v1.6.6
 2017-10-23 14:13:11 -04:00
Marliana Lara
9157f53d43
Update angular-scheduler and angular-tz-extensions versions 2017-10-23 12:29:28 -04:00
Marliana Lara
9bb696aa6e
Fix for input directive using strict comparison to determined "checked" row 2017-10-23 12:29:27 -04:00
Marliana Lara
32da686724
Handle errors with ProcessErrors 2017-10-23 12:29:26 -04:00
Marliana Lara
cee81e9df6
Fix any unhandled rejections 2017-10-23 12:29:25 -04:00
Ben Thomasson
b544922da1
Fix incorrect JS syntax 2017-10-23 12:29:24 -04:00
Ben Thomasson
b3c2f35358
Change success to then manually 2017-10-23 12:29:23 -04:00
Ben Thomasson
7d767f8f63
Automatically change .error to .catch. 
Use this script to change .error to .catch using this linux script:

    #!/bin/bash -ex
    #Run in awx/awx/ui/client/src
    FILES=`grep -l -R "\.error(\s*function\s*(data,\s*status)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(data,\s*status)\s*{/.catch(({data, status}) => {/g" $FILES

    FILES=`grep -l -R "\.error(this\.error\.bind(this))" . | xargs`
    sed -i "s/\.error(this\.error\.bind(this))/\.catch(this\.catch\.bind(this))/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*(error)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(error)\s*{/.catch(({error}) => {/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*(obj,\s*status)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(obj,\s*status)\s*{/.catch(({obj, status}) => {/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*(res,\s*status)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(res,\s*status)\s*{/.catch(({res, status}) => {/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*(msg,\s*code)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(msg,\s*code)\s*{/.catch(({msg, code}) => {/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*()\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*()\s*{/.catch(() => {/g" $FILES
 2017-10-23 12:29:22 -04:00
Ben Thomasson
834e6c692c
Automatically change instances of .success to .then with this linux script: 
#Run in awx/awx/ui/client/src

    #!/bin/bash -ex
    FILES=`grep -l -R "\.success(\s*function\s*(data)\s*{" . | xargs`
    sed -i "s/\.success(\s*function\s*(data)\s*{/\.then(({data}) => {/g" $FILES

    FILES=`grep -l -R "\.success(\s*function\s*()\s*{" . | xargs`
    sed -i "s/\.success(\s*function\s*()\s*{/\.then(() => {/g" $FILES

    FILES=`grep -l -R "\.success(this\.success\.bind(this))" . | xargs`
    sed -i "s/\.success(this\.success\.bind(this))/\.then(this\.then\.bind(this))/g" $FILES
 2017-10-23 12:29:21 -04:00
Ben Thomasson
fabdab78ef
Upgrade AngularJS to 1.6.6 2017-10-23 12:29:10 -04:00
Bill Nottingham
a313109b15 Merge pull request #475 from wenottingham/scm-tooltip 
Update tooltip for update-on-launch.
 2017-10-20 10:32:34 -04:00
Ryan Petrello
7b36630f47 Merge pull request #460 from ryanpetrello/cloudforms-cache-path 
store cloudforms inventory cache files in the proper location on disk
 2017-10-20 09:40:02 -04:00
Jaron Rolfe
cc5f329d33 Explanation for image removal block and idiomatic handling of var that enables it 2017-10-19 21:43:37 -04:00
Bill Nottingham
31c1e1684d Update tooltip for update-on-launch. 
This better describes how this setting is used.
 2017-10-19 16:57:50 -04:00
Alan Rominger
083e56d97d Merge pull request #464 from AlanCoding/actiony_permissions 
fix bug where JT admins could not edit spec
 2017-10-19 16:22:14 -04:00
AlanCoding
098a407e25
fix bug where JT admins could not edit spec 2017-10-19 16:05:44 -04:00
Alan Rominger
6347db56c5 Merge pull request #473 from AlanCoding/test_fix_exc 
fix test fallout from 321 merge
 2017-10-19 16:05:01 -04:00
AlanCoding
e660879a00
fix test fallout from 321 merge 2017-10-19 15:47:51 -04:00
Matthew Jones
5635f5fb49
Merge branch 'release_3.2.1' into devel 
* release_3.2.1:
  fallback to empty dict when processing extra_data
  fix migration problem from 3.1.1
  move 0005a migration to 0005b
  feedback on ad hoc prohibited vars error msg
  Fix the way we include i18n files in sdist
  Fix migrations to support 3.1.2 -> 3.2.1+ upgrade path
  fix missing parameter to update_capacity method
  fix WARNING log when launching ad hoc command
  Validate against ansible variables on ad hoc launch
  do not allow ansible connection type of local for ad_hoc
  work around an ansible 2.4 inventory caching bug
  fix scan job migration unicode issue
  Assert isolated nodes have capacity set to 0 and restored based on version
  Set capacity to zero if the isolated node has an old version
 2017-10-19 13:30:26 -04:00