External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-23 15:38:06 -03:30
Code Issues Packages Projects Releases Wiki Activity
12,572 Commits 55 Branches 19 Tags
Commit Graph

12572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Mitchell
baa2481944 fixed localed date stuff 2016-08-26 11:49:31 -04:00
Wayne Witzel III
fbcd14d40b Merge pull request #3347 from wwitzel3/issue-3305 
Ensure deprecated_team.org is passed to credential.
 2016-08-26 09:45:38 -04:00
Matthew Jones
59aed7b318 Merge pull request #3343 from ansible/ramparts_and_ha 
New Development Environment Workflow && Replacing Redis with qpid/memcached
 2016-08-26 09:34:19 -04:00
Chris Church
eb70d8d32e Merge pull request #3255 from cchurch/my-saml-done-froze-up 
Initialize xmlsec once to prevent SAML auth from hanging.
 2016-08-25 23:32:19 -04:00
Bill Nottingham
c2f85d5bfb Remove compatiblity code for pre-1.9 Ansible versions. 2016-08-25 15:41:47 -04:00
Wayne Witzel III
18e4a33404 update test to check org_auditor access 2016-08-25 13:45:13 -04:00
Wayne Witzel III
dbe3f628d4 ensure team organizations are assigned to credentials 2016-08-25 13:44:55 -04:00
Matthew Jones
3382736e70 Put some redis reqs back in until we make the packaging changes 2016-08-25 12:03:33 -04:00
Matthew Jones
b507dc53ea Putting a bow on some of the new dev workflow 
* Documentation of the developer variety
* Defaulting the COMPOSE_TAG to develop, can be overridden
* Automatic docker login assuming gcr login
* Including a manual build step as an alternative to gcr
* Make qpid container shut the f**k up when it's running
 2016-08-25 11:57:31 -04:00
Matthew Jones
c8e2f73d48 Support pulling the dev container image from gcr 
This will be branch-relative.  If you are ont he `devel` branch then it
will pull that tag, it will try to pull the branch you are on and can be
overridden with the COMPOSE_TAG environment variable
 2016-08-24 22:45:20 -04:00
Matthew Jones
dcb4959443 Initial qpid development work 
* Switch base tower devel image from u14.04 to c7
* Switch container image to build python dependencies into itself
  instead of forcing it to be built on startup
* Upgrade venv pip to 8.1.2
* Neuter queue.py which was heavily tied to redis and was basically
  orphaned code
* Alter local_settings to override default cache settings and use
  memcached
* Alter local settings to refer to qpid instead of redis for celery
  broker
* Purge redis python dependencies and add qpid and memcached
* Update docker-compose to purge redis and add qpid and memcached
 2016-08-24 16:23:47 -04:00
AlanCoding
50ec9ca259 temporarily pin the pytest version until the ldap error can be fixed 2016-08-24 15:54:33 -04:00
John Mitchell
d7b79c5f08 fixed locale 2016-08-24 11:50:56 -04:00
jlmitch5
0baeafa1f1 fix date locale angular scheduler 2016-08-24 11:39:16 -04:00
AlanCoding
23024c8fad Make sure org admins can see credential after migration, comment updates on related tests 
add clause in test to verify automatic setting of org of new team credential
 2016-08-24 11:36:07 -04:00
Aaron Tan
37e19115a8 Merge pull request #3320 from jangsutsr/3248_resolve_extra_var_n_survey_mess_up 
Resolve extra vars display mix-up with passworded survey questions.
 2016-08-24 11:17:10 -04:00
jangsutsr
8576dcda19 Remove legacy exception handling. 2016-08-24 10:58:53 -04:00
jangsutsr
c3f844cfe0 Add unit test. 2016-08-23 20:00:08 -04:00
Alan Rominger
75f513e591 Merge pull request #3324 from AlanCoding/3305_test_update 
Update team admin credential migration test
 2016-08-23 16:40:31 -04:00
