Commit Graph

9 Commits

Author SHA1 Message Date
Matthew Jones
6b73fb2c27 Revert "Merge branch 'release_3.0.0' into devel"
This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.
2016-07-07 12:40:10 -04:00
Matthew Jones
22437f80ed Merge branch 'release_3.0.0' into devel
* release_3.0.0: (270 commits)
  Inventory Manage > copy/move groups disable copy option where impossible, add to Root Group target, resolves #1749 (#2218)
  fixes access issue for InventoryScript.admin_role
  Make sure project team list is filtered for access
  Fix up the project teams list
  fix api test
  fix tests with refreshes
  adjusting Credential model and migrations
  adjusting API for new Credential.organization
  Fix Openstack inventory on Ubuntu 12 (#2318)
  Attach labels instead of erroring on creation if label already exists
  Fix system-tracking typo
  update test_rbac_api to new object_roles naming
  Fixing Credential access issue
  Fix an issue calling build_env for system jobs
  remove dead fields from Groups > Add manual source type, resovles #2288 (#2305)
  fixes regression on license expiresOn display, resolves #2277 (#2287)
  fix edit action in Jobs > Schedules tab view, resolves #2258 (#2292)
  Fixed several bugs with adding permissions where checkboxes weren't checked properly or were disappearing when paging was involved.
  specify playbook vars in a way that works with 1.9
  Change ldap and other sso defaults to remove from team/admin
  ...
2016-06-12 22:42:42 -04:00
Akita Noek
25f0d65c5f Ancestor rebuild optimization progress 2016-04-14 21:56:10 -04:00
Graham Mainwaring
ba916ed25f Preliminary EL6 SCL Python 2.7 support 2016-03-23 15:46:00 -04:00
Leigh Johnson
ff1c41e8dc revert unintended change to awx-munin.conf 2016-03-11 15:33:16 -05:00
Leigh Johnson
e34aebcd93 refactor delete-job-template.service-test, integrate jobTemplate.copy, resolves #1105 & #1047, tracking #1176 2016-03-11 14:41:05 -05:00
John Mitchell
12af62f671 Dashboard refresh 2015-05-29 09:53:39 -04:00
Chris Houseknecht
d869f82dc2 Login dialog
If the attempt to get the license ('/api/v1/config') or user info ('/api/v1/me') fails, force user back to the login page. Additionally, call Authorization.logout() to make sure any residual token or user info is cleared.

Tweaked the login HTML so that ng-show on the login dialog header message will cause the message to show when the sessionExpired variable is null or undefined.
2014-08-15 14:10:33 -04:00
Jared Tabor
504b810418 changed azure labels and added them into inventory groups modal window 2014-07-28 17:06:30 -04:00