Database fix

panthernet · Dec 24, 2021 · a0e2178 · a0e2178
1 parent 933975a
commit a0e2178
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 11 deletions.
diff --git a/THDWebServer/Properties/PublishProfiles/Linux.pubxml.user b/THDWebServer/Properties/PublishProfiles/Linux.pubxml.user
@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\Projects\EVE\ThunderED\THD\THDWebServer\bin\Release\publish\linux</_PublishTargetUrl>
-    <History>True|2021-12-08T21:11:26.3638662Z;True|2021-12-06T12:25:01.2831686+03:00;True|2021-11-25T19:09:21.2316111+03:00;True|2021-11-20T22:58:53.3914504+03:00;True|2021-11-02T19:49:35.4482348+03:00;False|2021-11-02T19:46:39.9555456+03:00;False|2021-11-02T19:44:26.1467931+03:00;</History>
+    <History>True|2021-12-21T15:39:09.9339238Z;True|2021-12-08T23:11:26.3638662+02:00;True|2021-12-06T11:25:01.2831686+02:00;True|2021-11-25T18:09:21.2316111+02:00;True|2021-11-20T21:58:53.3914504+02:00;True|2021-11-02T18:49:35.4482348+02:00;False|2021-11-02T18:46:39.9555456+02:00;False|2021-11-02T18:44:26.1467931+02:00;</History>
   </PropertyGroup>
 </Project>
diff --git a/THDWebServer/Properties/PublishProfiles/Windows.pubxml.user b/THDWebServer/Properties/PublishProfiles/Windows.pubxml.user
@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\Projects\EVE\ThunderED\THD\THDWebServer\bin\Release\publish\windows</_PublishTargetUrl>
-    <History>True|2021-12-08T21:11:01.1057808Z;True|2021-12-08T19:22:52.0429266+03:00;True|2021-12-06T12:23:31.0827890+03:00;False|2021-12-06T12:20:43.0753513+03:00;False|2021-12-06T12:19:20.6768464+03:00;True|2021-12-04T21:39:44.9253481+03:00;True|2021-12-04T00:51:10.9047185+03:00;True|2021-12-02T19:41:38.0970350+03:00;True|2021-12-01T17:54:34.8888928+03:00;True|2021-12-01T15:50:44.5927961+03:00;True|2021-12-01T15:35:55.0944071+03:00;True|2021-11-27T13:35:05.4131511+03:00;True|2021-11-25T20:23:09.2075659+03:00;True|2021-11-22T18:35:07.0874250+03:00;True|2021-11-22T18:07:39.1568437+03:00;True|2021-11-21T12:22:40.4083705+03:00;True|2021-11-20T22:57:43.2206107+03:00;True|2021-11-02T19:51:04.3709000+03:00;</History>
+    <History>True|2021-12-21T15:39:47.3791504Z;True|2021-12-08T23:11:01.1057808+02:00;True|2021-12-08T18:22:52.0429266+02:00;True|2021-12-06T11:23:31.0827890+02:00;False|2021-12-06T11:20:43.0753513+02:00;False|2021-12-06T11:19:20.6768464+02:00;True|2021-12-04T20:39:44.9253481+02:00;True|2021-12-03T23:51:10.9047185+02:00;True|2021-12-02T18:41:38.0970350+02:00;True|2021-12-01T16:54:34.8888928+02:00;True|2021-12-01T14:50:44.5927961+02:00;True|2021-12-01T14:35:55.0944071+02:00;True|2021-11-27T12:35:05.4131511+02:00;True|2021-11-25T19:23:09.2075659+02:00;True|2021-11-22T17:35:07.0874250+02:00;True|2021-11-22T17:07:39.1568437+02:00;True|2021-11-21T11:22:40.4083705+02:00;True|2021-11-20T21:57:43.2206107+02:00;True|2021-11-02T18:51:04.3709000+02:00;</History>
   </PropertyGroup>
 </Project>
diff --git a/THDWebServer/THDWebServer.csproj.user b/THDWebServer/THDWebServer.csproj.user
@@ -9,7 +9,7 @@
     <WebStackScaffolding_IsPartialViewSelected>True</WebStackScaffolding_IsPartialViewSelected>
     <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
     <WebStackScaffolding_LayoutPageFile />
-    <NameOfLastUsedPublishProfile>D:\Projects\EVE\ThunderED\THD\THDWebServer\Properties\PublishProfiles\Linux.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Projects\EVE\ThunderED\THD\THDWebServer\Properties\PublishProfiles\Windows.pubxml</NameOfLastUsedPublishProfile>
     <_SelectedScaffolderID>ApiControllerWithActionsScaffolder</_SelectedScaffolderID>
     <_SelectedScaffolderCategoryPath>root/Common</_SelectedScaffolderCategoryPath>
   </PropertyGroup>

diff --git a/ThunderED/Languages/ru-RU.json b/ThunderED/Languages/ru-RU.json
@@ -767,7 +767,7 @@
   "webAuthGroupAccordionHeader": "Основные настройки",
   "webSettingsTimersAccessTabName": "Доступ",
   "webSettingsTimersEditTabName": "Редактирование",
