16670 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alan Rominger	09801d6dab	Merge pull request #1150 from AlanCoding/types_docs ... Make example credential type work	2018-03-29 15:03:03 -04:00
Alan Rominger	b919c36994	Merge pull request #1166 from AlanCoding/role_mods ... Exclude created/modified from RoleSerializer	2018-03-29 14:05:41 -04:00
Marliana Lara	1f0889431c	Merge pull request #1138 from marshmalien/fix/auth_ldap_group_type_params_field ... Add ldap_group_type_params codemirror field to LDAP forms	2018-03-29 13:47:25 -04:00
Marliana Lara	372b2925d2	Merge pull request #1123 from marshmalien/fix/manage_org_auth ... Warning banner when Org Admin doesn't have authorization	2018-03-29 13:38:37 -04:00
Marliana Lara	471248e66c	Fix LDAP_GROUP_TYPE_PARAMS revert value	2018-03-29 13:33:17 -04:00
Alan Rominger	f16ad97081	Merge pull request #1165 from AlanCoding/you_know_who_you_are ... Prevent modified from showing up in activity stream	2018-03-29 12:00:36 -04:00
Alan Rominger	05a56b9b22	Merge pull request #1164 from AlanCoding/path_words ... Add verbosity to local_path error	2018-03-29 11:58:39 -04:00
Marliana Lara	5ffe0f40d2	Only show banner if user is an org admin without edit capabilities	2018-03-29 10:53:09 -04:00
AlanCoding	19c3e26cf2	exclude created/modified from RoleSerializer	2018-03-29 08:59:03 -04:00
AlanCoding	48112f2c56	prevent modified from showing up in activity stream	2018-03-29 08:37:20 -04:00
AlanCoding	27e4630426	add verbosity to local_path error	2018-03-29 07:53:10 -04:00
Chris Meyers	8c3b1c06d9	Merge pull request #1160 from chrismeyersfsu/fix-instance_running_jobs ... fix api browser endpoint title	2018-03-28 16:31:00 -04:00
chris meyers	bf6412ea06	fix api browser endpoint name ... * Endpoint exposes all jobs associated with an Instance. This is what we want. Align the endpoint description with this behavior by removing the word running.	2018-03-28 16:24:19 -04:00
chris meyers	8438331563	make jobs_running more rich in OPTIONS ... * Expose jobs_running as an IntegerField	2018-03-28 16:01:24 -04:00
Alan Rominger	c7ecbb7d2a	Merge pull request #1157 from AlanCoding/no_access_token ... Remove access_token from Activity Stream serializer	2018-03-28 15:56:12 -04:00
AlanCoding	33e2457721	remove access_token from ActStr serializer	2018-03-28 15:38:58 -04:00
Ryan Petrello	6e246c1782	Merge pull request #1155 from ryanpetrello/fix-1053 ... properly filter disabled hosts on smart inventory composition	2018-03-28 15:34:16 -04:00
Ryan Petrello	23267bce38	properly filter disabled hosts on smart inventory composition ... see: https://github.com/ansible/tower/issues/1053	2018-03-28 15:16:26 -04:00
AlanCoding	2a45f352bb	make example cred type work	2018-03-28 14:40:38 -04:00
Alan Rominger	ae5d17d151	Merge pull request #1147 from AlanCoding/exclude_last_used ... Exclude last_used from activity stream	2018-03-28 14:32:55 -04:00
AlanCoding	98dc59765e	exclude last_used from activity stream	2018-03-28 12:53:11 -04:00
Alan Rominger	bed9b06426	Merge pull request #1124 from AlanCoding/hot_potato ... Stream standard out in non-event models	2018-03-28 11:38:49 -04:00
Marliana Lara	d5d80860e9	Merge pull request #1131 from marshmalien/fix/small_ui_improvements ... UI Fix inventory list action buttons, upgrade screen, custom venv fields	2018-03-28 11:26:21 -04:00
Michael Abashian	81e85408eb	Merge pull request #1120 from mabashian/1066-workflow-node-credentials ... Fixed workflow node credential bug	2018-03-28 11:22:51 -04:00
AlanCoding	8c167e50c9	Continuously stream data from verbose jobs ... In verbose unified job models (inventory updates, system jobs, etc.), do not delay dispatch just because the encoded event data is not part of the data written to the buffer. This allows output from these commands to be submitted to the callback queue as they are produced, instead of waiting until the buffer is closed.	2018-03-28 11:05:49 -04:00
Chris Meyers	fe0e873108	Merge pull request #1144 from chrismeyersfsu/fix-auto_reprovision ... delay looking up settings SYSTEM_UUID	2018-03-28 10:32:24 -04:00
chris meyers	eef6f7ecb0	delay looking up settings SYSTEM_UUID	2018-03-28 09:54:51 -04:00
Chris Meyers	bc34a74b7e	Merge pull request #1142 from chrismeyersfsu/fix-ldap_options_label ... fix ldap group type params label	2018-03-28 09:15:39 -04:00
chris meyers	dc46a732bc	fix ldap group type params label ... * copy pasted ldap group type label and did no previously update. This updates.	2018-03-28 09:12:06 -04:00
Marliana Lara	492e74a345	Remove pending_deletion button bug from inventory list	2018-03-27 16:43:50 -04:00
Marliana Lara	9b30b02acb	Hide Ansible Environment form fields when there are no custom venvs	2018-03-27 16:43:39 -04:00
Marliana Lara	25c8bf93ec	Add AUTH_LDAP_GROUP_TYPE_PARAMS field to LDAP form	2018-03-27 16:06:26 -04:00
Chris Meyers	4740f90dc7	Merge pull request #1129 from chrismeyersfsu/enhancement-node_reregister ... reregister node when they come back online	2018-03-27 15:24:58 -04:00
chris meyers	7ce8907b7b	reregister node when they come back online ... * Nodes are marked offline, then deleted; given enough time. Nodes can come back for various reasions (i.e. netsplit). When they come back, have them recreate the node Instance if AWX_AUTO_DEPROVISION_INSTANCES is True. Otherwise, do nothing. The do nothing case will show up in the logs as celery job tracebacks as they fail to be self aware.	2018-03-27 14:30:47 -04:00
Marliana Lara	4fab94d2ce	Add warning banner when Org Admin doesn't have manage auth	2018-03-27 11:41:16 -04:00
mabashian	d744679d22	Fixed bug where the machine credential was being stripped from a workflow node if the edge type was changed.	2018-03-27 11:21:24 -04:00
Matthew Jones	3a3c883504	Merge pull request #1115 from ryanpetrello/newer-dateutil ... remove an RRULE parsing bug fix that landed upstream in python-dateutil	2018-03-26 20:36:10 -07:00
Ryan Petrello	21d629531f	remove an RRULE parsing bug fix that landed upstream in python-dateutil ... related: a2a246a834	2018-03-26 18:02:52 -04:00
Ryan Petrello	f3bf9bc34f	Merge pull request #1114 from ryanpetrello/newer-dateutil ... update to a newer python-dateutil with more bug fixes we were vendoring	2018-03-26 17:21:45 -04:00
Ryan Petrello	a2a246a834	update to a newer python-dateutil with more bug fixes we were vendoring ... related: dateutil/dateutil#649	2018-03-26 17:12:01 -04:00
Matthew Jones	9637058406	Merge pull request #1512 from chrismeyersfsu/feature-new_ldap_group_type ... add ldap group type like posixGroupType	2018-03-26 12:29:01 -07:00
Matthew Jones	d6203b521f	Merge pull request #1679 from mabashian/workflow-node-start-bug ... Fixed js error when adding first workflow node	2018-03-26 12:20:38 -07:00
Matthew Jones	d685815478	Merge pull request #1607 from AlanCoding/tower_verify_field ... Sync tower verify_ssl parameter with tower-cli	2018-03-26 12:12:45 -07:00
Matthew Jones	71d2a4b4cf	Merge pull request #1610 from AlanCoding/group_related ... Include related Jobs in group deletion protection	2018-03-26 12:09:45 -07:00
mabashian	6c321f810a	Tweaked isRoot logic to follow the same pattern as the rest of the function	2018-03-26 15:00:33 -04:00
mabashian	2c1fe14206	Fixed js error when adding first workflow node	2018-03-26 14:55:01 -04:00
Alan Rominger	3411721a2c	Merge pull request #1676 from AlanCoding/unused_settings ... Removed unused settings (replaced by source_vars)	2018-03-26 14:16:42 -04:00
AlanCoding	9db0fdfc0b	sync tower verify_ssl parameter with tower-cli ... Add new input for the tower type credential elsewhere, tests are being added for verify_ssl in modules tower-cli also updating to use the original tower.py var	2018-03-26 13:42:52 -04:00
Chris Meyers	09babbe862	Merge pull request #1677 from chrismeyersfsu/fix-traceback_msg ... call celery method with celery context	2018-03-26 13:03:32 -04:00
John Mitchell	b1cd7dbd2f	Merge pull request #1678 from jlmitch5/removeTowerLicenseDir ... remove tower-license dir	2018-03-26 12:17:58 -04:00