Stefan-5422/-T5-Elektrifikatsiya
1
0
Fork 0
mirror of https://github.com/Stefan-5422/-T5-Elektrifikatsiya.git synced 2026-09-04 00:45:58 +02:00
Code Issues 2 Packages Projects Releases Wiki Activity

[PR #37] [MERGED] Merge development into Dashboard #35

New Issue
Closed
opened 2026-09-04 00:41:44 +02:00 by Stone_Red · 0 comments
Stone_Red commented 2026-09-04 00:41:44 +02:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/Stefan-5422/-T5-Elektrifikatsiya/pull/37
Author: @Stefan-5422
Created: 5/10/2023
Status: ✅ Merged
Merged: 5/10/2023
Merged by: @Stefan-5422

Base: feature-Dashboard ← Head: Development

📝 Commits (10+)

  • 58ad7ac Beep boop 🤖🤖🤖🤖🤖
  • 70c9d54 Ignore sqlite files
  • 40b9d9a Improve device discovery service and add page
  • 12b8004 UHHHM
  • 9eedade yes2
  • f36a650 Fixes!
  • fd0cb18 Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration
  • c08740f Fix issue with 0 plugs
  • 6a2b155 Merge branch 'feature-DeviceRegistration' into Development
  • 0bc8454 Merge remote-tracking branch 'origin/feature-Dashboard' into Development

📊 Changes

38 files changed (+1132 additions, -705 deletions)

View changed files

📝 .gitignore (+3 -0)
➕ src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/NewFile.txt (+1 -0)
➕ src/Elektrifikatsiya/Elektrifikatsiya/Components/Protected.razor (+42 -0)
➖ src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/BaseTodoItems.cs (+0 -74)
➖ src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/Filter.cs (+0 -8)
➖ src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/Todo.cs (+0 -8)
➖ src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/TodoItem.razor (+0 -22)
➖ src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/TodoItems.razor (+0 -57)
➖ src/Elektrifikatsiya/Elektrifikatsiya/Database/DeviceManagementDatabaseContext.cs (+0 -14)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Database/MainDatabaseContext.cs (+4 -2)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj (+9 -4)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor (+30 -5)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor (+25 -14)
➕ src/Elektrifikatsiya/Elektrifikatsiya/Migrations/20230322092207_fix foreign keys.Designer.cs (+96 -0)
➕ src/Elektrifikatsiya/Elektrifikatsiya/Migrations/20230322092207_fix foreign keys.cs (+68 -0)
➕ src/Elektrifikatsiya/Elektrifikatsiya/Migrations/MainDatabaseContextModelSnapshot.cs (+93 -0)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Models/Device.cs (+20 -3)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs (+7 -1)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Models/PrometheusQueryResult.cs (+53 -12)
📝 src/Elektrifikatsiya/Elektrifikatsiya/Models/User.cs (+10 -1)

...and 18 more files

📄 Description

No description provided

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/Stefan-5422/-T5-Elektrifikatsiya/pull/37 **Author:** [@Stefan-5422](https://github.com/Stefan-5422) **Created:** 5/10/2023 **Status:** ✅ Merged **Merged:** 5/10/2023 **Merged by:** [@Stefan-5422](https://github.com/Stefan-5422) **Base:** `feature-Dashboard` ← **Head:** `Development` --- ### 📝 Commits (10+) - [`58ad7ac`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/58ad7ac58fafe08af2ed9c6387f99de95dda64db) Beep boop 🤖🤖🤖🤖🤖 - [`70c9d54`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/70c9d54623fdf5e2918b913e4be8023e57747cf4) Ignore sqlite files - [`40b9d9a`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/40b9d9aa614456f39e7ea4c0be18280f709d9543) Improve device discovery service and add page - [`12b8004`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/12b8004a93536d6ac6a10bb5c6eb8ae5dca990c8) UHHHM - [`9eedade`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/9eedadec4af328284c8bc389f73369f6289f244f) yes2 - [`f36a650`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/f36a65009f9cbb3b12c2c631967c9a42d9f058e4) Fixes! - [`fd0cb18`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/fd0cb1889be661cb43f5d7bde6fb5f93a8497112) Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration - [`c08740f`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/c08740f9ffeef51092607700fe9e2bc13fe02e98) Fix issue with 0 plugs - [`6a2b155`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/6a2b155ac712e776caf653a545ff17c1c51b84eb) Merge branch 'feature-DeviceRegistration' into Development - [`0bc8454`](https://github.com/Stefan-5422/-T5-Elektrifikatsiya/commit/0bc8454f86e91c0d8a15e7205b8b2a97b5dd94f3) Merge remote-tracking branch 'origin/feature-Dashboard' into Development ### 📊 Changes **38 files changed** (+1132 additions, -705 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+3 -0) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/NewFile.txt` (+1 -0) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/Components/Protected.razor` (+42 -0) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/BaseTodoItems.cs` (+0 -74) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/Filter.cs` (+0 -8) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/Todo.cs` (+0 -8) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/TodoItem.razor` (+0 -22) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/Components/TodoApp/TodoItems.razor` (+0 -57) ➖ `src/Elektrifikatsiya/Elektrifikatsiya/Database/DeviceManagementDatabaseContext.cs` (+0 -14) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Database/MainDatabaseContext.cs` (+4 -2) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj` (+9 -4) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor` (+30 -5) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor` (+25 -14) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/Migrations/20230322092207_fix foreign keys.Designer.cs` (+96 -0) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/Migrations/20230322092207_fix foreign keys.cs` (+68 -0) ➕ `src/Elektrifikatsiya/Elektrifikatsiya/Migrations/MainDatabaseContextModelSnapshot.cs` (+93 -0) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Models/Device.cs` (+20 -3) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs` (+7 -1) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Models/PrometheusQueryResult.cs` (+53 -12) 📝 `src/Elektrifikatsiya/Elektrifikatsiya/Models/User.cs` (+10 -1) _...and 18 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Stone_Red added the pull-request label 2026-09-04 00:41:44 +02:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
pull-request
Mirrored from GitHub Pull Request
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Stone_Red
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Stefan-5422/-T5-Elektrifikatsiya#35