14981 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ryan Petrello	5895654538	store cloudforms inventory cache files in the proper location on disk ... with process isolation enabled (which is the awx default), cloudforms caches inventory script results on disk; awx should direct cloudforms to store these cache files in a location that's exposed to the isolated environment see: ansible/ansible#31760	2017-10-17 17:07:21 -04:00
Michael Abashian	3d12e040ed	Merge pull request #528 from mabashian/5129-jt-spinner-v2 ... Moved wait stop calls on jt form so that they fire right before reloading state	2017-10-16 16:20:02 -04:00
Michael Abashian	fceca3bcae	Merge pull request #527 from mabashian/7697-smart-inventory-shortcut ... Fixed smart inv button bug navigating to page 2 of hosts.	2017-10-16 16:19:40 -04:00
mabashian	2cab6982c1	Moved wait stop calls on jt form so that they fire right before reloading state	2017-10-12 17:01:32 -04:00
mabashian	3ede367df4	Fixed smart inv button bug navigating to page 2 of hosts. Added tooltip when button is disabled.	2017-10-12 16:56:21 -04:00
Alan Rominger	f6bf0ad21f	Merge pull request #521 from AlanCoding/update_isolated ... [3.2.2] update isolated container requirements	2017-10-12 14:24:38 -04:00
Greg Considine	817b397d20	Merge pull request #524 from gconsidine/ui/fix/remove-unsupported-query-tokens ... Remove unsupported tokens from search generated queries	2017-10-11 17:54:26 -04:00
jlmitch5	b61fdaf721	Merge pull request #526 from jlmitch5/hideWorkflowAndSurveyButtons ... hide workflow and survey buttons from non-detail tabs	2017-10-11 11:35:35 -04:00
John Mitchell	1603106cb4	include workflow editor when showing buttons'	2017-10-11 10:58:38 -04:00
Aaron Tan	1454000b91	Merge pull request #522 from jangsutsr/ldap_docs ... Add LDAP deploy instructions	2017-10-11 10:07:29 -04:00
Alan Rominger	b2e63d5e47	Merge pull request #510 from AlanCoding/event_accounting ... add logger statement for number of events	2017-10-10 22:12:11 -04:00
Alan Rominger	e7ede6af4a	Merge pull request #525 from AlanCoding/update_isolated_version ... [3.2.2] update fallback isolated version to 3.2.2	2017-10-10 22:06:09 -04:00
Alan Rominger	5503d4efb4	Merge pull request #523 from AlanCoding/fix_isolated_capacity ... [3.2.2] fix equation for isolated instance capacity	2017-10-10 22:04:03 -04:00
John Mitchell	54640dbca0	hide workflow and survey buttons from non-detail tabs ... since the two are basically sub-states of the edit form (detail tab), they should only show up when that tab is selected	2017-10-10 17:08:04 -04:00
AlanCoding	eab82f3efa	updated fallback isolated version to 3.2.2	2017-10-10 15:45:20 -04:00
gconsidine	9e3d90896b	Remove unsupported tokens from search generated queries	2017-10-10 15:22:17 -04:00
AlanCoding	e66a1002ee	fix equation for isolated instance capacity	2017-10-10 14:58:09 -04:00
Aaron Tan	82160e2072	Add LDAP deploy instructions ... Signed-off-by: Aaron Tan <jangsutsr@gmail.com>	2017-10-10 14:54:53 -04:00
AlanCoding	e814f28039	add logger statement for number of events	2017-10-10 14:48:00 -04:00
AlanCoding	341ef411a4	update isolated container requirements	2017-10-10 14:46:41 -04:00
Aaron Tan	8d19555cf1	Merge pull request #519 from jangsutsr/fix-7726 ... Disable inventory var overwrite in inv import	2017-10-10 14:38:50 -04:00
Greg Considine	d23fd0515d	Merge pull request #518 from gconsidine/ui/fix/credential-kind-list-display ... Use credential_type to fetch associated types in list view	2017-10-10 14:38:50 -04:00
Aaron Tan	b9483c28b0	Disable inventory var overwrite in inv import ... Relates #7726 of ansible-tower. Signed-off-by: Aaron Tan <jangsutsr@gmail.com>	2017-10-10 14:38:50 -04:00
Alan Rominger	6f9fc0c3f8	Merge pull request #514 from AlanCoding/no_ordereddit ... [3.2.2] prevent OrderedDict syntax in error message	2017-10-10 14:38:49 -04:00
gconsidine	766a088749	Use credential_type to fetch associated types in list view	2017-10-10 14:38:49 -04:00
Chris Church	2b539cab85	Merge pull request #511 from cchurch/ldap-filter-dash-support ... [3.2.2] Support dash in LDAP attribute names in filters.	2017-10-10 14:38:49 -04:00
AlanCoding	2fb67a3648	prevent OrderedDict syntax in error message	2017-10-10 14:38:49 -04:00
Greg Considine	64c5e3994e	Merge pull request #513 from gconsidine/ui/fix/lookup-component-empty-input ... Set lookup value changed from something to nothing to be null	2017-10-10 14:38:49 -04:00
Alan Rominger	7b792926eb	Merge pull request #509 from AlanCoding/max_ui_events ... [3.2.2] add CTiT setting for max UI job events	2017-10-10 14:38:49 -04:00
Chris Church	c067788428	Support dash in LDAP attribute names in filters.	2017-10-10 14:38:49 -04:00
gconsidine	b7071a48c2	Set lookup value changed from something to nothing to be null	2017-10-10 14:38:49 -04:00
AlanCoding	dee4b72303	add CTiT setting for max UI job events	2017-10-10 14:38:49 -04:00
Alan Rominger	5994a77b84	Merge pull request #508 from AlanCoding/password_handholding ... [3.2.2] reword error message about encrypted user input	2017-10-10 14:38:48 -04:00
Marliana Lara	f93506fe2c	Merge pull request #491 from marshmalien/fix/7661-host-config-key-border ... [3.2.2] Fix missing right border of lookup buttons	2017-10-10 14:38:48 -04:00
Alan Rominger	7c86e38b81	Merge pull request #506 from AlanCoding/active_job_period ... [3.2.2] add period to active job conflict error	2017-10-10 14:38:48 -04:00
AlanCoding	1c374fba7d	reword error message about encrypted user input	2017-10-10 14:38:48 -04:00
Marliana Lara	2cc9e2ca0b	Fix hidden right border of form input lookup buttons	2017-10-10 14:38:48 -04:00
Alan Rominger	335dfd564a	Merge pull request #505 from AlanCoding/v1_jt_vc_ct_sf ... [3.2.2] Exclude credential type content from v1	2017-10-10 14:38:48 -04:00
AlanCoding	5380d57ce8	add period to active job conflict error ... Rename StateConflict to ActiveJobConflict and used shared message inside of that exception class.	2017-10-10 14:38:48 -04:00
AlanCoding	a01f80db5b	Exclude credential type content from v1 ... credential_type_id was showing up in vault_credential summary_fields in API v1	2017-10-10 14:38:48 -04:00
Aaron Tan	d7eba47adb	Merge pull request #456 from jangsutsr/fix-7656 ... [3.2.2]Remove search term separators	2017-10-10 14:38:47 -04:00
Alan Rominger	5fffdec69d	Merge pull request #490 from AlanCoding/many_deleter_320 ... [3.2.2] Delete all hosts or groups from inventory source	2017-10-10 14:38:47 -04:00
Aaron Tan	358ef76529	Remove search term separators ... Relates #7656 in ansible-tower. We have been using comma `,` and space ` ` to separate search terms in query string `<field_name>__search=<search terms>`, however in general we can always use `&` to achieve separation like `<field_name>__search=<search term 1>&<field_name>__search=<search term 2>&...`. Using specific delimiters makes it impossible for search terms to contain those delimiters, so they are better off being removed. Signed-off-by: Aaron Tan <jangsutsr@gmail.com>	2017-10-10 14:38:47 -04:00
Aaron Tan	bb628c52ad	Merge pull request #487 from jangsutsr/fix-7586 ... [3.2.2]Fix SAML auth behind load balancer issue.	2017-10-10 14:38:47 -04:00
AlanCoding	d2e0b26287	allow deleting hosts and groups from inv src sublists	2017-10-10 14:38:47 -04:00
Ryan Petrello	f2d46baf09	Merge pull request #496 from ryanpetrello/fix-6683 ... fix a bug when Tower is integrated with ipsilon SAML server	2017-10-10 14:38:47 -04:00
Ryan Petrello	c6fdadd7f2	Merge pull request #497 from ryanpetrello/fix-7259 ... properly sanitize encrypted default passwords in JT.survey_spec	2017-10-10 14:38:47 -04:00
Aaron Tan	cc8b115c6a	Fix SAML auth behind load balancer issue. ... Relates to #7586 of ansible-tower as a follow-up of fix #420 of tower. The original fix works for Django version 1.9 and above, this PR expanded the solution to Django verison 1.8 and below. Signed-off-by: Aaron Tan <jangsutsr@gmail.com>	2017-10-10 14:38:47 -04:00
Ryan Petrello	82d05e0a10	properly sanitize encrypted default passwords in JT.survey_spec ... see: https://github.com/ansible/ansible-tower/issues/7259	2017-10-10 14:38:47 -04:00
Ryan Petrello	9978b3f9ad	Merge pull request #489 from ryanpetrello/release_3.2.2 ... fix busted 3.2.2 activity stream migration	2017-10-10 14:38:46 -04:00