1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Commit Graph

8168 Commits

Author SHA1 Message Date
Michael Abashian
593441b70e Merge pull request #2492 from mabashian/survey-maxlength
Pass survey question min/max values to API correctly
2016-06-17 15:29:34 -04:00
Michael Abashian
61f3af1f86 Merge pull request #2461 from mabashian/jt-labels-combining
Fixed bug where JT labels appeared to be getting combined
2016-06-17 15:29:07 -04:00
jlmitch5
c0289e0f6c Merge pull request #2502 from jlmitch5/fixJobsSort
fix jobs sort
2016-06-17 14:13:43 -04:00
John Mitchell
b447544dc7 fix jobs sort 2016-06-17 13:54:01 -04:00
Chris Church
71bc88450f Merge pull request #2443 from cchurch/credential_create_fixes
Update validation and supported fields for creating credentials.
2016-06-17 12:05:53 -04:00
Matthew Jones
462d43060e Fix up missing notifications in invsrc 2016-06-17 11:52:13 -04:00
Chris Church
c2285f1a4c Split up the credential xfail tests. 2016-06-17 11:42:20 -04:00
Michael Abashian
2b079f3fea Merge pull request #2486 from mabashian/refresh-button-audit
Tweaked refresh buttons on the dashboard/job page/portal mode
2016-06-17 10:59:46 -04:00
Michael Abashian
772e626a93 Merge pull request #2438 from mabashian/search-filter-dropdowns
Fix search tag dropdown not disappearing after selection
2016-06-17 10:59:04 -04:00
Michael Abashian
12ea09ed45 Make sure that we pass the min/max values back to the api as integers/floats and not strings 2016-06-17 10:49:26 -04:00
Chris Church
59361f5151 Fixes suggested by @AlanCoding. 2016-06-17 09:56:27 -04:00
Chris Church
cf7102bc49 Move validation of credential creation to the serializer. Use SubListCreateAPIView for creating a credential under another object, and remove fields from serializer and API docs that aren't valid when creating a credential under another object. 2016-06-17 09:56:27 -04:00
Wayne Witzel III
67a1b8ce81 Merge pull request #2483 from wwitzel3/issue-2186
add can_delete check method (defers to admin)
2016-06-17 09:52:05 -04:00
Wayne Witzel III
010e688c84 Merge pull request #2484 from wwitzel3/issue-2205
updating URL to be _ instead of /
2016-06-17 09:51:18 -04:00
Ryan Fitzpatrick
8e00c8a7d9 Merge pull request #2482 from rmfitzpatrick/no_issue_add_awx_manage_to_docker_compose
add awx-manage executable for tower-qa tests
2016-06-17 09:32:44 -04:00
Leigh
9590c245fd normalize styles of child group count badge, resolves #2376 (#2462) 2016-06-16 18:53:39 -04:00
Michael Abashian
5f4da1023e Tweaked refresh buttons on the dashboard/job page/portal mode 2016-06-16 17:34:07 -04:00
Jared Tabor
d50cd9882d Merge pull request #2442 from jaredevantabor/manual-group-notifications
Disabling notifications related button for manual groups
2016-06-16 14:16:05 -07:00
Wayne Witzel III
6f36497b6a updating URL to be _ instead of / 2016-06-16 17:05:42 -04:00
Wayne Witzel III
6b0155b3f9 add can_delete check method (defers to admin) 2016-06-16 16:54:51 -04:00
Jared Tabor
95e500d472 the disabled key for the manual-inv-group-notifications
was getting added to the notifications object for all notifications-related-lists
2016-06-16 13:52:31 -07:00
Ryan Fitzpatrick
6bee1f11df add awx-manage executable for tower-qa tests 2016-06-16 16:45:42 -04:00
Wayne Witzel III
051d419b1f Merge pull request #2450 from wwitzel3/release_3.0.0
Fixing Team and Credential access issues
2016-06-16 16:36:03 -04:00
Jared Tabor
b56c8f297d Merge pull request #2457 from jaredevantabor/idle-countdown
Changing color of idle countdown text to #D9534F
2016-06-16 13:31:48 -07:00
Alan Rominger
d9f62c4fa9 Merge pull request #2458 from AlanCoding/2453_proj_team_sub
/teams/N/projects/ queryset changed to reverse of /projects/N/teams/
2016-06-16 16:06:18 -04:00
James Laska
c6680c5f7e Merge pull request #2466 from jlaska/cloud_verify_ssl
Honor CLOUD_VERIFY_SSL variable in rax import
2016-06-16 16:02:10 -04:00
jlmitch5
e154a7f27a Merge pull request #2463 from jlmitch5/portalSort
fix sorting of portal mode jobs list
2016-06-16 15:51:40 -04:00
James Laska
af8011cd91 Honor CLOUD_VERIFY_SSL variable in rax import 2016-06-16 15:49:08 -04:00
Matthew Jones
526c7d719f Disable rax ssl verification everywhere 2016-06-16 15:48:36 -04:00
Wayne Witzel III
58c8cc1703 adjust team admin_role / member_role assertion 2016-06-16 15:32:00 -04:00
Jared Tabor
bdcb6e5c20 Merge pull request #2440 from jaredevantabor/session
Adding an extra session check for when a user closes Tower
2016-06-16 12:28:10 -07:00
Wayne Witzel III
14809c086d added some assertions to catch cycles, updated migration 2016-06-16 15:24:07 -04:00
Wayne Witzel III
791589dab8 Fixing Team and Credential access issues 2016-06-16 15:23:50 -04:00
John Mitchell
0fbc81eb71 fix sorting of portal mode jobs list 2016-06-16 15:17:02 -04:00
Jared Tabor
d9f4819372 js hint 2016-06-16 11:59:02 -07:00
jlmitch5
4791255350 Merge pull request #2454 from jlmitch5/fixJDLayoutIssue
fixed layout issue with long result detail text
2016-06-16 14:50:00 -04:00
Leigh
8b117c9087 order host event results by host_name, resolves #2390 (#2460) 2016-06-16 14:46:57 -04:00
Michael Abashian
946b77128c Merge pull request #2441 from mabashian/notification-list-headers
Changed related notification list header titles
2016-06-16 14:37:44 -04:00
Michael Abashian
70c910dc0d Merge branch 'mabashian-blank-column-2-orgs' into release_3.0.0 2016-06-16 14:36:34 -04:00
Michael Abashian
a8eb8073bc Merge branch 'blank-column-2-orgs' of https://github.com/mabashian/ansible-tower into mabashian-blank-column-2-orgs
# Conflicts:
#	awx/ui/client/src/helpers/Parse.js
2016-06-16 14:36:05 -04:00
Michael Abashian
3d9baea3e3 Merge pull request #2368 from mabashian/inv-manage-breadcrumb
Tweaked several inventory manage breadcrumbs per UX feedback
2016-06-16 14:29:58 -04:00
Jared Tabor
ab9448e039 changing logic for is-loggedOut class 2016-06-16 11:06:53 -07:00
Jared Tabor
322451853d unpromisifying the logout() function call
and fix for other PR feedback
2016-06-16 10:51:31 -07:00
Michael Abashian
5a7cbd90c6 Fixed bug where labels that matched existing labels appeared to be getting combined on JT create/edit 2016-06-16 13:51:26 -04:00
Jared Tabor
c6879e5163 Adding an extra session check for when a user closes tower
before the session times out and returns to Tower. Also changed the login route controller to a resolve to ensure that the login modal appears.
2016-06-16 10:50:53 -07:00
Leigh
27f0224b90 Order event summary results by host_name (#2455)
* order event summary results by host_name, resolves #2394

* disable select-all unit test

* Revert "disable select-all unit test"

This reverts commit ec8fd9ca81db90f33bedfd7e736ec55fcd8b5aea.
2016-06-16 13:50:11 -04:00
Jared Tabor
7286163281 Changing color of idle countdown text to #D9534F 2016-06-16 10:23:15 -07:00
AlanCoding
068a788958 team_project sublist to use same pattern as project_team 2016-06-16 13:18:47 -04:00
Matthew Jones
251dae657a Force schedule save during celery startup 2016-06-16 13:14:53 -04:00
kensible
4354279410 Merge pull request #2447 from kensible/2446-columnOrder
Matched order of column listings
2016-06-16 13:08:58 -04:00