18720 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Yunfan Zhang	a45ccfdc79	Merge pull request #1942 from YunfanZhang42/devel ... Added an awx-manage command for generating OAuth2 token.	2018-05-31 16:13:58 -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
Yunfan Zhang	2c4f7911a6	Added an awx-manage command for generating OAuth2 token.	2018-05-31 14:27:21 -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
Bill Nottingham	01dcb3f733	Merge pull request #1938 from tux-00/patch-1 ... Fix bad path in installation doc	2018-05-31 09:56: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
AlanCoding	f692f0c70a	test creating credential for self & org_member	2018-05-31 08:58:38 -04:00
AlanCoding	253606c8bf	allow managing credentials with external user management	2018-05-31 08:40:32 -04:00
Raphaël B	f485185562	Fix bad path	2018-05-31 11:32:55 +02: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
Alan Rominger	7aa1c64fac	Merge pull request #1996 from AlanCoding/null_handler_again ... Interpret null protocol as logging.NullHandler	2018-05-30 15:49:15 -04:00
AlanCoding	015b19d8c3	interpret null protocol as logging.NullHandler	2018-05-30 15:21:51 -04:00
Ryan Petrello	e2a05b14a5	Merge pull request #1993 from ryanpetrello/tower-inv-errors ... clean up Tower inventory error handling	2018-05-30 15:15:07 -04:00
Ryan Petrello	9bc871db47	add a test for tower inventory syncs	2018-05-30 15:13:49 -04:00
AlanCoding	c690da4058	make copy endpoints specific to v2	2018-05-30 14:01:58 -04:00
AlanCoding	e889c976eb	Remove network_ui Client model	2018-05-30 13:56:19 -04:00
Ryan Petrello	354b076956	clean up Tower inventory error handling ... related: https://github.com/ansible/tower/pull/1697 related: https://github.com/ansible/tower-qa/pull/1746	2018-05-30 13:34:14 -04:00
Marliana Lara	79202708af	Fix vault credential password prompt toggle show and hide	2018-05-30 12:42:27 -04:00
AlanCoding	124fcd6f62	delete network canvas objects in delete inventory task	2018-05-30 12:03:20 -04:00
Bill Nottingham	56d6ba2eda	Merge pull request #1985 from wenottingham/netpuffaddr ... ansible venv: re-add netaddr Python package	2018-05-30 10:57:04 -04:00
Pierre-Louis Bonicoli	16cde26468	ansible venv: re-add netaddr Python package ... Closes #1763	2018-05-30 10:32:54 -04:00
Bill Nottingham	c3ab51e8fe	Merge pull request #1924 from pilou-/ansible_venv_readd_netaddr ... ansible virtualenv: re-add netaddr Python package	2018-05-30 10:27:08 -04:00
Ryan Petrello	a75da0fd58	Merge branch 'release_3.3.0' into fixTokenScopeAddInUI	2018-05-30 10:18:56 -04:00
AlanCoding	4e6fd59180	Handle broken transactions in DB settings getattr ... This expands the role of the log database error context manager and will actually make itself an exception to the standard ORM behavior of raising an error when any queries are executed inside of a broken transaction. In this particular case it is less risky to continue on with a database query and push the data to memcache than it would be to use default settings values in violation of user's intent. (hopefully)	2018-05-30 09:00:03 -04:00
Pierre-Louis Bonicoli	a752d04505	ansible venv: re-add netaddr Python package ... Closes #1763	2018-05-30 02:01:03 +02:00
Marliana Lara	4c9ceb48a1	Merge pull request #1981 from marshmalien/fix/1886-job-details-credential ... Add credential tags to job details	2018-05-29 17:27:23 -04:00
Marliana Lara	4f90391f54	Fix dashboard graph status dropdown value	2018-05-29 17:25:09 -04:00
Marliana Lara	5d0a131530	Add credential tags to job details	2018-05-29 16:29:14 -04:00
Ryan Petrello	a3aad31be3	Merge pull request #1964 from ryanpetrello/fix-token-scope ... fix a few minor issues that have broken the User Token creation	2018-05-29 15:10:17 -04:00
John Mitchell	0f6fe210b7	fix when token scope is passing when the ui saves the form	2018-05-29 15:04:25 -04:00
Jake McDermott	d01940ffc5	Merge pull request #1965 from jakemcdermott/double-search ... Fix wording of smart search key	2018-05-29 14:31:14 -04:00
Jake McDermott	9d87f85275	fix wording of search keys	2018-05-29 14:14:47 -04:00
Alan Rominger	232ad2a06c	Merge pull request #1912 from AlanCoding/other_user_relaunch ... Disallow launching jobs with other user's prompts	2018-05-29 11:51:13 -04:00