From 3a0ff549eb2c13c1ee588518e26723aecf005e1c Mon Sep 17 00:00:00 2001 From: Jiiks Date: Fri, 4 Dec 2015 02:11:26 +0200 Subject: [PATCH] beta stuff --- WindowsInstaller/.gitattributes | 63 ------- WindowsInstaller/.gitignore | 156 ------------------ WindowsInstaller/BetterDiscordWI.sln | 22 --- WindowsInstaller/BetterDiscordWI/App.config | 6 - .../BetterDiscordWI/BetterDiscordWI.csproj | 88 ---------- .../BetterDiscordWI/FormMain.Designer.cs | 47 ------ WindowsInstaller/BetterDiscordWI/FormMain.cs | 20 --- .../BetterDiscordWI/FormMain.resx | 120 -------------- WindowsInstaller/BetterDiscordWI/Program.cs | 22 --- .../Properties/AssemblyInfo.cs | 36 ---- .../Properties/Resources.Designer.cs | 71 -------- .../BetterDiscordWI/Properties/Resources.resx | 117 ------------- .../Properties/Settings.Designer.cs | 30 ---- .../Properties/Settings.settings | 7 - lib/BetterDiscord.js | 2 +- 15 files changed, 1 insertion(+), 806 deletions(-) delete mode 100644 WindowsInstaller/.gitattributes delete mode 100644 WindowsInstaller/.gitignore delete mode 100644 WindowsInstaller/BetterDiscordWI.sln delete mode 100644 WindowsInstaller/BetterDiscordWI/App.config delete mode 100644 WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj delete mode 100644 WindowsInstaller/BetterDiscordWI/FormMain.Designer.cs delete mode 100644 WindowsInstaller/BetterDiscordWI/FormMain.cs delete mode 100644 WindowsInstaller/BetterDiscordWI/FormMain.resx delete mode 100644 WindowsInstaller/BetterDiscordWI/Program.cs delete mode 100644 WindowsInstaller/BetterDiscordWI/Properties/AssemblyInfo.cs delete mode 100644 WindowsInstaller/BetterDiscordWI/Properties/Resources.Designer.cs delete mode 100644 WindowsInstaller/BetterDiscordWI/Properties/Resources.resx delete mode 100644 WindowsInstaller/BetterDiscordWI/Properties/Settings.Designer.cs delete mode 100644 WindowsInstaller/BetterDiscordWI/Properties/Settings.settings diff --git a/WindowsInstaller/.gitattributes b/WindowsInstaller/.gitattributes deleted file mode 100644 index 1ff0c42..0000000 --- a/WindowsInstaller/.gitattributes +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain diff --git a/WindowsInstaller/.gitignore b/WindowsInstaller/.gitignore deleted file mode 100644 index 1bc915c..0000000 --- a/WindowsInstaller/.gitignore +++ /dev/null @@ -1,156 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results - -[Dd]ebug/ -[Rr]elease/ -x64/ -build/ -[Bb]in/ -[Oo]bj/ - -# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets -!packages/*/build/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.log -*.scc - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.Publish.xml - -# NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/ - -# Windows Azure Build Output -csx -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql/ -*.Cache -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.[Pp]ublish.xml -*.pfx -*.publishsettings - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -App_Data/*.mdf -App_Data/*.ldf - - -#LightSwitch generated files -GeneratedArtifacts/ -_Pvt_Extensions/ -ModelManifest.xml - -# ========================= -# Windows detritus -# ========================= - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Mac desktop service store files -.DS_Store diff --git a/WindowsInstaller/BetterDiscordWI.sln b/WindowsInstaller/BetterDiscordWI.sln deleted file mode 100644 index 893ed68..0000000 --- a/WindowsInstaller/BetterDiscordWI.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetterDiscordWI", "BetterDiscordWI\BetterDiscordWI.csproj", "{469F7547-7664-4DE8-A568-E89525981539}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {469F7547-7664-4DE8-A568-E89525981539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {469F7547-7664-4DE8-A568-E89525981539}.Debug|Any CPU.Build.0 = Debug|Any CPU - {469F7547-7664-4DE8-A568-E89525981539}.Release|Any CPU.ActiveCfg = Release|Any CPU - {469F7547-7664-4DE8-A568-E89525981539}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/WindowsInstaller/BetterDiscordWI/App.config b/WindowsInstaller/BetterDiscordWI/App.config deleted file mode 100644 index 8e15646..0000000 --- a/WindowsInstaller/BetterDiscordWI/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj b/WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj deleted file mode 100644 index 2b0137b..0000000 --- a/WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Debug - AnyCPU - {469F7547-7664-4DE8-A568-E89525981539} - WinExe - Properties - BetterDiscordWI - BetterDiscordWI - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - Form - - - FormMain.cs - - - - - FormMain.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - \ No newline at end of file diff --git a/WindowsInstaller/BetterDiscordWI/FormMain.Designer.cs b/WindowsInstaller/BetterDiscordWI/FormMain.Designer.cs deleted file mode 100644 index 30871cb..0000000 --- a/WindowsInstaller/BetterDiscordWI/FormMain.Designer.cs +++ /dev/null @@ -1,47 +0,0 @@ -namespace BetterDiscordWI -{ - partial class FormMain - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.SuspendLayout(); - // - // FormMain - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 261); - this.Name = "FormMain"; - this.Text = "BetterDiscord Installer"; - this.ResumeLayout(false); - - } - - #endregion - } -} - diff --git a/WindowsInstaller/BetterDiscordWI/FormMain.cs b/WindowsInstaller/BetterDiscordWI/FormMain.cs deleted file mode 100644 index 1126989..0000000 --- a/WindowsInstaller/BetterDiscordWI/FormMain.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace BetterDiscordWI -{ - public partial class FormMain : Form - { - public FormMain() - { - InitializeComponent(); - } - } -} diff --git a/WindowsInstaller/BetterDiscordWI/FormMain.resx b/WindowsInstaller/BetterDiscordWI/FormMain.resx deleted file mode 100644 index 1af7de1..0000000 --- a/WindowsInstaller/BetterDiscordWI/FormMain.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/WindowsInstaller/BetterDiscordWI/Program.cs b/WindowsInstaller/BetterDiscordWI/Program.cs deleted file mode 100644 index 95c66f2..0000000 --- a/WindowsInstaller/BetterDiscordWI/Program.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace BetterDiscordWI -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new FormMain()); - } - } -} diff --git a/WindowsInstaller/BetterDiscordWI/Properties/AssemblyInfo.cs b/WindowsInstaller/BetterDiscordWI/Properties/AssemblyInfo.cs deleted file mode 100644 index fe1451b..0000000 --- a/WindowsInstaller/BetterDiscordWI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BetterDiscordWI")] -[assembly: AssemblyDescription("Better Discord Windows Installer")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Jiiks")] -[assembly: AssemblyProduct("BetterDiscordWI")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("17adafc9-c3e6-49c2-b2c9-d6866e7f4f23")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] diff --git a/WindowsInstaller/BetterDiscordWI/Properties/Resources.Designer.cs b/WindowsInstaller/BetterDiscordWI/Properties/Resources.Designer.cs deleted file mode 100644 index c4e1c3f..0000000 --- a/WindowsInstaller/BetterDiscordWI/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace BetterDiscordWI.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BetterDiscordWI.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/WindowsInstaller/BetterDiscordWI/Properties/Resources.resx b/WindowsInstaller/BetterDiscordWI/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/WindowsInstaller/BetterDiscordWI/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/WindowsInstaller/BetterDiscordWI/Properties/Settings.Designer.cs b/WindowsInstaller/BetterDiscordWI/Properties/Settings.Designer.cs deleted file mode 100644 index ac40289..0000000 --- a/WindowsInstaller/BetterDiscordWI/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace BetterDiscordWI.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/WindowsInstaller/BetterDiscordWI/Properties/Settings.settings b/WindowsInstaller/BetterDiscordWI/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/WindowsInstaller/BetterDiscordWI/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/lib/BetterDiscord.js b/lib/BetterDiscord.js index 52a2187..6339a9d 100644 --- a/lib/BetterDiscord.js +++ b/lib/BetterDiscord.js @@ -42,7 +42,7 @@ var _repo = "Jiiks"; var _beta = false; var _alerts = true; //Local flag -var _local = true; +var _local = false; var _localServer = "http://localhost"; //Please note that you must either use https or set web-security to false when using local server //Everything is loaded from _localServer/BetterDiscordApp/