 Stefan
|
f6fd7c17ee
|
Make settings page work
Idiot big forgot to commit :/
|
2023-05-04 21:51:38 +02:00 |
|
|
Stefan
|
d2ee38fd7e
|
Merge branch 'Development' into feature-DeviceRegistration
|
2023-05-03 09:33:51 +02:00 |
|
|
Stefan
|
358bbdacce
|
Fix merge bugs
|
2023-05-03 09:30:19 +02:00 |
|
|
Stefan
|
0bc8454f86
|
Merge remote-tracking branch 'origin/feature-Dashboard' into Development
# Conflicts:
# src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor
# src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
# src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
# src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
# src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json
|
2023-05-03 09:08:21 +02:00 |
|
|
Stefan
|
6a2b155ac7
|
Merge branch 'feature-DeviceRegistration' into Development
|
2023-05-03 09:03:03 +02:00 |
|
|
Stefan
|
c08740f9ff
|
Fix issue with 0 plugs
|
2023-05-03 09:02:33 +02:00 |
|
|
Stefan
|
fd0cb1889b
|
Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration
|
2023-04-19 11:12:58 +02:00 |
|
|
Stefan
|
f36a65009f
|
Fixes!
|
2023-04-19 11:09:34 +02:00 |
|
|
Stefan
|
12b8004a93
|
UHHHM
* Added Login System
* Added Query from Prom
* Changed Dashboard to display data
|
2023-03-22 14:09:30 +01:00 |
|
|
Stefan
|
c06940b5dd
|
Beep boop 🤖🤖🤖🤖🤖
|
2023-03-08 12:14:08 +01:00 |
|
|
Stefan
|
58ad7ac58f
|
Beep boop 🤖🤖🤖🤖🤖
|
2023-03-08 12:07:55 +01:00 |
|
|
Stefan
|
5608416d10
|
Merge pull request #36 from Stefan-5422/feature-DeviceRegistration
Feature device registration
|
2023-03-08 10:00:16 +01:00 |
|
|
Stefan
|
db787a1ef3
|
Merge branch 'Development' into feature-DeviceRegistration
|
2023-03-08 10:00:05 +01:00 |
|
|
Stefan
|
894a23855f
|
Device discovery and maybe adding devices ╮(╯▽╰)╭
|
2023-03-02 16:48:37 +01:00 |
|
|
Stefan
|
1f745951d4
|
Fix: Broken stuff
|
2023-03-01 12:46:19 +01:00 |
|
|
Stefan
|
d0aa87d3c9
|
Merge pull request #30 from Stefan-5422/feature-Dashboard
Indev: Merge Indev items to test code with multiple systems working together
|
2023-03-01 11:19:05 +01:00 |
|
|
Stefan
|
cd898430ae
|
Merge pull request #29 from Stefan-5422/feature-DeviceRegistration
Indev: Add in progress feature for testing with other components
|
2023-03-01 11:17:54 +01:00 |
|
|
Stefan
|
22c4fe1a26
|
༼ つ ◕_◕ ༽つ Some backend stuff mostly for Registration 🪵🪵
|
2023-03-01 11:16:06 +01:00 |
|
|
Stefan-5422
|
fa58c54b1a
|
Merge remote-tracking branch 'origin/Development' into feature-DeviceRegistration
|
2023-02-22 09:13:40 +01:00 |
|
|
Stefan
|
0c882a7b13
|
Merge pull request #19 from Stefan-5422/feature-login_service
Merge feature login service
|
2023-02-08 08:27:06 +01:00 |
|
|
Stefan
|
2249ff8d90
|
Merge branch 'Development' into feature-login_service
|
2023-02-08 08:07:47 +01:00 |
|
|
Stefan-5422
|
6abd11ac86
|
🧾Whoop Whoop Database Time 😎
|
2023-02-08 08:03:51 +01:00 |
|
|
Stefan
|
6966341ecc
|
Merge pull request #18 from Stefan-5422/freature-Data-Gathering
Freature data gathering
|
2023-02-01 09:01:17 +01:00 |
|
|
Stefan-5422
|
a10f892375
|
Added Translation Database 🦙
|
2023-01-26 16:39:54 +01:00 |
|
|
Stefan-5422
|
8e24bd7c53
|
Finish configuration of gathering Service
|
2023-01-26 16:25:58 +01:00 |
|
|
Stefan-5422
|
8972b5c821
|
Microsoft is dead 🦀🦀🦀🦀🦀🦀
|
2023-01-25 11:20:08 +01:00 |
|
|
Stefan
|
90ae9b2455
|
Initial commit
|
2023-01-11 09:59:15 +01:00 |
|