Wayne Witzel III
efa8496407 Merge pull request #3301 from wwitzel3/release_3.0.2 
remove last_name and first_name from admin_only fields
 2016-08-23 15:17:35 -04:00
Wayne Witzel III
c963035178 Merge pull request #3302 from wwitzel3/fix-3153 
prevent non-superusers from adding orphan users
 2016-08-23 15:16:57 -04:00
AlanCoding
bb3e370e56 Update team admin credential migration test to current state-of-knowledge 2016-08-23 14:14:48 -04:00
Leigh Johnson
034f266b07 fix ng-toast rel, resolves #3197 (#3316) 2016-08-23 13:48:10 -04:00
Graham Mainwaring
f36ff01a5b Merge pull request #3312 from ghjm/make_clean_venv 
Clean venv on 'make clean'
 2016-08-23 10:47:47 -04:00
Wayne Witzel III
2fb386b23c allow users to edit their first and last name 2016-08-23 09:55:00 -04:00
jangsutsr
60b7309c08 Resolve extra vars display mix-up with passworded survey questions. 2016-08-22 16:33:03 -04:00
AlanCoding
e461ff0144 Merge branch '2479' of github.com:AlanCoding/ansible-tower into can_CRUD 2016-08-22 15:47:48 -04:00
AlanCoding
eddc1a8ed2 implement two methods for can_edit field for testing 2016-08-22 14:43:04 -04:00
Matthew Jones
965827ca4e Merge pull request #3318 from ansible/revert-3244-3199_ignored_task_result_inconsistent 
Revert "Prevent ignored task from being displayed as failing."
 2016-08-22 13:37:15 -04:00
Matthew Jones
e40a482cc9 Merge pull request #3317 from ansible/revert-3307-3199_2_change_job_event_save_behavior 
Revert "Modify job event save behavior"
 2016-08-22 13:37:04 -04:00
Matthew Jones
6cf567e4fd Revert "Prevent ignored task from being displayed as failing." 2016-08-22 13:34:52 -04:00
Matthew Jones
16fce59512 Revert "Modify job event save behavior" 2016-08-22 13:34:08 -04:00
Aaron Tan
0991e213cc Merge pull request #3252 from jangsutsr/2955_update_system_job_start_access 
Update system job start access
 2016-08-22 12:35:48 -04:00
Matthew Jones
81447df1b1 Merge pull request #3309 from jakemcdermott/bug-3308 
update setup.sh option parser such that -r doesn't expect an argument
 2016-08-22 11:44:19 -04:00
Wayne Witzel III
706e98c392 fixing old tests for new user creation permissions 2016-08-19 18:54:56 -04:00
Graham Mainwaring
f5b4c63173 Clean venv on 'make clean' 2016-08-19 16:28:09 -04:00
Aaron Tan
871ae0f5c7 Merge pull request #3307 from jangsutsr/3199_2_change_job_event_save_behavior 
Modify job event save behavior
 2016-08-19 16:20:13 -04:00
James Laska
08c4c9647b Resolve KeyError by coercing instance_id to a str 
Related #3300
 2016-08-19 15:37:28 -04:00
James Laska
188f81ef3d Update cloudforms dynamic inventory 
Pulling the latest from
https://github.com/ansible/ansible/blob/devel/contrib/inventory/cloudforms.py

Related #3168
 2016-08-19 15:37:28 -04:00
James Laska
a847495bea Update foreman inventory script 
Per request from Red Hat Satellite team, update to the latest foreman.py

https://github.com/theforeman/foreman_ansible_inventory/blob/master/foreman_ansible_inventory.py
 2016-08-19 15:37:28 -04:00
