Skip to content
Permalink
Browse files

resolving merge from master conflicts

  • Loading branch information...
Phrozyn committed Nov 16, 2018
2 parents bbf2d10 + ee606a1 commit 91fbc63f4e68cd5b400b07f5f87e02a3f162dcce
Showing with 5 additions and 6 deletions.
  1. +1 −1 .gitignore
  2. +2 −3 meteor/client/menu.html
  3. +1 −2 meteor/client/mozdef.js
  4. +1 −0 rest/index.py
@@ -16,4 +16,4 @@ alerts/generic_alerts
cloudy_mozdef/aws_parameters.json
cloudy_mozdef/aws_parameters.sh
docs/source/_build
docs/source/_static
docs/source/_static
@@ -7,7 +7,7 @@

<template name="menu">
<div class="container headercontainer">
{{#if haveFeatures }}
{{#if haveFeatures }}
<div id="header" class="row center">
<span id="nav-main">
<ul>
@@ -29,7 +29,7 @@
<ul>
{{#if isFeature "watchlist"}}
<li><a href="/watchlist">watchlist</a></li>
{{/if}}
{{/if}}
{{#if isFeature "ipblocklist"}}
<li><a href="/ipblocklist">ip blocklist</a></li>
{{/if}}
@@ -93,4 +93,3 @@
<a target=" _blank" href="{{url}}">{{name}}</a>
</li>
</template>

@@ -313,7 +313,7 @@ if (Meteor.isClient) {
whoisitem=$("<li><a class='ipmenu-whois' data-ipaddress='" + iptext + "'href='#'>whois</a></li>");
dshielditem=$("<li><a class='ipmenu-dshield' data-ipaddress='" + iptext + "'href='#'>dshield</a></li>");
intelitem=$("<li><a class='ipmenu-intel' data-ipaddress='" + iptext + "'href='#'>ip intel</a></li>");
if ( isFeature('watchItemitem') ){
if ( isFeature('watchItem') ){
watchItemitem=$("<li><a class='ipmenu-watchitem' data-ipaddress='" + iptext + "'href='#'>watch</a></li>");
}else{
watchItemitem=$();
@@ -323,7 +323,6 @@ if (Meteor.isClient) {
}else{
blockIPitem=$();
}

ipmenu.append(copyitem,whoisitem,dshielditem,intelitem,watchItemitem,blockIPitem);

$(this).parent().parent().append(ipmenu);
@@ -140,6 +140,7 @@ def index():
sendMessgeToPlugins(request, response, 'watchitem')
return response


@post('/ipwhois', methods=['POST'])
@post('/ipwhois/', methods=['POST'])
@enable_cors

0 comments on commit 91fbc63

Please sign in to comment.
You can’t perform that action at this time.