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
105 Commits 7 Branches 0 Tags
1028cbfb401ab7cf937a333599fae2dcf2c3f7df
Commit Graph
30 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan 1028cbfb40 Squashed commit of the following: 
commit a0adfc850d
Author: Stefan <[email protected]>
Date:   Thu Jun 1 15:28:39 2023 +0200

    Revert using Prom.Net

commit 08a5bd4772
Merge: a47c252 9d64698
Author: Stefan <[email protected]>
Date:   Thu Jun 1 15:27:48 2023 +0200

    Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration

commit a47c2525e1
Author: Stefan <[email protected]>
Date:   Thu Jun 1 15:27:30 2023 +0200

    Revert using Prom.Net

commit 9d646988d1
Merge: 889fc5e 4ef3958
Author: Friend2868 <[email protected]>
Date:   Thu Jun 1 15:24:56 2023 +0200

    Merge branch 'feature-DeviceRegistration' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-DeviceRegistration

commit 889fc5e3dd
Author: Friend2868 <[email protected]>
Date:   Thu Jun 1 15:24:21 2023 +0200

    Final2

commit 92a7538996
Merge: d5f5ec2 f04724e
Author: Friend2868 <[email protected]>
Date:   Thu Jun 1 15:23:59 2023 +0200

    Merge branch 'feature-DeviceRegistration' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-DeviceRegistration

commit 4ef3958da3
Author: Stone_Red <[email protected]>
Date:   Thu Jun 1 15:23:10 2023 +0200

    Fix .gitignore

commit d5f5ec2d0e
Author: Friend2868 <[email protected]>
Date:   Thu Jun 1 15:21:37 2023 +0200

    Final

commit 236c2418c5
Author: Friend2868 <[email protected]>
Date:   Thu Jun 1 15:18:57 2023 +0200

    Update .gitignore

commit f04724e258
Merge: 9b2db9c f74cff3
Author: Stefan <[email protected]>
Date:   Thu Jun 1 15:15:57 2023 +0200

    Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration

commit 9b2db9c97d
Author: Stefan <[email protected]>
Date:   Thu Jun 1 15:15:44 2023 +0200

    Changes 🐙

commit f74cff3d39
Author: Stone_Red <[email protected]>
Date:   Wed May 24 11:48:07 2023 +0200

    Update appsettings.Development.json

commit 2f79ccb22d
Author: Stone_Red <[email protected]>
Date:   Wed May 24 11:45:16 2023 +0200

    Update appsettings.Development.json

commit 104bd37bcb
Author: Stone_Red <[email protected]>
Date:   Wed May 24 11:44:58 2023 +0200

    Update appsettings.Development.json

commit bdac3581de
Author: Stefan <[email protected]>
Date:   Wed May 24 11:29:38 2023 +0200

    Revert test shid

commit 5b58318699
Merge: 5b342c1 b054b9c
Author: Stefan <[email protected]>
Date:   Wed May 24 11:28:20 2023 +0200

    Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration

commit 5b342c1a8f
Author: Stefan <[email protected]>
Date:   Wed May 24 11:28:12 2023 +0200

    Add `ScheduledService` and email things ༼ つ ◕_◕ ༽つ

commit b054b9cfe3
Author: Friend2868 <[email protected]>
Date:   Wed May 24 11:16:18 2023 +0200

    EventService finish

commit 9520fa04b8
Author: Stefan <[email protected]>
Date:   Wed May 10 12:13:31 2023 +0200

    Email Inferstructure
 2023-06-01 15:33:18 +02:00
Stefan 0364016766 Merge items from Stefan-5422/feature-Dashboard 2023-06-01 15:24:29 +02:00
Stefan 560c4aefca Merge pull request #38 from Stefan-5422/feature-DeviceRegistration 
Feature device registration
 2023-05-10 08:44:52 +02:00
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