16504 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bill Nottingham	e58038b056	Merge pull request #1623 from cvick/patch-1 ... Added a space before closing quote to fix spelling	2018-03-20 23:25:12 -04:00
Chris Vick	fca1e7028f	Added a space before closing quote to fix spelling ... Without the space before the lines closing quote, 'or' and 'other' get concatenated to 'orother' in the tooltip	2018-03-20 19:36:37 -07:00
Wayne Witzel III	f4e57e2906	Merge pull request #1608 from wwitzel3/devel ... System Setting for Orgainization User/Team permissions.	2018-03-20 17:17:49 -04:00
Alan Rominger	8056ac5393	Delay import of freeze to make tests run (#1617) ... * Delay import of freeze to make tests run * fix flake8 error	2018-03-20 11:58:11 -04:00
Matthew Jones	6419339094	Merge pull request #1570 from rooftopcellist/authorization_flow_docs ... add authorization grant to docs	2018-03-20 07:26:10 -07:00
Matthew Jones	3ee8b3b514	Merge pull request #1613 from EagleIJoe/patch-1 ... Corrected alternate dns servers entries in docker-compose template	2018-03-20 07:24:31 -07:00
Wayne Witzel III	d7f26f417d	Reword help text for manage org auth	2018-03-20 07:31:08 -04:00
Alan Rominger	30fb4076df	Merge pull request #1569 from AlanCoding/relaunch_survey ... Allow normal users to relaunch jobs with survey answers	2018-03-20 07:14:09 -04:00
Matthew Jones	c0661722b6	Merge pull request #1523 from paihu/slack-color-notification ... support slack color notification #1490	2018-03-19 18:05:28 -07:00
Martin Adler	ca7b6ad648	Corrected alternate dns servers entries ... As lstrip_blocks: True was added, this broke the formating when adding alternate DNS servers within the template. Removing the extra white space removals within the if and endif statements fixed the resulting yml formating.	2018-03-19 21:08:52 +01:00
Wayne Witzel III	d5564e8d81	Fix user capabilities when MANAGE_ORGANIZATION_AUTH is disabled	2018-03-19 15:16:54 -04:00
Wayne Witzel III	a9da494904	switch to single toggle and change name	2018-03-19 14:45:52 -04:00
John Mitchell	a9e13cc5f4	Merge pull request #1580 from jlmitch5/usersAppCrudUi ... implement users tokens sub list	2018-03-19 13:23:29 -04:00
Wayne Witzel III	771108e298	Protect team assignment for the roles access point	2018-03-19 12:10:13 -04:00
Wayne Witzel III	eb3b518507	Add Organization User/Team toggle to UI	2018-03-19 11:25:14 -04:00
Wayne Witzel III	33ac8a9668	System wide toggle for org admin user/team abilities	2018-03-19 11:24:36 -04:00
Ryan Petrello	2b443b51eb	Merge pull request #1606 from ryanpetrello/uwsgi-top ... add uwsgitop as a dependency	2018-03-19 10:58:22 -04:00
Ryan Petrello	918f372c20	add uwsgitop as a dependency ... see: https://github.com/ansible/ansible-tower/issues/7966	2018-03-19 08:53:30 -04:00
Matthew Jones	681918be9a	Merge pull request #1598 from ryanpetrello/pin-boto-core ... pin botocore to avoid dependency hell re: latest python-dateutil	2018-03-17 13:08:44 -07:00
Bill Nottingham	2780cd0d4c	Merge pull request #1601 from wenottingham/following-a-new-path ... Just set ANSIBLE_SSH_CONTROL_PATH_DIR, and don't worry about the socket file name.	2018-03-16 22:35:26 -04:00
John Mitchell	cbc20093d7	move users tokens to features folder	2018-03-16 17:15:28 -04:00
Bill Nottingham	6fc4274c68	Just set ANSIBLE_SSH_CONTROL_PATH_DIR, and don't worry about the socket file name. ... Ansible itself (since 2.3) has code to have a shorter hashed control path socket name.	2018-03-16 16:56:45 -04:00
Ryan Petrello	4f585dd09e	pin botocore to avoid dependency hell re: latest python-dateutil ... boto decided to pin python-dateutil on a version _lower than_ what we need for the TZID= bug fix: 90d7692702 (diff-b4ef698db8ca845e5845c4618278f29a)	2018-03-16 16:08:03 -04:00
John Mitchell	8babac49a6	update users token crud list to utilize string file	2018-03-16 15:56:30 -04:00
Matthew Jones	8aa7e4692d	Merge pull request #1596 from ansible/jlmitch5-patch-3 ... update .gitignore to include tower license dir	2018-03-16 12:36:00 -07:00
John Mitchell	cf20943434	update .gitignore to include tower license dir	2018-03-16 15:33:18 -04:00
Bill Nottingham	d5d2858626	Merge pull request #1591 from wenottingham/bad-date ... Bump copyright date.	2018-03-16 15:11:10 -04:00
Bill Nottingham	52599f16ad	Bump copyright date. ... We don't need to do this at the source code level, but we should do it for the app as a whole.	2018-03-16 14:57:08 -04:00
Ryan Petrello	a1f15362ab	Merge pull request #1575 from aperigault/fix_nginx_upstreams ... Fix nginx upstreams	2018-03-16 14:53:48 -04:00
Alan Rominger	1413659f5f	Merge pull request #1593 from AlanCoding/fix_processed ... Fix bug with non-event model	2018-03-16 14:53:05 -04:00
AlanCoding	bbbb7def0a	fix bug with non-event model	2018-03-16 14:27:36 -04:00
Marliana Lara	85a95c8cb8	Merge pull request #1577 from marshmalien/fix/empty_ig_list_results_error ... Fix error where list directive requires results attribute	2018-03-16 13:52:34 -04:00
adamscmRH	5f6a8ca2c0	add authorization grant to docs	2018-03-16 12:21:22 -04:00
Alan Rominger	75dd8d7d30	Merge pull request #1587 from AlanCoding/more_event_blocking ... Block deletion of resources with unprocessed events	2018-03-16 11:26:33 -04:00
AlanCoding	66108164b9	remove unnecessary mock	2018-03-16 10:55:48 -04:00
AlanCoding	69eccd3130	move ACTIVE_STATES to constants	2018-03-16 10:31:41 -04:00
AlanCoding	7881c921ac	block deletion of resources w unprocessed events	2018-03-16 10:14:28 -04:00
Wayne Witzel III	16aa3d724f	Merge pull request #1586 from wwitzel3/devel ... Moved RelatedJobMixin impl to Project instead of ProjectUpdate	2018-03-16 09:58:34 -04:00
Wayne Witzel III	6231742f71	Move RelatedJob mixin to Project	2018-03-16 09:42:32 -04:00
Wayne Witzel III	c628e9de0a	Filter active jobs by WFT/JT	2018-03-16 09:32:42 -04:00
Wayne Witzel III	c54d9a9445	Fix query using self -> self.project and fix imports	2018-03-16 09:24:46 -04:00
Wayne Witzel III	f594f62dfc	Project needs to expose all of its ProjectUpdate jobs in an active state	2018-03-16 09:12:20 -04:00
Chris Meyers	0689cea806	Merge pull request #1572 from chrismeyersfsu/fix-instance_removed_from_group ... handle unicode things in task logger	2018-03-15 16:25:13 -04:00
Chris Meyers	0cf1b4d603	Merge pull request #1535 from chrismeyersfsu/fix-protect_tower_group ... prevent tower group delete and update	2018-03-15 16:02:36 -04:00
chris meyers	1f7506e982	prevent tower group delete and update ... * related to https://github.com/ansible/ansible-tower/issues/7931 * The Tower Instance group is special. It should always exist, so prevent any delete to it. * Only allow super users to associate/disassociate instances the 'tower' instance group. * Do not allow fields of tower instance group to be changed.	2018-03-15 15:23:06 -04:00
Chris Meyers	2640ef8b1c	Merge pull request #1536 from chrismeyersfsu/fix-protect_instance_groups ... prevent instance group delete if running jobs	2018-03-15 14:57:45 -04:00
John Mitchell	e7a0bbb5db	implement users tokens sub list	2018-03-15 14:53:49 -04:00
chris meyers	5d5d8152c5	prevent instance group delete if running jobs ... * related to https://github.com/ansible/ansible-tower/issues/7936	2018-03-15 14:25:49 -04:00
Matthew Jones	3928f536d8	Merge pull request #1571 from matburt/fixing_cluster_resources ... Fixing some issues defining resource requests in openshift and k8s	2018-03-15 11:20:56 -07:00
Marliana Lara	84904420ad	Pass results attr to list directive from instance groups list	2018-03-15 14:13:33 -04:00