Wayne Witzel III
21b78353cb
Merge pull request #1430 from wwitzel3/networking-cred
...
Network Credential
2016-04-11 10:17:18 -04:00
Wayne Witzel III
a317aa6a31
added Network Credential unit tests
2016-04-11 10:14:51 -04:00
Wayne Witzel III
2a3e5dd0c0
make fifo a helper for easier testing, fixed proot check
2016-04-11 10:14:50 -04:00
Wayne Witzel III
e8b35533e4
added initial API support for Network credential
2016-04-11 10:14:02 -04:00
jlmitch5
25b8faa81a
updated merge conflict that was introduced in tag search ui pr
2016-04-11 09:38:44 -04:00
Michael Abashian
7962167c03
Leverage the ngBindHtml directive to allow the escaped string to be rendered as html
2016-04-11 09:18:47 -04:00
Graham Mainwaring
fdc6eb30f9
Merge pull request #1458 from ghjm/rpm_packaging
...
Remove temporary folder before packaging
2016-04-10 16:10:45 -04:00
Michael Abashian
27879068f1
Fixed bug where a preview with a description was pushing the input element way off to the right
2016-04-08 14:57:58 -04:00
John Mitchell
382c7d9bbb
Merge branch 'tagSearchUI' into devel
2016-04-08 13:33:13 -04:00
Graham Mainwaring
7d19f7cc0e
Merge pull request #1443 from ghjm/ol6_workaround_2
...
More robust method for working around OL6 yum issue.
2016-04-08 13:06:40 -04:00
Matthew Jones
62218cfd7d
Fix virtualenv path association in job runs
2016-04-08 11:56:51 -04:00
John Mitchell
b6d6fb556a
configured rbac fro creds, jts, orgs, and invs
2016-04-08 11:52:31 -04:00
jlmitch5
4c6576da24
Merge pull request #1444 from jlmitch5/es6nomaps
...
remove sourcemaps for es6 transpilation
2016-04-07 15:57:05 -04:00
Michael Abashian
0f2d924adb
Create/edit survey re-work
2016-04-07 15:15:55 -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
John Mitchell
c2d9cf466d
fixed error handling of options
2016-04-06 15:48:00 -04:00
John Mitchell
967194a3f3
fixes to tag search ui implementation
2016-04-06 15:38:48 -04: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
