11838 Commits

Author SHA1 Message Date
Matthew Jones
fd7c2550ee Fix a potential security issue in revision storage path name
It's too stable and could lead to a race condition
2017-02-23 16:21:13 -05:00
Chris Meyers
4e65e6624a Merge pull request #5527 from chrismeyersfsu/fix-log_settings
prevent traceback when host is set to null/None
2017-02-23 15:52:32 -05:00
Chris Meyers
1b069a5cd1 Merge pull request #5528 from chrismeyersfsu/fix-rectifier
fix check running status
2017-02-23 15:52:05 -05:00
Chris Meyers
50a8083984 flake8 2017-02-23 15:41:41 -05:00
John Mitchell
2e0597b13f fix permissions disabled tooltip wording 2017-02-23 15:14:52 -05:00
Chris Meyers
08825a1f49 fix check running status 2017-02-23 15:09:50 -05:00
John Mitchell
3fe444374b only call processEvent within the buffer 2017-02-23 14:57:02 -05:00
Chris Meyers
2953479dc8 correct behavior of tower_uuid logging setting
* Register a default=function() with LOG_AGGREGATOR_TOWER_UUID. We know
this function will ONLY be called when there is no database backed
settings. Therefore, we set a one-time uuid at this time.
* The user is free to change LOG_AGGREGATOR_TOWER_UUID.
* The user may not set this field to null
* The user may not set this field to ''
2017-02-23 14:31:47 -05:00
Chris Meyers
0b04001b15 host may be None, account for that 2017-02-23 14:31:24 -05:00
Ryan Petrello
05e1348ef9 Merge pull request #5521 from ryanpetrello/fix-4975
allow AD_HOC_COMMANDS to be set to [] in the settings ui
2017-02-23 14:18:02 -05:00
Ryan Petrello
7a8089681e Merge pull request #5524 from ryanpetrello/fix-4931
always refetch license config
2017-02-23 14:17:33 -05:00
Ryan Petrello
28dd2d3407 Merge pull request #5522 from ryanpetrello/fix-5094
allow idempotent save when editing an inventory script
2017-02-23 12:47:39 -05:00
Ryan Petrello
b7e48c437d always refetch license config
see: #4931
2017-02-23 12:22:44 -05:00
Ryan Petrello
0c0f3b236f allow idempotent save when editing an inventory script
see: #5094
2017-02-23 11:34:04 -05:00
Ryan Petrello
fc583ead21 allow AD_HOC_COMMANDS to be set to [] in the settings ui
see: #4975
2017-02-23 10:51:54 -05:00
Ryan Petrello
e1c2a06246 Merge pull request #5518 from ryanpetrello/fix-4979
move a tall tooltip's placement on the credentials UI to avoid cutoff
2017-02-23 10:20:02 -05:00
Jared Tabor
fca5e1975a Merge pull request #5516 from jaredevantabor/host-event-stdout
Fixing host event stdout/stderr
2017-02-23 07:12:19 -08:00
Ryan Petrello
6b75ed3dcb move a tall tooltip's placement on the credentials UI to avoid cutoff
when browser text size is increased, this tooltip gets cut off at the
top of the browser window

see: #4979
2017-02-23 09:48:52 -05:00
jaredevantabor
a62d1b8437 fixing host event stdout (it should pull from host-event.res) 2017-02-22 17:25:44 -08:00
Alan Rominger
0bdcfbb33e Merge pull request #5512 from AlanCoding/inv_src_qs
Add InventorySource back into schedule queryset
2017-02-22 17:01:11 -05:00
Matthew Jones
b43a354bca Merge branch 'improve_ujt_filter_aliases' into release_3.1.0
* improve_ujt_filter_aliases:
  Alias unified job template search fields for presentation
