11190 Commits

Author SHA1 Message Date
Ryan Petrello
836ca21b7e add unit tests for awx.conf 2017-01-30 12:37:11 -05:00
Ryan Petrello
4fcc74012d display read-only settings in the API settings endpoint
References #4665
2017-01-30 10:09:15 -05:00
Alan Rominger
3b5471dbcf Merge pull request #5029 from AlanCoding/scm_rev_hide
hide scm revision for manual projects
2017-01-30 09:58:14 -05:00
Chris Meyers
7c42985875 Merge pull request #5010 from chrismeyersfsu/fix-4957
disable playbook when permission denied to list
2017-01-30 09:49:49 -05:00
Bill Nottingham
7fbc187cef Merge pull request #5006 from wenottingham/pofix
Fix some apparent syntax errors in po file.
2017-01-30 09:46:50 -05:00
AlanCoding
001027e2cb hide scm revision for manual projects 2017-01-30 09:24:01 -05:00
Alan Rominger
d2e354d9a8 Merge pull request #5025 from AlanCoding/5023
dont check license in API browser method evaluation
2017-01-28 19:37:14 -05:00
AlanCoding
a54b2ff468 dont check license in API browser method evaluation 2017-01-28 19:30:09 -05:00
Jared Tabor
e5f7556fc2 Merge pull request #5017 from jaredevantabor/dashboard-failed-projects
Dashboard failed projects
2017-01-27 15:35:44 -08:00
Jared Tabor
0a8d999e11 Merge pull request #5001 from jaredevantabor/host-event-modal
Style Audit of Host Event Modal
2017-01-27 15:24:04 -08:00
Michael Abashian
7dcec7521a Merge pull request #4991 from mabashian/2964-delete-nodes
Fixed node deletion/conflict bug
2017-01-27 18:17:57 -05:00
jaredevantabor
9d0f8b0191 query for failed projects to include canceled 2017-01-27 15:13:48 -08:00
Chris Meyers
50970f2c31 disable playbook when permission denied to list 2017-01-27 16:31:30 -05:00
Bill Nottingham
e99d974ea8 Fix some apparent syntax errors in po file. 2017-01-27 16:09:29 -05:00
Chris Meyers
0a5b037236 Merge pull request #4962 from chrismeyersfsu/fix-4354
ensure manually modifying hosts adhears to license
2017-01-27 15:03:25 -05:00
jaredevantabor
fd54cc7ab3 Style Audit of Host Event Modal 2017-01-27 11:57:02 -08:00
Shane McDonald
a467d20341 Update po files 2017-01-27 13:34:09 -05:00
Shane McDonald
9ec99cd026 Update pot files 2017-01-27 13:34:09 -05:00
Alan Rominger
6d590ca985 Merge pull request #4974 from AlanCoding/job_event_need_for_speed
job_event speedups, async filter removed, RBAC changes
2017-01-27 11:23:25 -05:00
Michael Abashian
2dbc3abc34 Make sure to delete any nodes that need to be deleted before attempting to associate 2017-01-27 11:23:20 -05:00
Alan Rominger
ae057d2bd5 Merge pull request #4912 from AlanCoding/as_mods
WFJT activity stream for org admins + other polishing
2017-01-27 11:17:34 -05:00
Alan Rominger
1b0c2cbb32 Merge pull request #4986 from AlanCoding/destroyer_of_notifications
Add notifications to cleanup_jobs
2017-01-27 10:54:24 -05:00
Chris Meyers
ef3a3b3b2f super-user requests to HostDetail go through rbac 2017-01-27 10:51:26 -05:00
Alan Rominger
4f3916cab7 Merge pull request #4985 from AlanCoding/sys_job_words
Elaborate on system job defaults
2017-01-27 10:48:43 -05:00
Michael Abashian
5552d0b6f9 Merge pull request #4976 from mabashian/launch-job-with-prompts
Launch job with prompts
2017-01-27 10:44:56 -05:00
Michael Abashian
55d74f0975 Launch job with prompts fixes 2017-01-27 10:36:38 -05:00
Michael Abashian
99cd9d9d4b Merge pull request #4982 from mabashian/4860-delete-tags
Smart search tag deletion (again)
2017-01-27 10:01:20 -05:00
Matthew Jones
cf084850c2 Merge pull request #4960 from ansible/priv_esc_hangs
Fixes some issues where Tower would not emit the password on prompts
2017-01-27 09:51:57 -05:00
AlanCoding
33e97d5c5a add notifications to cleanup_jobs 2017-01-27 09:31:11 -05:00
Chris Meyers
6aaf6a3150 allow can_add to be called for permission info
* can_add() is called through our generic permission/access framework
for api creation (POST). However, can_add() may also be called for
purposes of determining if a user has perms to do something. Thus, the
data field may not contain 'name' in this case. Allow for that.
2017-01-27 09:19:20 -05:00
Chris Meyers
4367e4a9ae Merge pull request #4942 from chrismeyersfsu/fix-vmware_link
update vmware inventory ini link
2017-01-27 09:18:32 -05:00
Chris Meyers
10a3e972df Merge pull request #4977 from chrismeyersfsu/fix-4725
bump vmware inventory script
2017-01-27 09:18:03 -05:00
AlanCoding
a5be524101 Elaborate on system job default 2017-01-27 08:47:39 -05:00
Wayne Witzel III
7807ee09f9 Merge pull request #4915 from wwitzel3/issue-4636
Mask the default value for password fields in survey_spec.
2017-01-27 02:37:16 -05:00
jaredevantabor
6df36ce038 i accidentally removed the "-1" from this check, adding it back in 2017-01-26 16:29:12 -08:00
AlanCoding
18aa0dcb1f remove job_event text filters, tweaked RBAC
see issue 4958 for the RBAC details
2017-01-26 19:22:03 -05:00
Jared Tabor
8ec7808751 Merge pull request #4948 from jaredevantabor/job-results-error-event_type
Standard out wasn't being shown for all possible event_types
2017-01-26 15:29:46 -08:00
jaredevantabor
6223cb6921 fixing jshint 2017-01-26 14:52:49 -08:00
Jared Tabor
c01936d714 Merge pull request #4950 from jaredevantabor/job-explanation
Fix for job results explanation and traceback
2017-01-26 14:49:18 -08:00
Michael Abashian
f7f92c961d Adding tags was creating this nested array structure which was causing buggy behavior. This should fix that. 2017-01-26 17:36:51 -05:00
Chris Meyers
608975ff2f bump vmware inventory script 2017-01-26 16:01:57 -05:00
Matthew Jones
bfda6ff8b5 Fix up some unit tests 2017-01-26 16:01:54 -05:00
kensible
f25edf63bf Merge pull request #4973 from kensible/4874-category-dropdown
Fixed location of sub-category dropdowns
2017-01-26 15:54:52 -05:00
jaredevantabor
2be7a9ded7 moving appendToBottom function elsewhere 2017-01-26 12:48:05 -08:00
jaredevantabor
c751c56355 rearranging logic to match integrity of existing logic 2017-01-26 12:36:15 -08:00
Jared Tabor
7488e09763 Merge pull request #4927 from jaredevantabor/projects-sockets
Preventing page from refreshing when project list updates via the socket
2017-01-26 12:20:25 -08:00
Jared Tabor
a86f3d61c2 Merge pull request #4925 from jaredevantabor/groups-pagination
Groups pagination
2017-01-26 12:19:27 -08:00
Ken Hoes
2ed75a0a16 Fixed location of sub-category dropdowns 2017-01-26 15:18:42 -05:00
Chris Meyers
fbebc58267 add tests for license add host duplicate or not logic 2017-01-26 15:16:33 -05:00
jaredevantabor
484eda4aa1 fix for traceback 2017-01-26 12:11:31 -08:00