github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 21:03:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git

Browse source
This commit is contained in:
Drewster727 2016-05-24 15:46:11 -05:00
commit 4646bb5d79
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PlexRequests.UI/Views/Admin/Authentication.cshtml
View file

@ -122,7 +122,7 @@
$('#requestToken').click(function (e) { $('#requestToken').click(function (e) {
e.preventDefault(); e.preventDefault();
var url = createBaseUrl(base, "requestauth"); var url = createBaseUrl(base, "admin/requestauth");
var $form = $("#mainForm"); var $form = $("#mainForm");
$.ajax({ $.ajax({
type: $form.prop("method"), type: $form.prop("method"),
@ -149,7 +149,7 @@
function loadUserList() { function loadUserList() {
$('#users').html(""); $('#users').html("");
var url = "getusers"; var url = "admin/getusers";
url = createBaseUrl(base, url); url = createBaseUrl(base, url);
$.ajax({ $.ajax({
type: "Get", type: "Get",

6
appveyor.yml
View file

@ -1,11 +1,11 @@
version: 1.6.{build} version: 1.7.{build}
configuration: Release configuration: Release
assembly_info: assembly_info:
patch: true patch: true
file: '**\AssemblyInfo.*' file: '**\AssemblyInfo.*'
assembly_version: '1.6.1' assembly_version: '1.7.1'
assembly_file_version: '{version}' assembly_file_version: '{version}'
assembly_informational_version: '1.6.1' assembly_informational_version: '1.7.1'
before_build: before_build:
- cmd: appveyor-retry nuget restore - cmd: appveyor-retry nuget restore
build: build: