 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 |
|
|
Stone_Red
|
f37e8bda8b
|
Merge branch 'Development' into feature-Dashboard
|
2023-03-08 09:49:32 +01:00 |
|
|
Stone_Red
|
2b007c61d5
|
Merge pull request #34 from Stefan-5422/feature-frontend
Feature frontend
|
2023-03-08 09:36:42 +01:00 |
|
|
Stone_Red
|
b35f6083fb
|
Merge branch 'Development' into feature-frontend
|
2023-03-08 09:35:49 +01:00 |
|
|
Friend2868
|
e73df9edc7
|
Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard
|
2023-03-08 09:29:19 +01:00 |
|
|
Friend2868
|
ef7be64c05
|
Logo color
Changed color from orange to blue
|
2023-03-08 09:29:07 +01:00 |
|
|
Silence
|
1db29553cc
|
LoginPages
dum
|
2023-03-08 09:21:35 +01:00 |
|
|
Friend2868
|
642699e158
|
Silas da
tohl
|
2023-03-08 09:01:17 +01:00 |
|
|
Aldin296
|
4d6a21005d
|
Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard
|
2023-03-08 08:57:56 +01:00 |
|
|
Aldin296
|
e67cb811e7
|
Started Setting Page
Settings Page wurde in der Sidebar verlinkt und die Plugs wurden hinzugefügt
|
2023-03-08 08:46:18 +01:00 |
|
|
Silence
|
3f6e3a53eb
|
Login Page
|
2023-03-08 08:45:00 +01:00 |
|