 atef
|
c52501f715
|
Merge remote-tracking branch 'origin/main'
|
2023-03-17 10:39:56 +01:00 |
|
atef
|
1f868e9cec
|
Docs for different devices.
|
2023-03-17 10:38:29 +01:00 |
Sina Blattmann
|
19b399806c
|
temporary solution for tree bug
|
2023-03-17 10:19:05 +01:00 |
|
Sina Blattmann
|
1326ee7aee
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-17 09:12:20 +01:00 |
ig
|
44e183a9f1
|
Fix AccessibleFolders
|
2023-03-17 09:11:26 +01:00 |
Kim
|
4a19ebd49c
|
various small comments
|
2023-03-16 16:53:36 +01:00 |
|
Kim
|
91a1c47328
|
various small comments
|
2023-03-16 16:52:20 +01:00 |
|
Kim
|
df65b48c8f
|
creating new folders and installations now gives you access to the new folder/installation
|
2023-03-16 16:45:25 +01:00 |
|
Kim
|
4eac790eaa
|
exchanged api keys for ones with specific restricted permissions
|
2023-03-16 16:34:52 +01:00 |
|
Kim
|
6366cb5569
|
fixed deleting buckets method
|
2023-03-16 16:22:18 +01:00 |
|
Sina Blattmann
|
45ed859826
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-16 16:14:51 +01:00 |
|
Sina Blattmann
|
3a01a38046
|
[WIP] fix bug in drag and drop treeview
|
2023-03-16 16:14:06 +01:00 |
|
Kim
|
774291c1c9
|
Merge remote-tracking branch 'origin/main'
|
2023-03-16 16:13:10 +01:00 |
|
Kim
|
20c70b10ac
|
added s3 bucket creation on installation creation
|
2023-03-16 16:13:04 +01:00 |
|
ig
|
e136767b12
|
Add tree traversal functions. Skip self in Folder/User descendants
|
2023-03-16 14:13:45 +01:00 |
|
Sina Blattmann
|
e3e03fda8b
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-16 14:04:36 +01:00 |
|
Kim
|
fb4a407a52
|
added calls for granting and revoking permissions
|
2023-03-16 13:33:51 +01:00 |
|
Sina Blattmann
|
e77dc5f2b6
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-16 12:50:34 +01:00 |
|
Kim
|
b1c6aeb9ab
|
made python s3cmd the standart across all os
|
2023-03-16 12:49:54 +01:00 |
|
Kim
|
083c412177
|
added python variant of s3cmd
|
2023-03-16 12:49:25 +01:00 |
|
Sina Blattmann
|
e10c880d01
|
Merge branch 'main' of https://git.innov.energy/Innovenergy/git_trunk
|
2023-03-16 11:23:54 +01:00 |
|
Kim
|
0f7daea8ea
|
renamed user2folder and user2installation, reimplemented getbyId
|
2023-03-16 11:16:23 +01:00 |
|
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 |