 Stefan
|
a0adfc850d
|
Revert using Prom.Net
|
2023-06-01 15:28:39 +02:00 |
|
|
Stefan
|
08a5bd4772
|
Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration
|
2023-06-01 15:27:48 +02:00 |
|
|
Stefan
|
a47c2525e1
|
Revert using Prom.Net
|
2023-06-01 15:27:30 +02:00 |
|
 Friend2868
|
9d646988d1
|
Merge branch 'feature-DeviceRegistration' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-DeviceRegistration
|
2023-06-01 15:24:56 +02:00 |
|
|
Friend2868
|
889fc5e3dd
|
Final2
|
2023-06-01 15:24:21 +02:00 |
|
|
Friend2868
|
92a7538996
|
Merge branch 'feature-DeviceRegistration' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-DeviceRegistration
|
2023-06-01 15:23:59 +02:00 |
|
 Stone_Red
|
4ef3958da3
|
Fix .gitignore
|
2023-06-01 15:23:10 +02:00 |
|
|
Friend2868
|
d5f5ec2d0e
|
Final
|
2023-06-01 15:21:37 +02:00 |
|
|
Friend2868
|
236c2418c5
|
Update .gitignore
|
2023-06-01 15:18:57 +02:00 |
|
|
Stefan
|
f04724e258
|
Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration
|
2023-06-01 15:15:57 +02:00 |
|
|
Stefan
|
9b2db9c97d
|
Changes 🐙
|
2023-06-01 15:15:44 +02:00 |
|
|
Stone_Red
|
f74cff3d39
|
Update appsettings.Development.json
|
2023-05-24 11:48:07 +02:00 |
|
|
Stone_Red
|
2f79ccb22d
|
Update appsettings.Development.json
|
2023-05-24 11:45:16 +02:00 |
|
|
Stone_Red
|
104bd37bcb
|
Update appsettings.Development.json
|
2023-05-24 11:44:58 +02:00 |
|
|
Stefan
|
bdac3581de
|
Revert test shid
|
2023-05-24 11:29:38 +02:00 |
|
|
Stefan
|
5b58318699
|
Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration
|
2023-05-24 11:28:20 +02:00 |
|
|
Stefan
|
5b342c1a8f
|
Add ScheduledService and email things ༼ つ ◕_◕ ༽つ
|
2023-05-24 11:28:12 +02:00 |
|
|
Friend2868
|
b054b9cfe3
|
EventService finish
|
2023-05-24 11:16:18 +02:00 |
|
|
Stefan
|
9520fa04b8
|
Email Inferstructure
|
2023-05-10 12:13:31 +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 |
|