18551 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Yunfan Zhang	e2ed24aef0	Fix null values on Token modified field.	2018-07-10 16:03:25 -04:00
Alan Rominger	a7561ce527	Merge pull request #2478 from AlanCoding/std_env ... Move static inventory update options to constants	2018-07-10 16:01:31 -04:00
Ben Thomasson	d9ddf56285	Merge pull request #2468 from benthomasson/network_ui_very_long_names ... Wraps long names of devices in the network UI at 25 characters	2018-07-10 15:55:11 -04:00
Ryan Petrello	68cf80cbca	Merge pull request #2479 from ryanpetrello/release_3.3.0 ... Revert "enforce JT/Job.timeout >= 0"	2018-07-10 15:28:57 -04:00
Ryan Petrello	acd045379c	Revert "enforce JT/Job.timeout >= 0" ... This reverts commit 1fb41cf8d0.	2018-07-10 15:06:13 -04:00
AlanCoding	a634b6b9e7	move static inventory update options to constants	2018-07-10 14:45:55 -04:00
Marliana Lara	60f6fba19b	Fix side navigation icon alignment	2018-07-10 14:40:21 -04:00
Ben Thomasson	45cece8f57	Wraps long names of devices in the network UI at 25 characters	2018-07-10 14:35:09 -04:00
Jake McDermott	68ceaadf8d	Merge pull request #2474 from ansible/jakemcdermott-patch-1 ... use a less rigid selector for credential form title	2018-07-10 14:02:48 -04:00
Christian Adams	2aa3150bdd	Merge pull request #2472 from rooftopcellist/expiration_logout_500 ... catch empty session case	2018-07-10 13:51:45 -04:00
adamscmRH	762ce04b0a	catch empty session case	2018-07-10 13:50:39 -04:00
Jake McDermott	00a7de99a4	use a less rigid selector for credential form title	2018-07-10 13:41:25 -04:00
Marliana Lara	319b1f56fc	Merge pull request #2450 from marshmalien/fix/2433-hide-cred-list-label ... Fix credential labels in jobs list	2018-07-10 13:36:56 -04:00
kialam	bf0469faad	Merge pull request #2470 from kialam/fix/2388-fix-activity-stream ... Adjust `schedule` route params for activity stream functionality	2018-07-10 13:23:43 -04:00
Marliana Lara	deb6c3caf8	Sanitize credential name tags	2018-07-10 13:18:42 -04:00
Jake McDermott	630cdce244	Merge pull request #2443 from jakemcdermott/fix-2397 ... sanitize host detail modal stderr/stdout	2018-07-10 11:44:11 -04:00
kialam	fe16579f88	Adjust schedule route params for activity stream functionality	2018-07-10 11:41:04 -04:00
Jake McDermott	321983fdfa	santize host detail modal stderr and stdout	2018-07-10 11:19:33 -04:00
Jake McDermott	93fe14fa01	fix wrapping of host event modal stdout/err lines	2018-07-10 11:19:00 -04:00
Marliana Lara	83d86b3375	Merge pull request #2437 from marshmalien/fix/2434-list-icons ... Tweak network visualization icon and remove calendar icon from lists	2018-07-10 11:09:14 -04:00
Ryan Petrello	ca3a2c752d	Merge pull request #2463 from ryanpetrello/fix-2421 ... enforce JT/Job.timeout >= 0	2018-07-10 10:42:46 -04:00
Alan Rominger	7b860e4eeb	Merge pull request #2445 from AlanCoding/true_admin ... Fix bug with custom script user_capabilities	2018-07-10 10:25:17 -04:00
AlanCoding	73f3837f62	fix server errors unattaching instance from group	2018-07-10 09:38:56 -04:00
Marliana Lara	ae64b9abac	Remove calendar icon and related code from lists	2018-07-10 09:28:33 -04:00
AlanCoding	ec643d6406	fix regression of callback relaunch	2018-07-10 08:45:23 -04:00
Ryan Petrello	1fb41cf8d0	enforce JT/Job.timeout >= 0 ... see: https://github.com/ansible/tower/issues/2421	2018-07-10 08:25:36 -04:00
kialam	9c653cb603	Merge pull request #2455 from kialam/fix/2193-workflow-status ... Account for canceled workflow status in chart and results section	2018-07-09 16:58:44 -04:00
Christian Adams	ab861ae777	Merge pull request #2460 from rooftopcellist/reorder_root_api ... Reorder root api	2018-07-09 16:39:13 -04:00
John Mitchell	33a0b017a6	Merge pull request #2454 from jlmitch5/fixJobsPortalMode ... Fix jobs portal mode	2018-07-09 16:35:55 -04:00
Marliana Lara	b9250e2ceb	Merge pull request #2458 from marshmalien/fix/1847-dashboard-graph ... Fix dashboard graph view dropdown	2018-07-09 16:35:06 -04:00
Michael Abashian	8002cac82e	Merge pull request #2427 from mabashian/2424-vault ... Fixed bug displaying vault cred with no vault_id	2018-07-09 16:22:01 -04:00
adamscmRH	16dc1f57dd	reorder api endpoint links	2018-07-09 16:11:27 -04:00
Alan Rominger	c78e274373	Merge pull request #2459 from AlanCoding/old_cred_msg ... Change key to match old error message	2018-07-09 15:57:11 -04:00
AlanCoding	e36458a6c0	change key to match old error message	2018-07-09 15:36:13 -04:00
Alan Rominger	a90329f21b	Merge pull request #2385 from AlanCoding/team_org_object_roles ... Allow adding teams to org object roles	2018-07-09 15:34:45 -04:00
Yunfan Zhang	307e5204fa	Merge pull request #2447 from YunfanZhang42/fix_credential_leak ... Forbid users from using unauthorized credentials in projects and inventories.	2018-07-09 15:06:39 -04:00
Yunfan Zhang	270102c188	Forbid users from using unauthorized credentials in projects and inventories. ... Signed-off-by: Yunfan Zhang <yz322@duke.edu>	2018-07-09 15:04:53 -04:00
Ryan Petrello	55b6f95b61	Merge pull request #2453 from ryanpetrello/fix-api-login-redirect ... make the API browser direct you to the proper location post-login	2018-07-09 14:48:47 -04:00
Marliana Lara	617017aebd	Fix dashboard graph view dropdown update bug	2018-07-09 14:37:26 -04:00
AlanCoding	e044b996e5	allow adding teams to org object roles	2018-07-09 14:13:57 -04:00
John Mitchell	9ffb3395bc	fix index.less new line issue	2018-07-09 13:58:50 -04:00
Ryan Petrello	1d09c6b25a	make the API browser direct you to the proper location post-login	2018-07-09 13:58:38 -04:00
John Mitchell	2f8b668ef9	fix portal mode issues	2018-07-09 13:53:46 -04:00
Alan Rominger	2dd3014374	Merge pull request #2441 from AlanCoding/error_message ... Fix regression: include error message from remote server	2018-07-09 13:51:06 -04:00
Jared Tabor	6d33e27100	Merge pull request #2429 from jaredevantabor/fix-2422 ... Corrects label on schedule form	2018-07-09 10:46:37 -07:00
kialam	5a338c5f9b	Account for canceled workflow status in chart and results section	2018-07-09 13:34:52 -04:00
Bill Nottingham	5c16f8c294	Merge pull request #2451 from wenottingham/six-PRs-and-a-movie ... Merge assorted PRs from the AWX community	2018-07-09 13:27:17 -04:00
Wayne Witzel III	8969276710	Merge pull request #2446 from ansible/issue-2330 ... Add explicit Job Template Admin role	2018-07-09 13:26:39 -04:00
Rob Ruma	6378479ee7	Updates to callback scripts that include retry functionality for bash and extra_vars handling for PowerShell ... Signed-off-by: Rob Ruma <robruma@users.noreply.github.com>	2018-07-09 13:00:10 -04:00
Bill Nottingham	ae4135f149	add tests	2018-07-09 12:59:45 -04:00