Commit Graph

  • ad89491a07 Fixed bad merge Akita Noek 2016-04-12 16:31:11 -04:00
  • ea3a7ef227 Merge branch 'devel' of github.com:ansible/ansible-tower into migration Akita Noek 2016-04-12 16:30:09 -04:00
  • 6bc765d1b5 Merge pull request #1507 from wwitzel3/rbac-bug-1422 Wayne Witzel III 2016-04-12 16:22:47 -04:00
  • a0356afbac Improved code clarity and UI naming for user owner role creation Akita Noek 2016-04-12 16:11:45 -04:00
  • e3ebbab17d fix list label of status jlmitch5 2016-04-12 15:58:17 -04:00
  • 62ecefb716 removing unncessary line Jared Tabor 2016-04-11 10:34:57 -07:00
  • 462eb19087 Changing ngToast success color Jared Tabor 2016-04-08 15:26:26 -07:00
  • de56747d1c Cleaning up code from PR feedback Jared Tabor 2016-04-08 14:55:46 -07:00
  • 72ae8f46c9 Adding notifications into the UI Jared Tabor 2016-03-18 16:18:18 -07:00
  • c984b33f1e Fix erronous singleton role created for users Akita Noek 2016-04-12 15:43:27 -04:00
  • 563917a217 Merge pull request #1509 from anoek/devel Akita Noek 2016-04-12 15:41:25 -04:00
  • 1369be8f17 Merge branch 'devel' into explicit-implicit-parents Akita Noek 2016-04-12 15:13:37 -04:00
  • 29c7ecf6a8 Merge branch 'devel' into migration Akita Noek 2016-04-12 15:12:43 -04:00
  • 8c917de24d Fix faulty activitystream test Akita Noek 2016-04-12 15:03:24 -04:00
  • 6039ad92e9 Merge branch 'devel' of github.com:ansible/ansible-tower into explicit-implicit-parents Akita Noek 2016-04-12 14:51:30 -04:00
  • 7b4e7ec5b3 Switch to explicitly stored implicit role parents Akita Noek 2016-04-12 11:39:14 -04:00
  • 7e0bfc9831 Use --nomigrations for py.test Akita Noek 2016-04-12 14:32:10 -04:00
  • 7cd4fb7b7a Merge pull request #1502 from wwitzel3/rbac-feature-1324 Wayne Witzel III 2016-04-12 13:32:56 -04:00
  • e5b9766c8f Update Job start / access permissions Wayne Witzel III 2016-04-12 13:28:03 -04:00
  • dfaffdea56 Updated to handle fact vs. facts responses. Removed accidental commit inclusion from branch. Ken Hoes 2016-04-12 13:20:21 -04:00
  • 69812fc8ab Merge pull request #1490 from chrismeyersfsu/fix-labels_unique Chris Meyers 2016-04-12 13:09:26 -04:00
  • b77d8dab47 flake8 fixes Akita Noek 2016-04-12 09:14:38 -04:00
  • 629c46fb0c Merge pull request #1501 from shanemcd/fix-ami-install-script Shane McDonald 2016-04-12 11:51:24 -04:00
  • e9aff8d67d Moved necessary add field migration to exist prior to dependent implicit role field which references the field Akita Noek 2016-04-11 13:39:44 -04:00
  • 74d86859f1 Fix project migration when project has exactly one org Akita Noek 2016-04-11 11:44:17 -04:00
  • 5f8e7bbf55 Replace user.admin_role usage with manual version that works in migrations Akita Noek 2016-04-11 11:13:38 -04:00
  • 86e29221d5 Fixed missing orgfunc usage to resolve organization during credential migration Akita Noek 2016-04-10 12:05:23 -04:00
  • 59b6ed3b9c Update rbac schema migrations so we have all parameters we need to operate during a migration Akita Noek 2016-04-10 12:02:06 -04:00
  • e3a45235a6 Do an initial save on all resources during amigration to force the creation of RBAC role objects. Akita Noek 2016-04-10 12:00:23 -04:00
  • 7d2e660749 Make use of 'current' apps so RBAC ImplicitRoleField can work during migrations Akita Noek 2016-04-10 11:57:39 -04:00
  • 682552d9b0 Added field deconstruct method so ImplicitRoleField works in migrations Akita Noek 2016-04-08 09:40:56 -04:00
  • 274744b4c1 Replaced Role.singleton usage in migrations as it doesn't exist here apparently Akita Noek 2016-04-07 16:44:18 -04:00
  • ec439126e0 Added created/modified and another content_object fix in our migrations Akita Noek 2016-04-07 16:36:47 -04:00
  • b1c568e4d9 Fix invalid usage of content_object during migrations Akita Noek 2016-04-07 16:31:11 -04:00
  • 98dd79775b series of tests to verify user executing permissions AlanCoding 2016-04-11 10:05:04 -04:00
  • 558311eaed Fixup inventory test Wayne Witzel III 2016-04-12 11:29:59 -04:00
  • b4ef0304e3 Add funcsigs as a direct dependency for the venvs Matthew Jones 2016-04-12 10:48:27 -04:00
  • 476c43f7a7 Resource fixes Wayne Witzel III 2016-04-12 10:38:24 -04:00
  • 0d0115ef5e include migration Chris Meyers 2016-04-12 10:23:43 -04:00
  • a244af5360 Update Role model method docs. Wayne Witzel III 2016-04-12 10:11:38 -04:00
  • 18dea2203f Removed unnecessary rebuild_role_ancestor_list call in a test Akita Noek 2016-04-12 09:55:11 -04:00
  • 81268f7106 Merge pull request #1497 from shanemcd/remove-unnecessary-config-play Shane McDonald 2016-04-12 09:35:22 -04:00
  • dc70262d39 Merge pull request #1435 from anoek/user-activity-stream-updates Akita Noek 2016-04-12 09:10:52 -04:00
  • ecedf491a4 Removed erroneous sso login error log Akita Noek 2016-04-11 23:17:10 -04:00
  • c4a1f55f53 Merge pull request #1414 from anoek/access-list-updates Akita Noek 2016-04-11 17:04:53 -04:00
  • 24a841a0bf Added sso login logging Akita Noek 2016-04-11 17:02:00 -04:00
  • f3cae7e1f0 Log basic auth requests to the debug log Akita Noek 2016-04-11 15:38:06 -04:00
  • 6182dad0d4 Added activity stream events for User Akita Noek 2016-04-06 16:07:04 -04:00
  • 86d98e0999 Merge pull request #1493 from wwitzel3/devel Alan Rominger 2016-04-11 16:24:43 -04:00
  • 12b1068ed4 fix open_fifo_write call Wayne Witzel III 2016-04-11 16:23:06 -04:00
  • 5bf83e8b64 cascade delete labels Chris Meyers 2016-04-11 16:02:42 -04:00
  • 0a15ece049 Merge pull request #1483 from shanemcd/packer-centos7 Shane McDonald 2016-04-11 15:06:23 -04:00
  • 5154e19565 Merge pull request #1484 from wwitzel3/invsrc-cred-migration Wayne Witzel III 2016-04-11 15:03:49 -04:00
  • d5fb4b306d fixes based on search tags permissions breakage John Mitchell 2016-04-11 15:02:10 -04:00
  • 992521e040 add migrations for invsource and credentials Wayne Witzel III 2016-04-11 15:00:58 -04:00
  • d6c2b931f9 Remove stray comma from network credential in JobOptions Matthew Jones 2016-04-11 14:48:22 -04:00
  • b946a6d871 Merge pull request #1454 from jlmitch5/configureRBACUI jlmitch5 2016-04-11 13:56:13 -04:00
  • 09f1473ef9 Added direct access via teams to the access_list endpoint Akita Noek 2016-04-07 11:13:24 -04:00
  • 4531f276c2 Updated access_list to include team information for indirect access coming from teams Akita Noek 2016-04-05 22:24:43 -04:00
  • f437d39d06 Add psutil to ansible venv dependencies Matthew Jones 2016-04-11 12:57:56 -04:00
  • 673c5929f9 Improve the efficiency of the stdout dump database migration Matthew Jones 2016-04-11 11:40:10 -04:00
  • f0f243a9df Merge pull request #1475 from wwitzel3/rbac-bug-1418 Wayne Witzel III 2016-04-11 11:27:04 -04:00
  • 03845eb2fe remove age_deleted mgmt cmd, no longer needed Wayne Witzel III 2016-04-11 11:26:06 -04:00
  • 4638195065 Merge pull request #1474 from wwitzel3/rbac-bug-1390 Wayne Witzel III 2016-04-11 10:22:27 -04:00
  • 8e3b48b965 update required/optional and explicitly show any value disassociate Wayne Witzel III 2016-04-11 10:20:55 -04:00
  • 21b78353cb Merge pull request #1430 from wwitzel3/networking-cred Wayne Witzel III 2016-04-11 10:17:18 -04:00
  • a317aa6a31 added Network Credential unit tests Wayne Witzel III 2016-04-06 15:18:51 -04:00
  • 2a3e5dd0c0 make fifo a helper for easier testing, fixed proot check Wayne Witzel III 2016-04-06 15:18:28 -04:00
  • e8b35533e4 added initial API support for Network credential Wayne Witzel III 2016-04-05 17:08:42 -04:00
  • a40f4b61b1 updated merge conflict that was introduced in tag search ui pr jlmitch5 2016-04-11 09:38:44 -04:00
  • 25b8faa81a updated merge conflict that was introduced in tag search ui pr jlmitch5 2016-04-11 09:38:44 -04:00
  • d69ebb9a06 Restyled system tracking, simplified block less, fixed data issue, fixed button Ken Hoes 2016-04-06 14:19:58 -04:00
  • 7962167c03 Leverage the ngBindHtml directive to allow the escaped string to be rendered as html Michael Abashian 2016-04-11 09:18:47 -04:00
  • fdc6eb30f9 Merge pull request #1458 from ghjm/rpm_packaging Graham Mainwaring 2016-04-10 16:10:45 -04:00
  • 27879068f1 Fixed bug where a preview with a description was pushing the input element way off to the right Michael Abashian 2016-04-08 14:57:58 -04:00
  • 382c7d9bbb Merge branch 'tagSearchUI' into devel John Mitchell 2016-04-08 13:33:13 -04:00
  • 7d19f7cc0e Merge pull request #1443 from ghjm/ol6_workaround_2 Graham Mainwaring 2016-04-08 13:06:40 -04:00
  • 62218cfd7d Fix virtualenv path association in job runs Matthew Jones 2016-04-08 11:56:34 -04:00
  • b6d6fb556a configured rbac fro creds, jts, orgs, and invs John Mitchell 2016-04-08 11:52:31 -04:00
  • 4c6576da24 Merge pull request #1444 from jlmitch5/es6nomaps jlmitch5 2016-04-07 15:57:05 -04:00
  • 0f2d924adb Create/edit survey re-work Michael Abashian 2016-04-07 15:11:07 -04:00
  • 2d31021296 Merge pull request #1411 from wwitzel3/more-rht-integration Akita Noek 2016-04-07 12:56:12 -05:00
  • 62ba0b7488 Merge pull request #1441 from wwitzel3/rbac-bug-1423 Wayne Witzel III 2016-04-07 13:43:04 -04:00
  • 2466fd0ca5 Merge pull request #1439 from wwitzel3/rbac-bug-1390 Akita Noek 2016-04-07 12:32:51 -05:00
  • f6e36258bd Merge pull request #1437 from wwitzel3/rbac-bug-1427 Akita Noek 2016-04-07 12:32:44 -05:00
  • 93fd398793 Merge pull request #1436 from wwitzel3/rbac-bug-1421 Akita Noek 2016-04-07 12:32:40 -05:00
  • 72cd60462b Merge pull request #1404 from kensible/1049-copyMove kensible 2016-04-07 12:59:15 -04:00
  • 4a41c0f3b4 make CustomInvetoryScript a resource. Wayne Witzel III 2016-04-07 11:53:21 -04:00
  • 5b366e0955 update API documentation for Team roles Wayne Witzel III 2016-04-07 10:38:09 -04:00
  • 39f05e2f11 Update user roles list API documentation Wayne Witzel III 2016-04-07 10:36:12 -04:00
  • a0fd546bdf Force jenkins pip dependencies to override the base Matthew Jones 2016-04-07 10:33:04 -04:00
  • 708817c489 remove active filter attribute Chris Meyers 2016-04-07 09:52:30 -04:00
  • 86cca77b43 Make sure requirements_jenkins invokes the other requirements sections Matthew Jones 2016-04-06 20:33:44 -04:00
  • 1da9ee5e6c fix 500 errors for credential and role lists Wayne Witzel III 2016-04-06 16:58:36 -04:00
  • 547506a3bf Remove contextual statsd reference Matthew Jones 2016-04-06 16:47:36 -04:00
  • c0afa3ca0f More commenting out of statsd Matthew Jones 2016-04-06 16:42:30 -04:00
  • 81d9f7e57e superuser should be able to delete users without an org Wayne Witzel III 2016-04-06 16:30:06 -04:00
  • 3ba591cea2 Remove statsd from callback Matthew Jones 2016-04-06 16:29:23 -04:00
  • 38927206c7 Merge pull request #1413 from anoek/credential-api Akita Noek 2016-04-06 15:11:35 -05:00
  • c2d9cf466d fixed error handling of options John Mitchell 2016-04-06 15:48:00 -04:00