-  "msgConnectionFailureScroll": "Внимание! Соединение с ESI нестабильно. Некоторый возможности могут быть недоступны.",
+  "msgConnectionFailureScroll": "Внимание! Соединение с ESI нестабильно. Некоторые возможности могут быть недоступны.",
   "webButtonUploadScan": "Загрузить",
   "mtColumnNotes": "Заметки",
   "webSettingsAuthGroupHelp1": "Названия корпораций и альянсов в таблице должны начинаться с префиксов (англ.) c: и a: соответственно.",

diff --git a/ThunderED/Properties/PublishProfiles/LINUX.pubxml.user b/ThunderED/Properties/PublishProfiles/LINUX.pubxml.user
@@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <History>True|2021-12-08T21:10:30.4163490Z;True|2021-12-06T12:24:34.6961000+03:00;True|2021-12-06T12:17:24.0427244+03:00;True|2021-11-25T19:05:42.5972936+03:00;True|2021-11-20T22:56:36.6488729+03:00;True|2021-11-02T19:49:06.7278144+03:00;</History>
+    <History>True|2021-12-21T15:38:01.9640898Z;True|2021-12-08T23:10:30.4163490+02:00;True|2021-12-06T11:24:34.6961000+02:00;True|2021-12-06T11:17:24.0427244+02:00;True|2021-11-25T18:05:42.5972936+02:00;True|2021-11-20T21:56:36.6488729+02:00;True|2021-11-02T18:49:06.7278144+02:00;</History>
   </PropertyGroup>
 </Project>
diff --git a/ThunderED/Properties/PublishProfiles/Win.pubxml.user b/ThunderED/Properties/PublishProfiles/Win.pubxml.user
@@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <History>True|2021-12-08T21:10:03.3037510Z;True|2021-12-08T19:22:10.3254258+03:00;True|2021-12-06T12:20:25.8546199+03:00;True|2021-12-04T21:13:06.4028087+03:00;True|2021-12-04T00:49:21.0397870+03:00;True|2021-12-02T19:40:42.3340990+03:00;True|2021-12-01T17:53:59.6258925+03:00;True|2021-12-01T15:50:08.8298378+03:00;True|2021-12-01T15:35:09.3879892+03:00;True|2021-11-27T13:34:42.7378966+03:00;True|2021-11-26T00:29:48.7421502+03:00;True|2021-11-25T20:20:04.3804956+03:00;True|2021-11-22T18:05:30.0906043+03:00;True|2021-11-21T12:22:01.0885481+03:00;True|2021-11-20T22:53:27.0712480+03:00;True|2021-11-02T19:50:34.2342977+03:00;</History>
+    <History>True|2021-12-21T15:38:25.8228493Z;True|2021-12-08T23:10:03.3037510+02:00;True|2021-12-08T18:22:10.3254258+02:00;True|2021-12-06T11:20:25.8546199+02:00;True|2021-12-04T20:13:06.4028087+02:00;True|2021-12-03T23:49:21.0397870+02:00;True|2021-12-02T18:40:42.3340990+02:00;True|2021-12-01T16:53:59.6258925+02:00;True|2021-12-01T14:50:08.8298378+02:00;True|2021-12-01T14:35:09.3879892+02:00;True|2021-11-27T12:34:42.7378966+02:00;True|2021-11-25T23:29:48.7421502+02:00;True|2021-11-25T19:20:04.3804956+02:00;True|2021-11-22T17:05:30.0906043+02:00;True|2021-11-21T11:22:01.0885481+02:00;True|2021-11-20T21:53:27.0712480+02:00;True|2021-11-02T18:50:34.2342977+02:00;</History>
   </PropertyGroup>
 </Project>
diff --git a/ThunderED/ThunderED.csproj.user b/ThunderED/ThunderED.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>D:\Projects\EVE\ThunderED\THD\ThunderED\Properties\PublishProfiles\LINUX.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>D:\Projects\EVE\ThunderED\THD\ThunderED\Properties\PublishProfiles\Win.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>
diff --git a/ThunderED/edb.def.db b/ThunderED/edb.def.db
diff --git a/ThunderED/todo.txt b/ThunderED/todo.txt
@@ -19,3 +19,6 @@ USER SERVICES
 1. Skill queue is finishing soon
 
 
+ююююююю
+1. Удаление пилотов из списка выплат
+2. расчет выплат
diff --git a/Version.cs b/Version.cs
@@ -1,13 +1,13 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.1.2.0")]
-[assembly: AssemblyFileVersion("2.1.2.0")]
+[assembly: AssemblyVersion("2.1.3.0")]
+[assembly: AssemblyFileVersion("2.1.3.0")]
 
 namespace ThunderED
 {
     internal partial class Program
     {
-        public const string VERSION = "2.1.2";
+        public const string VERSION = "2.1.3";
     }
 }
 

diff --git a/mysql.dump b/mysql.dump
@@ -693,6 +693,7 @@ CREATE TABLE `tokens` (
   `type` int NOT NULL,
   `character_id` int NOT NULL,
   `roles` bigint DEFAULT NULL,
+  `scopes` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `tokens_character_id_type_uindex` (`character_id`,`type`),
   UNIQUE KEY `tokens_id_uindex` (`id`),
@@ -718,4 +719,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-12-21 17:34:31
+-- Dump completed on 2021-12-24 20:22:54
diff --git a/version.txt b/version.txt
@@ -1,3 +1,6 @@
+### V2.1.3
++ Default database fix
+
 ### V2.1.2
 + Improved web UI for several modules (new mining ledger is still WIP and buggy)
 + Fixed citadel name resolve from links in notifications