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

8330 Commits

Author SHA1 Message Date
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
Alan Rominger
cfc763af07 Merge pull request #2444 from AlanCoding/2364_access_list_restriction
Filter access_list to users visible by requesting user
2016-06-16 13:07:30 -04:00
Alan Rominger
20e832f9a9 Merge pull request #2448 from AlanCoding/2391_jt_launch_falsy
Graceful handling of falsy launchtime values
2016-06-16 13:06:48 -04:00
Alan Rominger
1e99f92a50 Merge pull request #2425 from AlanCoding/2420_inventory_access_bug
Fix bug leftover from changing JT can_add access
2016-06-16 13:05:14 -04:00
Alan Rominger
aed2a60dee Merge pull request #2422 from AlanCoding/2401_prompting
Indicate intent to prompt with can_start_without_user_input
2016-06-16 13:03:28 -04:00
Alan Rominger
c15b5f54f8 Merge pull request #2416 from AlanCoding/2409_inv_update_permission
Require admin role to edit inventory
2016-06-16 13:02:45 -04:00
John Mitchell
85c5fdd456 fixed layout issue with long result detail text 2016-06-16 11:53:06 -04:00
AlanCoding
54fa11cf25 restrict queryset for access_list to visable users 2016-06-16 11:05:57 -04:00
jlmitch5
de4f053212 Merge pull request #2439 from jlmitch5/fixCopyCancel
Fix copy cancel
2016-06-16 10:09:37 -04:00
Leigh
219b570eb6 fix host summary display when 0 search results are found, fix graph sizing, resolves #2399 (#2430) 2016-06-16 10:03:37 -04:00
Leigh
e75cf000e4 fix cred lookup init where inventory source is ec2, resolves #2428 (#2431) 2016-06-16 10:03:29 -04:00
kensible
ceec66d1ef Merge pull request #2429 from kensible/1840-permissionsLanguage
Changed tab names and empty list message for permissions
2016-06-16 09:53:42 -04:00
AlanCoding
5af6d14f27 protect launch endpoint against certain falsy values 2016-06-16 09:41:07 -04:00
Ken Hoes
760fb3845f Matched order of column listings 2016-06-16 09:23:31 -04:00
Leigh Johnson
758a5dce84 fix group > edit breadcrumb 2016-06-15 21:11:09 -04:00
Jared Tabor
98e5291bfc Disabling notifications related button for manual groups 2016-06-15 15:46:44 -07:00
Jared Tabor
490425970a JS Hint 2016-06-15 15:41:40 -07:00
Graham Mainwaring
e413e340e9 Merge pull request #2436 from ghjm/preflight_passwords_fix
Fixed preflight for the new empty passwords inventory
2016-06-15 17:32:30 -04:00
Chris Church
45264c2009 Hide write-only fields from results in API docs. 2016-06-15 17:27:41 -04:00
Chris Church
5cf17eb360 Fix browsable API styles in wide mode. 2016-06-15 17:27:41 -04:00
Michael Abashian
f867ed17b4 Changed notification list header titles from Successful/Failed to Success/Failure 2016-06-15 17:25:21 -04:00
John Mitchell
6bd3fcf8b0 remove unnecessary comment and unneeded params obj 2016-06-15 17:06:45 -04:00
Michael Abashian
3b6ab4ea5e Merge pull request #2424 from mabashian/websocket-indicator-middle
Hide the socket indicator if the license is missing
2016-06-15 16:52:08 -04:00
Leigh Johnson
db11075ced fix JSLint error 2016-06-15 16:41:19 -04:00
Michael Abashian
4159100778 Prevent the click event from bubbling up and keeping the dropdown visible on searches. 2016-06-15 16:39:27 -04:00
jlmitch5
3a68a9219a Merge pull request #2435 from jlmitch5/sortManagementJObs
sort management jobs so that they don't change order
2016-06-15 16:21:41 -04:00
John Mitchell
cac64ce133 sort management jobs so that they don't change order 2016-06-15 16:12:21 -04:00
John Mitchell
7b5bbe52f3 make cancel normal after copy 2016-06-15 16:08:45 -04:00
Michael Abashian
43d2fdb60e Fixed bug where having only two organizations would result in a large whitespace between the org cards 2016-06-15 15:50:12 -04:00
Ken Hoes
7b732a7401 Changed tab names and empty list message for permissions 2016-06-15 15:07:37 -04:00
Matthew Jones
cded126f5b worker_ready is unused here 2016-06-15 14:40:50 -04:00
Leigh
2aa18e394b Fixes 2 instances of CodeMirror on one $scope & use CodeMirror for inventory source vars (#2410)
* fix azure regions multiselect, resolves #2289

* fix 2 simultaneous instances of CodeMirror inside one $scope, CodeMirror-ify inventory source vars, resolves #2333
2016-06-15 12:56:00 -04:00
Matthew Jones
19c8fe915f Add a celery worker init task
We'll use this task to perform any worker specific startup actions.
Initially this is used to re-sync any Tower schedules on startup.
2016-06-15 12:09:39 -04:00
AlanCoding
a0c4bb5f6f fix bug with inventory in JT can_add 2016-06-15 11:59:16 -04:00
Michael Abashian
69c994bd16 Merge pull request #2411 from mabashian/job-templates-remove-label
Refresh label array whenever one is removed
2016-06-15 11:41:50 -04:00
Michael Abashian
7948e3e6c5 Hide the socket indicator if the license is missing 2016-06-15 11:34:57 -04:00
Jared Tabor
90d424b7a6 Merge pull request #2412 from jaredevantabor/notifications
Changing failed notification toaster icon
2016-06-15 08:33:26 -07:00
jlmitch5
10602da42a Merge pull request #2370 from jlmitch5/fixCrud
fix add/edit/delete behavior across tower ui
2016-06-15 11:23:57 -04:00
Matthew Jones
9b49ff15bd Mass rename foreman -> satellite6
For end-user facing elements. We still maintain foreman for some
underlying logic needed by the modules
2016-06-15 11:16:15 -04:00