2017-02-22 16:59:56 -05:00
Alan Rominger
1f0b3876cc Merge pull request #5506 from AlanCoding/no_bad_names
More gutting of related_search_fields in 3.1 scope
2017-02-22 16:52:56 -05:00
jlmitch5
70b826fecb Merge pull request #5513 from jlmitch5/stylingJobResults
fix job results styling
2017-02-22 16:40:35 -05:00
Jared Tabor
87a3481fcb Merge pull request #5514 from jaredevantabor/defaults-null-pointer-exception
Extra check to prevent console error
2017-02-22 13:19:30 -08:00
jaredevantabor
b724abb684 adding a check to prevent a console error due to null pointer 2017-02-22 13:11:20 -08:00
John Mitchell
4c665171ed fix job results styling 2017-02-22 15:52:24 -05:00
AlanCoding
d85eda99c6 add back in Inv Src into schedule queryset computation 2017-02-22 15:34:18 -05:00
Matthew Jones
b14336bdff Alias unified job template search fields for presentation
The polymorphic accessors have a name that is different than our
normal presentation name for these types. This aliases them for the
presentation layer and then handles processing them when they are
given as filters.
2017-02-22 15:33:47 -05:00
Jared Tabor
0a25b286ca Merge pull request #5509 from jaredevantabor/missing-project-jt
Deleting underlying project from a JT fix
2017-02-22 12:15:06 -08:00
Michael Abashian
a484dae41a Fix for deleting search tags on job details 2017-02-22 14:59:54 -05:00
jaredevantabor
30951f4b31 fix for setting scan job template project/playbook
the logic for a scan job was also getting caught for a run job w/ a missing project
2017-02-22 11:58:37 -08:00
jlmitch5
365659051e Merge pull request #5474 from jlmitch5/fixRecentJobRunsList
include workflows on dashboard recent job runs list
2017-02-22 14:37:00 -05:00
Jared Tabor
d56317a161 Merge pull request #5500 from jaredevantabor/ctit-reset
[CTiT] Reverting All The Things
2017-02-22 10:59:23 -08:00
jlmitch5
6c799325c8 Merge pull request #5497 from jlmitch5/fixJobResultsRaceCondition
Fix job results race condition
2017-02-22 13:56:46 -05:00
John Mitchell
105a926abe also remove line from karma config coz chris meyers is an idiot 2017-02-22 13:45:43 -05:00
John Mitchell
78dab3741d accidentally messed up karma config, reverting 2017-02-22 13:44:56 -05:00
jaredevantabor
b9c2346d57 fixing jshint error 2017-02-22 10:43:42 -08:00
John Mitchell
96121c6189 fix tests 2017-02-22 13:41:12 -05:00
AlanCoding
a69a4de51e prohibit additional items from related_search_fields 2017-02-22 13:32:05 -05:00
Ryan Petrello
f11e9076cf Merge pull request #5505 from ryanpetrello/fix-5470
set the default in OPTIONS for TOWER_URL_BASE to the request hostname
2017-02-22 12:29:53 -05:00
Ryan Petrello
94ad12ab0d set the default in OPTIONS for TOWER_URL_BASE to the request hostname
see: #5470
2017-02-22 11:16:08 -05:00
Michael Abashian
de4aeb064c Fixed recent job runs workflows link 2017-02-22 10:48:53 -05:00
Michael Abashian
293063d315 Pass template type to remaining aw-smart-status directives. The directive will look at the type when generating the href 2017-02-22 10:42:39 -05:00
Ryan Petrello
fe053dca83 Merge pull request #5495 from ryanpetrello/blacklist_sensitive_search_keys
blacklist certain sensitive fields and relations as search arguments
2017-02-22 10:28:03 -05:00
Matthew Jones
9e2e119022 Make polymorphic_ctype aliasing work in filters
Previousy this would fall through and get caught by the type checker
2017-02-21 21:32:33 -05:00
Chris Meyers
03d749a630 Merge pull request #5501 from chrismeyersfsu/private-performance_logging
be forgiving in log api log message fields list
2017-02-21 21:08:41 -05:00
jaredevantabor
63f27a120f fixing reset for CodeMirror instances 2017-02-21 17:51:10 -08:00
jaredevantabor
331be6c803 fix for reverting regular textareas 2017-02-21 17:10:01 -08:00
jaredevantabor
aa1481b931 fix for jshint 2017-02-21 17:09:45 -08:00
jaredevantabor
198fa2740a reverting custom logo 2017-02-21 16:30:45 -08:00