18562 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Aaron Tan	962de13965	Merge pull request #503 from jangsutsr/fix-7712 ... [3.2.2]Special handle host related_search_fields	2017-10-27 11:16:09 -04:00
Aaron Tan	7211ff22df	Special handle host related_search_fields ... Relates #7712 of ansible-tower. UI uses `related_search_fields` list to populate help text for resourse search, `ansible_facts` is searchable via UI but the general pickup logic would ignore it. So make it a corner case. Signed-off-by: Aaron Tan <jangsutsr@gmail.com>	2017-10-27 10:55:43 -04:00
Alan Rominger	003d7f0915	Merge pull request #543 from AlanCoding/urlencode_host_filter ... [3.2.2] urlencode unquote host_filter on save	2017-10-27 08:50:39 -04:00
Matthew Jones	f019452207	Merge pull request #551 from ansible/tower_inventory_source ... Tower inventory source	2017-10-27 08:41:24 -04:00
Alan Rominger	c323a2393a	Merge pull request #552 from AlanCoding/retry_cleanup ... [3.2.2] retry cleanup of build artifacts for bwrap race condition	2017-10-27 08:23:28 -04:00
Matthew Jones	85be3c7692	Align inventory variables with Ansible modules	2017-10-27 08:12:14 -04:00
Matthew Jones	5f3ebc26e0	Adding license checks for Tower inventory source ... * For Tower the license must match between the source and destination * For AWX the check is disabled * Hosts imported from another Tower don't count against your license in the local Tower * Fix up some issues with enablement * Prevent slashes from being used in the instance filter * Add &all=1 filter to make sure we pick up all hosts	2017-10-27 08:12:14 -04:00
Matthew Jones	d282966aa1	Use towervars to enable turning on remote tracking vars on Tower src ... * This allows the local Tower to track enabled state and unique instance id for each host imported from the remote Tower	2017-10-27 08:12:14 -04:00
Matthew Jones	71e132ce0f	Show instance filter ui element with tower inventory source	2017-10-27 08:12:14 -04:00
Jake McDermott	d6d84e8f5e	use abbreviated month name for dashboard chart	2017-10-26 21:44:01 -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
Matthew Jones	fdc7f58bb4	Support passing instance filters to tower inventory src ... * Switch ignore ssl errors to default on * Application inventory source defaults for Tower src	2017-10-26 13:51:05 -04:00
Matthew Jones	6c597ad165	Adding initial credential and invsrc for Tower ... * New credential type for Tower * Inventory source definitions and migrations for Tower * Initial Tower inventory source script	2017-10-26 13:51:05 -04:00
AlanCoding	48ec69c4f5	retry cleanup of build artifacts for bwrap race condition	2017-10-26 13:33:21 -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
Aaron Tan	1ea3d55167	Merge pull request #550 from jangsutsr/fix-7737-1 ... Follow up fix #7737	2017-10-26 11:29:05 -04:00
AlanCoding	b4a446dba0	raise error for invalid type lookup	2017-10-26 11:25:40 -04:00
Aaron Tan	7181bd1c9b	Follow up fix #7737 ... The original fix introduced migration failure, this PR managed to fix that. Signed-off-by: Aaron Tan <jangsutsr@gmail.com>	2017-10-26 11:15:07 -04:00
Ryan Petrello	9e8ac3b09b	Merge pull request #547 from ryanpetrello/fix-cleanup-memory-usage ... [3.2.2] Backport (from awx) various memory optimizations for job cleanup	2017-10-26 10:39:58 -04:00
Aaron Tan	e24e1fc1f0	Merge pull request #542 from jangsutsr/fix-7737 ... [3.2.2]support `AZURE_CLOUD_ENVIRONMENT`	2017-10-26 10:20:14 -04:00
Aaron Tan	f28b48a473	support AZURE_CLOUD_ENVIRONMENT ... Relates #7737 of ansible-tower. Signed-off-by: Aaron Tan <jangsutsr@gmail.com>	2017-10-26 10:11:21 -04:00
Michael Abashian	4f58537949	Merge pull request #546 from mabashian/6209-license-readonly-auth-forms ... Make codemirror ready-only when auth form field is disabled	2017-10-26 09:58:24 -04:00
mabashian	0512f65c8f	Only pass host filter param to smart inv shortcut form	2017-10-26 09:55:36 -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	871dc81da3	Avoid task duplication by using default(omit).	2017-10-25 21:30:46 -04:00
mabashian	947bdeed3e	Fixed related host list linking	2017-10-25 16:59:44 -04:00
Bill Nottingham	1285e8ffef	Add blocks around the different SCMs, for clarity purposes.	2017-10-25 16:58:41 -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
Mike McMahon	d3a7bec674	Backport (from awx) various memory optimizations for job cleanup ... see: https://github.com/ansible/ansible-tower/issues/7751 0388568 Reduces the job to only looking at objects older than the cutoff date 0234311 missing colon and missing variable usage 399e0e5 switching to iterator and adding the missed Job cleanup 0cd34c1 jobs take count of gte cutoff, process only lt cutoff	2017-10-25 12:17:46 -04:00
Ryan Petrello	652facba9f	Merge pull request #545 from ryanpetrello/fix-7746 ... work around an ansible bug that can cause project syncs to fail	2017-10-25 11:37:15 -04:00
mabashian	b1ef7506ea	Make codemirror ready-only when auth form field is disabled	2017-10-25 11:30:26 -04:00
Ryan Petrello	c95d7d465a	work around an ansible bug that can cause project syncs to fail ... https://github.com/ansible/ansible-tower/issues/7746 https://github.com/ansible/ansible/issues/30064	2017-10-25 11:09:39 -04: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
Michael Abashian	70919638ba	Merge pull request #541 from mabashian/7608-adhoc-launch-modal ... Made adhoc launch modal height dynamic	2017-10-24 14:07:32 -04:00
Michael Abashian	6ea48cd73e	Merge pull request #540 from mabashian/6370-delete-inv-src ... Delete inv source hosts before inv source	2017-10-24 14:07:08 -04:00