12954 Commits

Author SHA1 Message Date
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
Chris Meyers
427b484075 be forgiving in log api log message fields list 2017-02-21 19:24:27 -05:00
jaredevantabor
578988f2e4 changing "RESET" to "REVERT" 2017-02-21 14:19:27 -08:00
Alan Rominger
6039ad15af Merge pull request #5498 from AlanCoding/expire_tasks
Expire certain beat tasks if not ran on schedule
2017-02-21 17:10:26 -05:00
Ryan Petrello
dc275b757e Merge pull request #5499 from ryanpetrello/fix-5420
mark ON/OFF i18n for certain toggle switches
2017-02-21 16:53:32 -05:00
Ryan Petrello
c8d943ccb1 mark ON/OFF i18n for certain toggle switches 2017-02-21 16:32:12 -05:00
Ryan Petrello
e9a9a79d94 Merge pull request #5454 from ryanpetrello/fix-5420
disable the on/off toggle button for hosts from dynamic inventory.
2017-02-21 16:30:43 -05:00
jaredevantabor
695a5e9a5d fixing CTiT select2 dropdowns for when the user hits the RESET button 2017-02-21 13:29:44 -08:00
Ryan Petrello
73a5a1e61e mark i18n strings for denied API search parameters 2017-02-21 16:18:06 -05:00
Ryan Petrello
d24fb32358 blacklist certain sensitive fields and relations as search arguments
see: #5465
see: #5478
2017-02-21 16:18:02 -05:00
Ryan Petrello
8abf084211 disable the on/off toggle button for hosts from dynamic inventory.
see: #5420
2017-02-21 16:15:47 -05:00
jlmitch5
d2746351e6 Merge pull request #5494 from jlmitch5/fixNoEventCase
fix old job no event case
2017-02-21 16:14:46 -05:00
AlanCoding
7c5856cee6 set expiration time for the disposable system tasks 2017-02-21 15:54:18 -05:00
Michael Abashian
8a6d14771e Merge pull request #5451 from mabashian/5401-lookup-spacing-empty
Remove the extra margin from the empty list when it appears in a modal
2017-02-21 15:24:31 -05:00
John Mitchell
a1f5ee501c fix test? 2017-02-21 15:12:35 -05:00
John Mitchell
191cbeee42 make sure entering already running job case doesn't called elapsed to reset 2017-02-21 15:03:36 -05:00
John Mitchell
69220e94de fix race condition with status socket 2017-02-21 14:55:11 -05:00
John Mitchell
f59b3ad886 fix job results codemirror non-mono font 2017-02-21 14:53:18 -05:00
Chris Meyers
3e122733c5 Merge pull request #5438 from chrismeyersfsu/private-performance_logging
add a new type of logger, performance.api
2017-02-21 14:35:11 -05:00
Chris Meyers
e78377dcfc remove formatters dependency on settings 2017-02-21 14:06:20 -05:00
Michael Abashian
f54cd3eef2 Merge pull request #5450 from mabashian/5425-date-formatting
Host event date locale
2017-02-21 13:40:13 -05:00
Matthew Jones
0a5b43acae Make unit test valid
Failed after recent changed that exposed the invalidity
2017-02-21 12:50:41 -05:00
Matthew Jones
46605eb591 Fix an issue filtering with non ints against foreign keys
I feel like this probably worked at one time but no longer does. It
makes me wonder if ForeignObjectRel was meant to be the catchall but
no longer is.
2017-02-21 12:33:15 -05:00
John Mitchell
d80b8fa305 fix old job no event case 2017-02-21 12:30:37 -05:00
Michael Abashian
0c75efdd99 Tighten up workflow maker form tabs 2017-02-21 12:25:28 -05:00
Alan Rominger
711bee9633 Merge pull request #5414 from AlanCoding/manage_context
Disable activity stream in cleanup_jobs, test things
2017-02-21 12:20:34 -05:00
AlanCoding
0bd606e26f remove unnecessary imports after context manager change 2017-02-21 12:08:03 -05:00
Michael Abashian
7385d66f3f Merge pull request #5457 from mabashian/5195-on-off-toggle
Changed remaining toggles from <div> to <button>
2017-02-21 11:46:29 -05:00
Michael Abashian
ece9f5592a Merge pull request #5490 from mabashian/5482-search-key-v2
Fixed search key on inv manage
2017-02-21 11:45:43 -05:00
jlmitch5
a55f3d9ee8 Merge pull request #5473 from jlmitch5/fixDetailTabInvManageGroup
fix detail tab for inventory manage edit group
2017-02-21 11:30:26 -05:00
Chris Meyers
60aa22b01b flake8 2017-02-21 11:05:30 -05:00
Alan Rominger
c9e3fc3601 Merge pull request #5445 from AlanCoding/sub_ct_from_cache
Allow UJT content type list to come from manager cache
2017-02-21 10:33:21 -05:00
Michael Abashian
eb642c1028 Changed cancel workflow text from CANCEL to PROCEED 2017-02-21 10:22:44 -05:00
Chris Meyers
98c8ff3475 rename uuid field to trigger restart on update
* Since we trigger a restart on update, we can also cache the tower uuid
value in the formatter init. So do that.
2017-02-21 10:15:02 -05:00
Michael Abashian
edb1f6a130 Fixed search key on inv manage 2017-02-21 10:13:53 -05:00
Michael Abashian
f377136095 Merge pull request #5471 from mabashian/4987-adhoc
Leave user on jobs list when relaunching adhoc command
2017-02-21 10:06:08 -05:00
Wayne Witzel III
87e0c9020f explicit ordering in workflow_nodes views 2017-02-21 02:33:45 -05:00
Alan Rominger
95e1caed56 Merge pull request #5443 from AlanCoding/vars_disp
Prevent server error in /variables/ endpoint
2017-02-20 22:29:08 -05:00
Alan Rominger
7d49d048e7 Merge pull request #5429 from AlanCoding/m2m_types
Integer (or generic ForeignKey) coercion for m2m filters
2017-02-20 22:25:57 -05:00
Alan Rominger
2b0f327523 Merge pull request #5458 from AlanCoding/migration_version
add method to obtain the migration state of Tower
2017-02-20 17:14:08 -05:00
AlanCoding
a57d8fe9fd treat GFJ and FJ and M2M all the same for type in querystring 2017-02-20 17:11:08 -05:00
Ryan Petrello
8d27c0873b Merge pull request #5480 from ryanpetrello/fix-5477
fix a minor bug in survey_spec password field handling
2017-02-20 16:57:23 -05:00
Ryan Petrello
e36cd17c16 fix a minor bug in survey_spec password field handling
see: #5477
2017-02-20 16:50:07 -05:00
Ryan Petrello
9a1ce022fe Merge pull request #5476 from ryanpetrello/fix-5453
mark a variety of host-related strings for i18n
2017-02-20 16:21:17 -05:00
Ryan Petrello
46fdc123f4 more i18n string marking for host forms
see: #5476
2017-02-20 16:12:58 -05:00
Ryan Petrello
e13e817984 mark i18n strings for the inventory host form
see: #5453
2017-02-20 16:03:01 -05:00
Ryan Petrello
e4e599c891 mark i18n strings for the dashboard host list
see: #5453
2017-02-20 16:03:01 -05:00
Ryan Petrello
176a0aa84b mark i18n strings for the dashboard host form
see: #5453
2017-02-20 16:02:55 -05:00