17705 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
John Mitchell	e480639699	Merge pull request #2044 from jlmitch5/fixInvSourceNotifSearch ... fix notifications search on inventory source form tab	2018-06-04 17:55:54 -04:00
Ryan Petrello	bfb8e97a9d	Merge pull request #2051 from ryanpetrello/space-for ... fix a setting help text typo	2018-06-04 16:31:13 -04:00
Ryan Petrello	97fc745329	fix a setting help text typo	2018-06-04 16:28:26 -04:00
Ryan Petrello	5ceeb020cf	Merge pull request #2048 from ryanpetrello/how-do-you-say-violet-in-french ... fix an i18n-related bug that affects non-English hipchat users	2018-06-04 15:26:15 -04:00
Ryan Petrello	581756527e	fix an i18n-related bug that affects non-English hipchat users ... see: https://github.com/ansible/tower/issues/951	2018-06-04 15:02:27 -04:00
Chris Meyers	899084fa75	Merge pull request #1922 from chrismeyersfsu/improvement-accurate_capacity ... per-instance accurate capacity consumption	2018-06-04 14:36:58 -04:00
John Mitchell	f9ed4296bb	fix notifications search on inventory source form tab	2018-06-04 13:51:49 -04:00
John Mitchell	d2858e2d0e	Merge pull request #2016 from jlmitch5/appTabOrgAdmin ... make app tab visiable to org admins	2018-06-04 12:04:16 -04:00
Christian Adams	17bc2a42ab	Merge pull request #2040 from rooftopcellist/oauth2_doc_clean ... updates oauth docs with quickstart	2018-06-04 11:14:18 -04:00
adamscmRH	d885d0fe22	updates oauth docs with quickstart	2018-06-04 10:57:18 -04:00
chris meyers	7b0b4f562d	get isolated execution at the point its needed ... * Instead of passing around the isolated host that the task is to execute on; grab the isolated execution host from the instance further down the call stack. Without passing the isolated hostname around.	2018-06-04 10:06:59 -04:00
chris meyers	b94cf379f6	do not choose offline instances	2018-06-04 10:06:59 -04:00
chris meyers	9d732cdbdf	update unit and functional tests	2018-06-04 10:06:59 -04:00
chris meyers	9863fe71dc	do not require privileged iso container ... * The init call w/ privileged was causing my laptop to wig out. This changeset still functions w/ out requiring privileged access.	2018-06-04 10:06:59 -04:00
chris meyers	8d352a4edf	conform isolated system to new early node choice ... * Randomly chose an instance in the controller instance group for which to control the isolated node run. Note the chosen instance via a job controller_node field	2018-06-04 10:06:59 -04:00
chris meyers	e720fe5dd0	decide the node a job will run early ... * Deciding the Instance that a Job runs on at celery task run-time makes it hard to evenly distribute tasks among Instnaces. Instead, the task manager will look at the world of running jobs and choose an instance node to run on; applying a deterministic job distribution algo.	2018-06-04 10:06:59 -04:00
Alan Rominger	f394c02afd	Merge pull request #2013 from AlanCoding/big_trouble_in_0013 ... Fix tracebacks when running migrations	2018-06-04 09:51:44 -04:00
AlanCoding	239c60a2bd	fix tracebacks when running migrations	2018-06-04 07:35:35 -04:00
Bill Nottingham	7ef32a8827	Merge pull request #2037 from wenottingham/tower-inv-fix ... Fix syntax error	2018-06-02 12:07:00 -04:00
Bill Nottingham	427ea6752e	Fix syntax error	2018-06-01 22:25:46 -04:00
Christian Adams	69a507ae19	Merge pull request #2008 from rooftopcellist/default_scope ... Default scope	2018-06-01 13:43:11 -04:00
adamscmRH	97c5ff0b33	make scope write by default	2018-06-01 13:24:32 -04:00
Jake McDermott	b7bb80c79f	Merge pull request #2020 from sangongs/fix_failed_badge_color ... Fix the color of the tips badge for failed hosts in the host status bar	2018-06-01 11:38:10 -04:00
Guoqiang Zhang	7aa2b7f6a7	Fix the color of the tips badge for failed hosts in the host status bar	2018-06-01 10:25:41 -04:00
Ryan Petrello	330691f4a2	Merge pull request #2019 from ryanpetrello/back-to-the-future ... fix a failing timezone test	2018-06-01 10:14:22 -04:00
Marliana Lara	7a997f0615	Merge pull request #2015 from marshmalien/fix/1970-1885-scheduler-bugs ... Fix invalid schedule warning and disable save button	2018-06-01 10:04:29 -04:00
Ryan Petrello	6183e5166d	fix a failing timezone test	2018-06-01 09:51:42 -04:00
Alan Rominger	a4efd0a5d2	Merge pull request #2005 from AlanCoding/dep_oauth ... Make our oauth model creation a dependency of other app	2018-06-01 09:35:07 -04:00
Ryan Petrello	8c5f3404bf	Merge pull request #2006 from ryanpetrello/port-jinja2-always ... allow Jinja2 in ansible -a when ALLOW_JINJA_IN_EXTRA_VARS is 'always'	2018-06-01 07:32:48 -04:00
Jared Tabor	e2d3a7be26	Merge pull request #1999 from jaredevantabor/fix-1927 ... Fixes URL used for root groups for pagination purposes	2018-05-31 14:14:49 -07:00
Jared Tabor	7549d85619	Merge pull request #2001 from jaredevantabor/fix-741 ... Marking a Configure Tower string for translation	2018-05-31 14:06:06 -07:00
John Mitchell	a20eaae7bc	make app tab visiable to org admins	2018-05-31 17:02:51 -04:00
Haokun Chen	b944f2d681	Merge pull request #1997 from Haokun-Chen/fix-dashboard-icon ... fixed job list action icon on dashboard page for system auditor user	2018-05-31 16:36:16 -04:00
Marliana Lara	2bdb1fc577	Fix scheduler form warning bug and disable save when date options are invalid	2018-05-31 16:31:19 -04:00
Haokun Chen	be4e5c8f06	fixed dashboard icon under job template section for system auditor user ... dashboard icon fixed	2018-05-31 16:18:55 -04:00
Jared Tabor	782b9b8bec	Fixes URL used for root groups for pagination purposes. ... Changes from 'inventories/:inventory_id/root_groups' to 'inventories/:inventory_id/groups'. Includes changing the function name for root groups based on PR feedback.	2018-05-31 13:06:15 -07:00
Jared Tabor	be864012b7	Merge pull request #1957 from jaredevantabor/fix-1824-2 ... Makes rows inactive on permissions list if assigning user doesn't have	2018-05-31 12:43:52 -07:00
Alan Rominger	b3b38777c1	Merge pull request #1994 from AlanCoding/network_client ... Remove network_ui Client model, replace with simple uuid	2018-05-31 15:23:00 -04:00
Marliana Lara	c0b243df7e	Merge pull request #1988 from marshmalien/fix/1883-vault-password-toggle ... Fix vault prompt password show/hide toggle	2018-05-31 14:57:58 -04:00
Marliana Lara	47406b0832	Merge pull request #1984 from marshmalien/fix/1847-dashboard-graph-dropdown ... Fix dashboard graph VIEW dropdown filter	2018-05-31 14:57:38 -04:00
Alan Rominger	dd944319f1	Merge pull request #1989 from AlanCoding/delete_networks ... Delete network canvas objects in delete inventory task	2018-05-31 13:57:13 -04:00
Jared Tabor	edbb03cdc0	Merge pull request #1998 from jaredevantabor/fix-1982 ... Prevents Network UI from scrolling and showing Tower	2018-05-31 09:37:04 -07:00
Jared Tabor	01611540f0	Marking a Configure Tower string for translation ... Once this gets added to the UI's es.po file, this should show up translated, along with it's tooltip.	2018-05-31 09:36:23 -07:00
Ryan Petrello	99d2f3ea34	allow Jinja2 in ansible -a when ALLOW_JINJA_IN_EXTRA_VARS is 'always'	2018-05-31 11:49:50 -04:00
Shane McDonald	246e63bdb6	Update translation templates	2018-05-31 10:53:57 -04:00
AlanCoding	b7a5c10ce4	make our oauth model creation a dependency of other app	2018-05-31 10:19:43 -04:00
Ryan Petrello	68bfb08b03	Merge pull request #1995 from ryanpetrello/test-tower-inv-source ... add a test for tower inventory syncs	2018-05-31 09:36:10 -04:00
John Mitchell	24c6f14f44	Merge pull request #1977 from jlmitch5/fixTokenScopeAddInUI ... Fix token scope add in ui	2018-05-31 09:35:15 -04:00
Jared Tabor	70897d3503	Prevents Network UI from scrolling and showing Tower ... I also fixed an issue where the mouse-wheel events were not zooming the network UI in firefox.	2018-05-30 14:19:07 -07:00
Alan Rominger	302505905e	Merge pull request #1992 from AlanCoding/copy_v2 ... Make copy endpoints specific to v2	2018-05-30 15:51:44 -04:00