Leigh Johnson
25fa05da81 enable less sourcemaps, add cleanup for npm cmds run with --prefix 2016-08-19 13:16:24 -04:00
Matthew Jones
8893f8278a Merge branch 'release_3.0.2' into devel 
* release_3.0.2: (126 commits)
  Disable permissions tab in Credential > Edit form if Credential is private (#3288)
  Tweaked the popover text for job and skip tags on JT add/edit
  Workaround a cascade setnull polymorphic issue
  flake8
  Fixed old test expectations
  Made it so the credential organization field can't be changed
  Skip some unit tests
  Fixed org auditor visibility of team credentials
  Fix sosreport
  fix credential kind options for list
  interpret any code below 300 as success
  bail when status code is over 300
  Make CloudForms inventory_script work
  Use no_log when handling passwords
  Prevent ignored task from being displayed as failing.
  making ec2 cred optional on group->edit
  making ec2 credential optional for ec2 inventory
  Revert "Fix to ensure org auditors can see team credentials"
  Fixed team credential list to work with corrected permissions
  Making the username and password fields optional
  ...
 2016-08-18 22:52:55 -04:00
jangsutsr
5b00bb14ca Modify job event save behavior 2016-08-18 18:59:33 -04:00
Akita Noek
21d3051ec4 Include user edit/start/delete/copy capabilities to summary fields 
This patch generically adds a map of capabilities that the current user
has on an object, namely can they start, delete, editor, or copy the
object. The intent is that these flags will be used by the UI to disable
buttons that do those things.

 #2479
 2016-08-18 15:14:31 -04:00
Leigh Johnson
fc1ca378d1 Disable permissions tab in Credential > Edit form if Credential is private (#3288) 
* disable permissions tab in credential > edit view if credential is private, resolves #3265

* add tooltip indicating why permissions tab is disabled if cred is private
 2016-08-18 13:49:05 -04:00
Michael Abashian
b25cf0b5cb Merge pull request #3299 from mabashian/3196-skip-tags-help-text 
Tweaked the popover text for job and skip tags on JT add/edit
 2016-08-18 11:39:38 -04:00
Wayne Witzel III
cef7f5a165 prevent non-superusers from adding orphan users 2016-08-18 09:55:20 -04:00
Michael Abashian
52803d2f04 Tweaked the popover text for job and skip tags on JT add/edit 2016-08-17 16:38:29 -04:00
Leigh Johnson
ce61fe4a42 Refactor UI Build System (#3203) 
* initial build trial, clean up awx/ui

* fix hardcoded refs to ng-toast, add jshint preloader

* remove browserify test

* update grunt-jshint -> jshint module loader, browser-sync, update dev targets to build-docker-machine & build-docker-cid, fix blocking tasks

* less autoprefixer

* sample build commands

* fix release build

* update README

* karma config stub

* webpack config for karma tests

* karma preview for shane

* fix build-docker-machine target

* karma+webpack test pipeline configuration, stub tests

* fix smart/job status icons classes

* fix jquery + jsyaml shims, fix LESS cascade

* fix angular-codemirror dependency, explicitly import style/mode dependencies

* shim jsonlint

* fix angular-scheduler AMD imports, remove jquuery-ui shim, fix release config

* use closed $.fn.datepicker for system-tracking

* remove packaging/node/

* remove old tests

* shrinkwrap fragile dependency sandcastle, update README, lint

* first pass at fixing rrule shim

* update makefile targets

* update gitignore w/ new flag file

* add saucelabs karma config

* add license controller test

* add examples of service and directive tests

* Makefile flubs

* consolidate clean-ui target, compulsively update flag file location

* dep on CJS/AMD/UMD compatible version of rrule lib, fix example tests/config for demo

* boilerplate karma config for saucelabs (should be abstracted to common config after proven to work)

* update docs

* docs feedback

* update Dockerfile with Node 6.x dep
 2016-08-17 16:09:54 -04:00
Akita Noek
19fbe4b7fd Merge pull request #3274 from anoek/3081 
Prevent private credentials from being to assigned to teams
 2016-08-17 15:57:59 -04:00