Commit Graph

Select branches

Hide Pull Requests

Development

feature-Dashboard

feature-DeviceRegistration

feature-frontend

feature-login_service

freature-Data-Gathering

main

#18

#19

#20

#28

#29

#30

#34

#35

#36

#37

#38

#39

#40

Mono Color

• 2b70563eb7 Merge pull request #40 from Stefan-5422/Development main Stone_Red 2024-01-17 12:31:59 +01:00
• ecf70c4b93 Last minute fix fix Development Stefan 2023-06-14 08:51:23 +02:00
• e8d1e5190d Merge pull request #39 from Stefan-5422/Aldin296-patch-1 Stone_Red 2023-06-14 07:30:56 +02:00
• 29ac75a9ce Create README.md Aldin296 2023-06-14 07:29:59 +02:00
• 672236fd7f Hotfix Aldin296 2023-06-14 01:24:54 +02:00
• 9f99c4f72c Fix some stuff (❁´◡`❁) Stone_Red 2023-06-14 00:06:23 +02:00
• 32fc8c9e94 Merge branch 'Development' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into Development Friend2868 2023-06-13 23:41:34 +02:00
• 3cf17138b9 Adminpage Friend2868 2023-06-13 23:40:21 +02:00
• 06e011cb83 Fix warning Stone_Red 2023-06-13 22:50:04 +02:00
• 9ac40ba0cb Add Authentication stuff Stone_Red 2023-06-13 22:28:00 +02:00
• 996cf987c6 yesn't Friend2868 2023-06-13 21:52:13 +02:00
• b0e09114fb yes Friend2868 2023-06-13 21:37:03 +02:00
• 9f1b6fe3b1 Merge branch 'Development' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into Development Friend2868 2023-06-13 21:23:13 +02:00
• a36b4eafa7 UserSystemUpdate Friend2868 2023-06-13 21:22:13 +02:00
• a5ecb43077 Implement NotificationService and EnergyPriceService Stone_Red 2023-06-13 20:56:56 +02:00
• 5b8915d7b4 aaahhh git ignore Stefan 2023-06-07 11:59:03 +02:00
• 5d33c5cd5c added email too user Aldin296 2023-06-07 11:43:25 +02:00
• 9b9844abb0 Merge branch 'Development' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into Development Aldin296 2023-06-07 10:28:15 +02:00
• 2b108e09b9 red delete button settings page Aldin296 2023-06-07 10:25:03 +02:00
• 1824932a5d Toggle Fix (for real) Friend2868 2023-06-07 10:22:06 +02:00
• b9fed85a8c Toggle Fix Friend2868 2023-06-07 09:40:11 +02:00
• f348fb1d23 Merge branch 'Development' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into Development Friend2868 2023-06-07 08:50:50 +02:00
• 14fa374bb7 Bouton Actualiser Friend2868 2023-06-07 08:50:47 +02:00
• 90ffa46b42 Create appsettings.Development.json Stone_Red 2023-06-01 15:38:10 +02:00
• 1028cbfb40 Squashed commit of the following: Stefan 2023-06-01 15:33:18 +02:00
• a0adfc850d Revert using Prom.Net feature-DeviceRegistration Stefan 2023-06-01 15:28:39 +02:00
• 08a5bd4772 Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration Stefan 2023-06-01 15:27:48 +02:00
• a47c2525e1 Revert using Prom.Net Stefan 2023-06-01 15:27:30 +02:00
• 9d646988d1 Merge branch 'feature-DeviceRegistration' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-DeviceRegistration Friend2868 2023-06-01 15:24:56 +02:00
• 0364016766 Merge items from Stefan-5422/feature-Dashboard Stefan 2023-06-01 15:24:29 +02:00
• 889fc5e3dd Final2 Friend2868 2023-06-01 15:24:21 +02:00
• 92a7538996 Merge branch 'feature-DeviceRegistration' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-DeviceRegistration Friend2868 2023-06-01 15:23:59 +02:00
• 4ef3958da3 Fix .gitignore Stone_Red 2023-06-01 15:23:10 +02:00
• d5f5ec2d0e Final Friend2868 2023-06-01 15:21:37 +02:00
• 236c2418c5 Update .gitignore Friend2868 2023-06-01 15:18:57 +02:00
• f04724e258 Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration Stefan 2023-06-01 15:15:57 +02:00
• 9b2db9c97d Changes 🐙 Stefan 2023-06-01 15:15:44 +02:00
• b467cea37c Admin Page feature-Dashboard Aldin296 2023-06-01 15:10:45 +02:00
• 71732b8f90 responsiveLogin Silence 2023-05-31 09:45:28 +02:00
• f74cff3d39 Update appsettings.Development.json Stone_Red 2023-05-24 11:48:07 +02:00
• 2f79ccb22d Update appsettings.Development.json Stone_Red 2023-05-24 11:45:16 +02:00
• 104bd37bcb Update appsettings.Development.json Stone_Red 2023-05-24 11:44:58 +02:00
• bdac3581de Revert test shid Stefan 2023-05-24 11:29:38 +02:00
• 5b58318699 Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration Stefan 2023-05-24 11:28:20 +02:00
• 5b342c1a8f Add ScheduledService and email things ༼ つ ◕_◕ ༽つ Stefan 2023-05-24 11:28:12 +02:00
• b054b9cfe3 EventService finish Friend2868 2023-05-24 11:16:18 +02:00
• 9520fa04b8 Email Inferstructure Stefan 2023-05-10 12:13:31 +02:00
• a48f880487 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Aldin296 2023-05-10 08:49:36 +02:00
• 324b16a70a Update Admin.razor Aldin296 2023-05-10 08:48:56 +02:00
• 1907529089 Merge pull request #37 from Stefan-5422/Development Stefan 2023-05-10 08:46:45 +02:00
• 560c4aefca Merge pull request #38 from Stefan-5422/feature-DeviceRegistration Stefan 2023-05-10 08:44:52 +02:00
• 711955dd09 Turn on and off button thingy Stone_Red 2023-05-04 23:11:53 +02:00
• 461298d14d Fix delete things Stone_Red 2023-05-04 22:09:27 +02:00
• d96ce083ce Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration Stone_Red 2023-05-04 21:52:04 +02:00
• f6fd7c17ee Make settings page work Idiot big forgot to commit :/ Stefan 2023-05-04 21:51:38 +02:00
• 54a65e9833 Fix formatting and other stuff whoopsie Stone_Red 2023-05-04 21:45:47 +02:00
• d2ee38fd7e Merge branch 'Development' into feature-DeviceRegistration Stefan 2023-05-03 09:33:51 +02:00
• 358bbdacce Fix merge bugs Stefan 2023-05-03 09:30:19 +02:00
• 0bc8454f86 Merge remote-tracking branch 'origin/feature-Dashboard' into Development Stefan 2023-05-03 09:08:21 +02:00
• 6a2b155ac7 Merge branch 'feature-DeviceRegistration' into Development Stefan 2023-05-03 09:03:03 +02:00
• c08740f9ff Fix issue with 0 plugs Stefan 2023-05-03 09:02:33 +02:00
• fd0cb1889b Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration Stefan 2023-04-19 11:12:58 +02:00
• f36a65009f Fixes! Stefan 2023-04-19 11:09:34 +02:00
• f54b70ef63 Settings fix Friend2868 2023-04-19 10:18:47 +02:00
• 9eedadec4a yes2 Friend2868 2023-04-19 10:12:13 +02:00
• cb00e5b768 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Aldin296 2023-04-19 10:07:51 +02:00
• ffec345f56 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Aldin296 2023-04-19 10:07:21 +02:00
• aa6d1ca800 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Silence 2023-04-19 09:50:03 +02:00
• a96dbddf3b admin Silence 2023-04-19 09:49:31 +02:00
• 5d799b3959 verscuch button color zu wechseln, nicht geklappt (ignorieren) Aldin296 2023-04-19 09:46:32 +02:00
• a73ba26b8f yes Friend2868 2023-04-19 08:27:04 +02:00
• 12b8004a93 UHHHM * Added Login System * Added Query from Prom * Changed Dashboard to display data Stefan 2023-03-22 14:09:30 +01:00
• ccedff576b Settings improvement Friend2868 2023-03-22 11:21:14 +01:00
• 6f96a7ecd9 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Aldin296 2023-03-22 09:59:08 +01:00
• 0aff5026d3 fixed responsive design in AddPlug page Aldin296 2023-03-22 09:58:56 +01:00
• 8c1c78d145 Update Addplug Friend2868 2023-03-22 09:58:34 +01:00
• 499da68f33 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Aldin296 2023-03-22 09:27:30 +01:00
• ff37097c2f Settings Page responisve Aldin296 2023-03-22 09:27:28 +01:00
• 6ed83ad4ae yes Friend2868 2023-03-22 09:26:47 +01:00
• fc07db50ad Design Improvements Friend2868 2023-03-22 09:04:31 +01:00
• 40b9d9aa61 Improve device discovery service and add page Stone_Red 2023-03-15 10:35:15 +01:00
• 70c9d54623 Ignore sqlite files Stone_Red 2023-03-15 10:34:42 +01:00
• dc6a39bd7b Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Friend2868 2023-03-15 08:58:42 +01:00
• f55ef88e14 Rebase Friend2868 2023-03-15 08:58:39 +01:00
• 2561a74b7f Dashboard fix Friend2868 2023-03-08 10:14:43 +01:00
• 93df8ea814 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Aldin296 2023-03-15 08:44:24 +01:00
• c06940b5dd Beep boop 🤖🤖🤖🤖🤖 Stefan 2023-03-08 12:07:55 +01:00
• c7628106f2 Dashboard fix Friend2868 2023-03-08 10:14:43 +01:00
• 9b5a933710 Settings Page Frontend Aldin296 2023-03-08 10:17:08 +01:00
• 58ad7ac58f Beep boop 🤖🤖🤖🤖🤖 Stefan 2023-03-08 12:07:55 +01:00
• 0d351972d8 Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Aldin296 2023-03-08 10:17:13 +01:00
• ca58a76594 Settings Page Frontend Aldin296 2023-03-08 10:17:08 +01:00
• 969af74dad Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard Friend2868 2023-03-08 10:14:46 +01:00
• 4da0444ccc Dashboard fix Friend2868 2023-03-08 10:14:43 +01:00
• 5608416d10 Merge pull request #36 from Stefan-5422/feature-DeviceRegistration Stefan 2023-03-08 10:00:16 +01:00
• db787a1ef3 Merge branch 'Development' into feature-DeviceRegistration Stefan 2023-03-08 10:00:05 +01:00
• b4a54fc269 Merge pull request #35 from Stefan-5422/feature-Dashboard Stone_Red 2023-03-08 09:49:43 +01:00
• f37e8bda8b Merge branch 'Development' into feature-Dashboard Stone_Red 2023-03-08 09:49:32 +01:00
• 2b007c61d5 Merge pull request #34 from Stefan-5422/feature-frontend Stone_Red 2023-03-08 09:36:42 +01:00
• b35f6083fb Merge branch 'Development' into feature-frontend feature-frontend Stone_Red 2023-03-08 09:35:49 +01:00