mirror of
https://github.com/hak5/nano-tetra-modules.git
synced 2025-10-29 16:58:09 +00:00
PortalAuth 1.6 & CursedScreech 1.4
This commit is contained in:
parent
fcca467ded
commit
ae53ba8ea1
@ -684,19 +684,12 @@ registerController('CursedScreechController', ['$api', '$scope', '$sce', '$inter
|
||||
transformRequest: angular.identity,
|
||||
headers: {'Content-Type': undefined}
|
||||
}).then(function(response) {
|
||||
<<<<<<< HEAD
|
||||
var errors = {};
|
||||
for (var key in response.data) {
|
||||
if (response.data[key].success == "Failed") {
|
||||
var msg = response.data[key].message + '\n';
|
||||
if (!errors.hasOwnProperty(msg)) {
|
||||
errors[msg] = true;
|
||||
=======
|
||||
for (var key in response) {
|
||||
if (response.hasOwnProperty(key)) {
|
||||
if (response.key == "Failed") {
|
||||
alert("Failed to upload " + key);
|
||||
>>>>>>> upstream/master
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,9 +6,5 @@
|
||||
"tetra"
|
||||
],
|
||||
"title": "CursedScreech",
|
||||
<<<<<<< HEAD
|
||||
"version": "1.4"
|
||||
=======
|
||||
"version": "1.3"
|
||||
>>>>>>> upstream/master
|
||||
}
|
||||
|
||||
@ -641,19 +641,12 @@ registerController('PortalAuthController', ['$api', '$scope', '$sce', '$interval
|
||||
transformRequest: angular.identity,
|
||||
headers: {'Content-Type': undefined}
|
||||
}).then(function(response) {
|
||||
<<<<<<< HEAD
|
||||
var errors = {};
|
||||
for (var key in response.data) {
|
||||
if (response.data[key].success == "Failed") {
|
||||
var msg = response.data[key].message + '\n';
|
||||
if (!errors.hasOwnProperty(msg)) {
|
||||
errors[msg] = true;
|
||||
=======
|
||||
for (var key in response) {
|
||||
if (response.hasOwnProperty(key)) {
|
||||
if (response.key == "Failed") {
|
||||
alert("Failed to upload " + key);
|
||||
>>>>>>> upstream/master
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,9 +6,5 @@
|
||||
"tetra"
|
||||
],
|
||||
"title": "Portal Auth",
|
||||
<<<<<<< HEAD
|
||||
"version": "1.6"
|
||||
=======
|
||||
"version": "1.5"
|
||||
>>>>>>> upstream/master
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user