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
106 Commits 7 Branches 0 Tags
90ffa46b4293bbb229a37236bc0a411847ec3c0f
Commit Graph
106 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stone_Red 90ffa46b42 Create appsettings.Development.json 2023-06-01 15:38:10 +02:00
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
Stone_Red 711955dd09 Turn on and off button thingy 2023-05-04 23:11:53 +02:00
Stone_Red 461298d14d Fix delete things 2023-05-04 22:09:27 +02:00
Stone_Red d96ce083ce Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration 2023-05-04 21:52:04 +02:00
Stefan f6fd7c17ee Make settings page work 
Idiot big forgot to commit :/
 2023-05-04 21:51:38 +02:00
Stone_Red 54a65e9833 Fix formatting and other stuff 
whoopsie
 2023-05-04 21:45:47 +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
Friend2868 f54b70ef63 Settings fix 2023-04-19 10:18:47 +02:00
Friend2868 9eedadec4a yes2 2023-04-19 10:12:13 +02:00
Aldin296 cb00e5b768 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-04-19 10:07:51 +02:00
Aldin296 ffec345f56 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-04-19 10:07:21 +02:00
Silence aa6d1ca800 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-04-19 09:50:03 +02:00
Silence a96dbddf3b admin 2023-04-19 09:49:31 +02:00
Aldin296 5d799b3959 verscuch button color zu wechseln, nicht geklappt (ignorieren) 2023-04-19 09:46:32 +02:00
Friend2868 a73ba26b8f yes 2023-04-19 08:27:04 +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
Friend2868 ccedff576b Settings improvement 2023-03-22 11:21:14 +01:00
Aldin296 6f96a7ecd9 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-03-22 09:59:08 +01:00
Aldin296 0aff5026d3 fixed responsive design in AddPlug page 2023-03-22 09:58:56 +01:00
Friend2868 8c1c78d145 Update Addplug 
yes
 2023-03-22 09:58:34 +01:00
Aldin296 499da68f33 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-03-22 09:27:30 +01:00
Aldin296 ff37097c2f Settings Page responisve 2023-03-22 09:27:28 +01:00
Friend2868 6ed83ad4ae yes 2023-03-22 09:26:47 +01:00
Friend2868 fc07db50ad Design Improvements 
Addplug page new loading bar design, dashboard finetuning
 2023-03-22 09:04:31 +01:00
Stone_Red 40b9d9aa61 Improve device discovery service and add page 2023-03-15 10:35:34 +01:00
Stone_Red 70c9d54623 Ignore sqlite files 2023-03-15 10:34:42 +01:00
Friend2868 dc6a39bd7b Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-03-15 08:58:42 +01:00
Friend2868 f55ef88e14 Rebase 2023-03-15 08:58:39 +01:00
Friend2868 2561a74b7f Dashboard fix 
Fix for responsive behaviour
 2023-03-15 08:47:46 +01:00
Aldin296 93df8ea814 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-03-15 08:44:24 +01:00
Stefan c06940b5dd Beep boop 🤖🤖🤖🤖🤖 2023-03-08 12:14:08 +01:00
Friend2868 c7628106f2 Dashboard fix 
Fix for responsive behaviour
 2023-03-08 12:08:53 +01:00
Aldin296 9b5a933710 Settings Page Frontend 
weiter eingabe felder für die Settings Page hinzugefügt
 2023-03-08 12:08:52 +01:00
Stefan 58ad7ac58f Beep boop 🤖🤖🤖🤖🤖 2023-03-08 12:07:55 +01:00
Aldin296 0d351972d8 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-03-08 10:17:13 +01:00
Aldin296 ca58a76594 Settings Page Frontend 
weiter eingabe felder für die Settings Page hinzugefügt
 2023-03-08 10:17:08 +01:00
Friend2868 969af74dad Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard 2023-03-08 10:14:46 +01:00
Friend2868 4da0444ccc Dashboard fix 
Fix for responsive behaviour
 2023-03-08 10:14:43 +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
Stone_Red b4a54fc269 Merge pull request #35 from Stefan-5422/feature-Dashboard 
Feature dashboard
 2023-03-08 09:49:43 +01:00