1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Commit Graph

6858 Commits

Author SHA1 Message Date
Chris Meyers
c8010fc0ce use new timestamp logic in tests 2016-04-13 09:41:28 -04:00
Chris Meyers
e7d68409f7 fix scan job timestamp 2016-04-12 17:07:11 -04:00
Akita Noek
18dea2203f Removed unnecessary rebuild_role_ancestor_list call in a test 2016-04-12 09:55:20 -04:00
Shane McDonald
81268f7106 Merge pull request #1497 from shanemcd/remove-unnecessary-config-play
Remove unnecessary play in configuration playbook.
2016-04-12 09:35:22 -04:00
Akita Noek
dc70262d39 Merge pull request #1435 from anoek/user-activity-stream-updates
Added activity stream events for User
2016-04-12 09:10:52 -04:00
Akita Noek
ecedf491a4 Removed erroneous sso login error log
The log message here does not indicate a login failure at all, in fact
it doesn't appear like we get a login failed message, they just don't
get authed.
2016-04-11 23:17:10 -04:00
Akita Noek
c4a1f55f53 Merge pull request #1414 from anoek/access-list-updates
Updated access_list to include team information for indirect access
2016-04-11 17:04:53 -04:00
Akita Noek
24a841a0bf Added sso login logging
Part of #1087

This is untested as we need to have a public facing machine to do SSO
stuff against.
2016-04-11 17:03:04 -04:00
Akita Noek
f3cae7e1f0 Log basic auth requests to the debug log
Part of #1087
2016-04-11 17:03:04 -04:00
Akita Noek
6182dad0d4 Added activity stream events for User
Completes development for #1087
2016-04-11 17:03:04 -04:00
Alan Rominger
86d98e0999 Merge pull request #1493 from wwitzel3/devel
fix open_fifo_write call
2016-04-11 16:24:43 -04:00
Wayne Witzel III
12b1068ed4 fix open_fifo_write call 2016-04-11 16:23:06 -04:00
Shane McDonald
0a15ece049 Merge pull request #1483 from shanemcd/packer-centos7
Use CentOS 7 as source AMI in Packer template.
2016-04-11 15:06:23 -04:00
Wayne Witzel III
5154e19565 Merge pull request #1484 from wwitzel3/invsrc-cred-migration
add migrations for invsource and credentials
2016-04-11 15:03:49 -04:00
John Mitchell
d5fb4b306d fixes based on search tags permissions breakage 2016-04-11 15:02:35 -04:00
Wayne Witzel III
992521e040 add migrations for invsource and credentials 2016-04-11 15:00:58 -04:00
Matthew Jones
d6c2b931f9 Remove stray comma from network credential in JobOptions 2016-04-11 14:49:23 -04:00
jlmitch5
b946a6d871 Merge pull request #1454 from jlmitch5/configureRBACUI
configure rbac for creds, jts, orgs, and invs
2016-04-11 13:56:13 -04:00
Akita Noek
09f1473ef9 Added direct access via teams to the access_list endpoint 2016-04-11 13:46:27 -04:00
Akita Noek
4531f276c2 Updated access_list to include team information for indirect access coming from teams
Finally addresses #1212
2016-04-11 13:46:27 -04:00
Matthew Jones
f437d39d06 Add psutil to ansible venv dependencies 2016-04-11 12:57:56 -04:00
Wayne Witzel III
f0f243a9df Merge pull request #1475 from wwitzel3/rbac-bug-1418
remove age_deleted mgmt cmd, no longer needed
2016-04-11 11:27:04 -04:00
Wayne Witzel III
03845eb2fe remove age_deleted mgmt cmd, no longer needed 2016-04-11 11:26:06 -04:00
Wayne Witzel III
4638195065 Merge pull request #1474 from wwitzel3/rbac-bug-1390
Updates for #1390
2016-04-11 10:22:27 -04:00
Wayne Witzel III
8e3b48b965 update required/optional and explicitly show any value disassociate 2016-04-11 10:20:55 -04:00
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
Graham Mainwaring
fdc6eb30f9 Merge pull request #1458 from ghjm/rpm_packaging
Remove temporary folder before packaging
2016-04-10 16:10:45 -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
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