Kim
|
787b02f97e
|
fixed merge error
|
2023-03-16 10:34:47 +01:00 |
|
Kim
|
e4dd24c1b0
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# csharp/App/Backend/DataTypes/Methods/User.cs
# csharp/App/Backend/Database/Db.cs
|
2023-03-16 10:33:23 +01:00 |
|
Kim
|
a2836b1900
|
rewrote the bucket url generator, now creates new urls every 12 hours
|
2023-03-16 10:31:24 +01:00 |
ig
|
4c87fcb5ea
|
implement GrantUserAccessTo for folders and installations
|
2023-03-16 09:33:54 +01:00 |
|
ig
|
2cb3701fae
|
rename User2Folder to FolderAccess, rename User2Installation to InstallationAccess
|
2023-03-16 09:25:36 +01:00 |
|
ig
|
7cf27a78bc
|
remove S3 signature building stuff
|
2023-03-16 09:19:23 +01:00 |
|
ig
|
405308d7d6
|
make Ancestors exclude self
|
2023-03-16 09:18:39 +01:00 |
|
ig
|
96018a5867
|
add Create User2Installation and User2Folder to Db
|
2023-03-16 09:15:59 +01:00 |
Sina Blattmann
|
6c479bbe2e
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-16 08:51:36 +01:00 |
|
Kim
|
d6248ead09
|
[WIP] quick fix for login
|
2023-03-16 08:51:22 +01:00 |
|
ig
|
f9cb419da0
|
store session under "Session" header
|
2023-03-16 08:49:01 +01:00 |
|
Sina Blattmann
|
79ec12ba5e
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-16 08:39:57 +01:00 |
|
Sina Blattmann
|
55974839d9
|
[WIP] fix drag ;and drop tree bug
|
2023-03-16 08:39:39 +01:00 |
|
ig
|
4c37c92f73
|
improve backend
|
2023-03-15 14:39:54 +01:00 |
|
Sina Blattmann
|
c4eb538132
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-13 15:17:56 +01:00 |
|
Sina Blattmann
|
c5287ce95f
|
add context for state management for installation and group
|
2023-03-13 15:17:40 +01:00 |
|
ig
|
d974a7f176
|
Move tables to main DB class, convert entity related function to extensions
|
2023-03-13 11:48:04 +01:00 |
|
Sina Blattmann
|
3a6f4fc046
|
[WIP] add drag handle to drag and drop, add error handling and user feedback
|
2023-03-13 11:41:56 +01:00 |
|
ig
|
5a082c22e8
|
Make DB class static
|
2023-03-13 11:36:50 +01:00 |
|
ig
|
6db610d308
|
implement Logic/Wire addressing in ModbusClients
|
2023-03-10 13:57:39 +01:00 |
|
ig
|
df087b9d8e
|
remove MbAddress type
|
2023-03-10 13:46:46 +01:00 |
|
ig
|
2d242f25b7
|
Make MbWords writable
|
2023-03-10 10:12:03 +01:00 |
|
Kim
|
366e0af986
|
Merge remote-tracking branch 'origin/main'
|
2023-03-09 17:21:39 +01:00 |
|
Kim
|
55e0ad22a3
|
giving back user language on login
|
2023-03-09 17:21:31 +01:00 |
|
Sina Blattmann
|
fb86792680
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-09 16:38:27 +01:00 |
|
Kim
|
2703dd1e11
|
adds newly created inst and folders to accessible
|
2023-03-09 16:37:36 +01:00 |
|
Kim
|
2fdd920572
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# csharp/App/Backend/Database/Db.cs
# csharp/App/Backend/Database/User.cs
|
2023-03-09 16:34:19 +01:00 |
|
Kim
|
09a8eee138
|
seperated create from update
|
2023-03-09 16:33:14 +01:00 |
|
ig
|
d885fa94c6
|
Remove Result class;
|
2023-03-09 16:32:11 +01:00 |
|
Sina Blattmann
|
8899f55bd0
|
Finish dnd treeview, add mobile support for scrolling in dnd treeview
|
2023-03-09 15:25:57 +01:00 |
|
ig
|
9d753a8471
|
Introduce State<T> for Enums
|
2023-03-09 14:02:02 +01:00 |
|
Kim
|
a66d547291
|
Merge remote-tracking branch 'origin/main'
|
2023-03-09 13:20:46 +01:00 |
|
Kim
|
fd10522786
|
Added daily deletion of Installation s3 keys
|
2023-03-09 13:20:37 +01:00 |
|
ig
|
eb73beb1cd
|
Implement failure resilient TCP connections for Adam and AMPT
|
2023-03-09 13:16:31 +01:00 |
|
Kim
|
f1394e4755
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# csharp/App/Backend/Database/User.cs
# csharp/App/Backend/Model/User.cs
|
2023-03-09 12:52:47 +01:00 |
|
Kim
|
d04ebffc76
|
added installation specific s3 keys
|
2023-03-09 12:50:21 +01:00 |
|
ig
|
932f8bdac4
|
lift AMPT to new StatusApi
|
2023-03-09 12:40:47 +01:00 |
|
ig
|
8935353e38
|
Introduce Ancestors, GetParent
|
2023-03-09 11:12:56 +01:00 |
|
ig
|
99ef91b7be
|
Use safe defaults for User (fail early)
|
2023-03-09 11:01:48 +01:00 |
|
ig
|
ba79b2d16f
|
Tentatively create struct DbConnection, not used yet.
|
2023-03-09 10:58:55 +01:00 |
|
ig
|
27b24b44a0
|
Rewrite IsParentOfChild even shorter :P
|
2023-03-09 10:58:08 +01:00 |
|
Kim
|
7295e6482b
|
changes to s3 bucket keys generation
|
2023-03-09 10:54:56 +01:00 |
|
ig
|
4812e371b0
|
Rewrite IsParentOfChild
|
2023-03-09 10:52:35 +01:00 |
|
Sina Blattmann
|
53346740ab
|
[WIP] create tree view with drag and drop functionality
|
2023-03-09 10:50:56 +01:00 |
|
Kim
|
683ef02704
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-09 09:06:02 +01:00 |
|
Kim
|
65624cf1aa
|
added dynamic s3 key generation
|
2023-03-09 09:05:59 +01:00 |
|
ig
|
d13e7547c5
|
Remove Energy related measurements from EmuMeterDriver for the time being
|
2023-03-08 16:14:22 +01:00 |
|
Sina Blattmann
|
19978dd211
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-08 15:46:52 +01:00 |
|
ig
|
ee14c0844b
|
Fix duplicate Folders bug
|
2023-03-08 15:45:53 +01:00 |
|
ig
|
2240d3ef47
|
update EmuMeter to new StatusApi
|
2023-03-08 14:22:57 +01:00 |