6820 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthew Jones	62218cfd7d	Fix virtualenv path association in job runs	2016-04-08 11:56:51 -04:00
jlmitch5	4c6576da24	Merge pull request #1444 from jlmitch5/es6nomaps ... remove sourcemaps for es6 transpilation	2016-04-07 15:57:05 -04:00
Akita Noek	2d31021296	Merge pull request #1411 from wwitzel3/more-rht-integration ... RedHat Inventory Integrations	2016-04-07 12:56:12 -05:00
Wayne Witzel III	62ba0b7488	Merge pull request #1441 from wwitzel3/rbac-bug-1423 ... make CustomInvetoryScript a resource.	2016-04-07 13:43:04 -04:00
Akita Noek	2466fd0ca5	Merge pull request #1439 from wwitzel3/rbac-bug-1390 ... Update User/Team Roles API documentation.	2016-04-07 12:32:51 -05:00
Akita Noek	f6e36258bd	Merge pull request #1437 from wwitzel3/rbac-bug-1427 ... fix 500 errors for credential and role lists	2016-04-07 12:32:44 -05:00
Akita Noek	93fd398793	Merge pull request #1436 from wwitzel3/rbac-bug-1421 ... superuser should be able to delete users without an org	2016-04-07 12:32:40 -05:00
kensible	72cd60462b	Merge pull request #1404 from kensible/1049-copyMove ... 1049 inventory copy move modalectomy	2016-04-07 12:59:15 -04:00
Wayne Witzel III	4a41c0f3b4	make CustomInvetoryScript a resource.	2016-04-07 11:53:21 -04:00
Wayne Witzel III	5b366e0955	update API documentation for Team roles	2016-04-07 10:38:09 -04:00
Wayne Witzel III	39f05e2f11	Update user roles list API documentation	2016-04-07 10:36:12 -04:00
Matthew Jones	a0fd546bdf	Force jenkins pip dependencies to override the base	2016-04-07 10:33:20 -04:00
Chris Meyers	708817c489	remove active filter attribute	2016-04-07 09:52:51 -04:00
Matthew Jones	86cca77b43	Make sure requirements_jenkins invokes the other requirements sections	2016-04-06 20:33:44 -04:00
Wayne Witzel III	1da9ee5e6c	fix 500 errors for credential and role lists	2016-04-06 16:58:36 -04:00
Matthew Jones	547506a3bf	Remove contextual statsd reference	2016-04-06 16:47:36 -04:00
Matthew Jones	c0afa3ca0f	More commenting out of statsd	2016-04-06 16:42:30 -04:00
Wayne Witzel III	81d9f7e57e	superuser should be able to delete users without an org	2016-04-06 16:30:06 -04:00
Matthew Jones	3ba591cea2	Remove statsd from callback ... This doesn't work with our current virtualenv setup and ansible dependencies. Will revisit later	2016-04-06 16:29:50 -04:00
Akita Noek	38927206c7	Merge pull request #1413 from anoek/credential-api ... Added organization to Credential summary and related fields	2016-04-06 15:11:35 -05:00
Chris Meyers	01d323fd06	fix dev container pip init process	2016-04-06 14:28:34 -04:00
Matthew Jones	0a6df40066	Improvements to docker compose workflow with new packaging changes	2016-04-06 12:24:19 -04:00
Matthew Jones	ae9222f716	Fix flake8 after packaging changes merge	2016-04-06 11:03:34 -04:00
Graham Mainwaring	a6acb5181a	Merge pull request #1417 from ansible/python27_el6 ... EL6 Python 2.7 and Tower virtualenvs	2016-04-06 10:57:18 -04:00
Chris Meyers	54a4639c83	Merge pull request #1416 from chrismeyersfsu/fix-rbac_scan_jobs_listing ... effectively, list job_templates without projects	2016-04-06 10:36:48 -04:00
Chris Meyers	e7e6877b8e	effectively, list job_templates without projects ... * For super users only * This includes scan jobs & orphaned job templates	2016-04-06 10:36:14 -04:00
Chris Meyers	817f3f6d18	Merge pull request #1412 from chrismeyersfsu/labels-rbac_fix ... fix rbac label assignment across orgs	2016-04-06 08:45:46 -04:00
Akita Noek	58ee10aa02	Added organization to Credential summary and related fields ... #1400	2016-04-05 20:59:05 -04:00
Graham Mainwaring	057613fa31	Merge branch 'python27_el6' of github.com:ansible/ansible-tower into python27_el6	2016-04-05 17:42:22 -04:00
Chris Meyers	d69b9fad8f	fix rbac label assignment across orgs ... * Org admins should not be able to attach labels to orgs for which they are not also org admins for.	2016-04-05 16:03:46 -04:00
Chris Meyers	be0ee97fb3	Merge pull request #1409 from chrismeyersfsu/labels-cleanup2 ... label cleanup periodic job	2016-04-05 15:27:47 -04:00
Chris Meyers	68c14976db	label cleanup periodic job	2016-04-05 15:25:01 -04:00
Wayne Witzel III	6635782ed8	add API support for CloudForms inventory (#1099)	2016-04-05 14:43:25 -04:00
Wayne Witzel III	051dfd4b0e	add API support for Satellite 6 inventory (#1098)	2016-04-05 14:34:22 -04:00
jlmitch5	5eeb298536	Merge pull request #1401 from jlmitch5/rbacCredUI ... Rbac cred ui	2016-04-05 11:26:25 -04:00
Ken Hoes	cef4a34679	Updated state extender.	2016-04-05 11:25:06 -04:00
Ken Hoes	b76b07955a	Removed directives, moved to controllers and partials.	2016-04-05 11:08:19 -04:00
Ken Hoes	07ab1e7787	PR feedback implemented.	2016-04-05 11:07:29 -04:00
Ken Hoes	ec2e5a0224	Removed debug statements.	2016-04-05 11:07:13 -04:00
Ken Hoes	e6cbe5589e	Move groups and hosts in inventory. Panel pattern. ... Copy working. Cleaned up.	2016-04-05 11:06:48 -04:00
John Mitchell	83a656653d	add error handling of admin of org call	2016-04-05 10:33:03 -04:00
Michael Abashian	2d9e34162c	Merge pull request #1391 from mabashian/angular-drag-and-drop-lists ... Added angular-drag-and-drop-lists dependency	2016-04-05 09:21:21 -04:00
Chris Meyers	2f4e8cd163	Merge pull request #1396 from chrismeyersfsu/labels-rbac ... Labels rbac	2016-04-05 08:53:49 -04:00
John Mitchell	6153016937	fix to credentials ui based on api change	2016-04-04 17:37:17 -04:00
Chris Meyers	fa6f5329cf	labels + rbac + tests	2016-04-04 17:20:58 -04:00
John Mitchell	f7f92f3725	working commit of cred ui fixes	2016-04-04 15:39:36 -04:00
Akita Noek	e2b01740fb	Merge pull request #1389 from anoek/credential-api ... Added and updated several credential creation and listing API endpoints	2016-04-04 14:11:21 -05:00
Matthew Jones	b89d183433	Import pytest for skipping settings tests	2016-04-04 14:19:08 -04:00
John Mitchell	3226c2f10e	make org field populate on edit of project	2016-04-04 14:14:41 -04:00
Leigh	67f42eba8e	Merge pull request #1370 from leigh-johnson/PortalMode ... Restyle Portal Mode, refactor PortalJobs Widget into view/controller pattern	2016-04-04 13:49:59 -04:00