Commit 7c3d64d
committed
Merge branch 'develop' into feature/RestApiv2
# Conflicts:
# cmake_windows.cmd
# sources/external-libs/SQLite/CMakeLists.txt
# sources/external-libs/SQLite/sqlite-amalgamation-3270100/sqlite3.c
# sources/external-libs/SQLite/sqlite-amalgamation-3270100/sqlite3.h
# sources/external-libs/SQLite/sqlite-amalgamation-3270100/sqlite3ext.h
# sources/external-libs/SQLite/sqlite-amalgamation-3460000/sqlite3.c
# sources/external-libs/SQLite/sqlite-amalgamation-3460000/sqlite3.h
# sources/external-libs/SQLite/sqlite-amalgamation-3460000/sqlite3ext.h
# sources/external-libs/SQLite/sqlite-amalgamation-3510200/sqlite3.c
# sources/external-libs/SQLite/sqlite-amalgamation-3510200/sqlite3.h
# sources/external-libs/SQLite/sqlite-amalgamation-3510200/sqlite3ext.h
# sources/external-libs/curlpp/CMakeLists.txt
# sources/plugin_cpp_api/ApiImplementation.cpp
# sources/plugins/dev-FakePlugin/FakePlugin.cpp
# sources/server/RunningInformation.cpp
# sources/server/automation/RuleManager.cpp
# sources/server/automation/interpreter/Instance.cpp
# sources/server/automation/interpreter/IpcAdapter.cpp
# sources/server/database/common/Query.cpp
# sources/server/database/common/Query.h
# sources/server/database/common/QuerySpecializations.h
# sources/server/database/common/requesters/Acquisition.cpp
# sources/server/database/common/requesters/Configuration.cpp
# sources/server/database/common/requesters/Device.cpp
# sources/server/database/common/requesters/Keyword.cpp
# sources/server/database/common/requesters/Plugin.cpp
# sources/server/database/common/requesters/Recipient.cpp
# sources/server/database/common/requesters/Rule.cpp
# sources/server/pluginSystem/Information.cpp
# sources/server/pluginSystem/InstanceStateHandler.cpp
# sources/server/pluginSystem/IpcAdapter.cpp
# sources/server/pluginSystem/IpcAdapter.h
# sources/server/pluginSystem/Manager.cpp
# sources/server/startupOptions/IStartupOptions.h
# sources/server/startupOptions/StartupOptions.cpp
# sources/server/startupOptions/StartupOptions.h
# sources/server/task/Scheduler.cpp
# sources/server/task/backup/Backup.cpp
# sources/server/update/UpdateManager.h
# sources/server/web/poco/RestDispatcher.cpp
# sources/server/web/poco/RestRequestHandler.cpp
# sources/server/web/poco/RestRequestHandler.h
# sources/server/web/poco/WebsiteRequestHandler.cpp
# sources/server/web/rest/service/Configuration.cpp
# sources/server/web/rest/service/System.cpp
# sources/shared/shared/DataContainer.cpp
# sources/shared/shared/StringExtension.h
# sources/shared/shared/http/FileDownloader.cpp
# sources/shared/shared/http/curlppHelpers.cpp
# sources/shared/shared/http/curlppHttpRestRequest.cpp
# sources/shared/shared/plugin/yPluginApi/IDeviceCommand.h198 files changed
Lines changed: 42949 additions & 29922 deletions
File tree
- .github/workflows
- builds
- projects
- sources
- cmake
- external-libs
- SQLite
- sqlite-amalgamation-3510200
- curlpp
- curl
- oatpp-openssl
- oatpp-websocket
- oatpp
- interpreter_IPC
- interpreter_cpp_api
- plugin_IPC
- plugin_cpp_api
- plugins
- EnOcean
- message
- response
- smart_ack
- profiles
- hardCoded
- FreeMobileSMS
- IPX800
- equipments
- specificHistorizers
- Linky
- MailSender
- OrangeBusiness
- Piface2
- RfxLanXpl
- xplcore
- Rfxcom/rfxcomMessages
- Sigfox
- StreamDeck
- hidapi
- header
- sources
- linux
- mac
- windows
- SystemInformation
- TeleInfo
- WES/equipments
- WESSubEquipments
- ZWave
- historizers
- dev-FakePlugin
- scriptInterpreters
- yPython3
- script_IPC
- script_cpp_api
- server
- automation
- interpreter
- script
- database
- common
- requesters
- pgsql
- sqlite
- hardware/serial/windows
- pluginSystem
- internalPlugin
- startupOptions
- task
- tools/linux/tools
- update
- web
- poco
- rest/service
- tests/unit
- projects
- sources
- update
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
4 | 10 | | |
5 | 11 | | |
6 | 12 | | |
7 | 13 | | |
8 | 14 | | |
9 | 15 | | |
10 | 16 | | |
11 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
12 | 26 | | |
13 | | - | |
14 | 27 | | |
| 28 | + | |
15 | 29 | | |
16 | | - | |
17 | 30 | | |
18 | | - | |
19 | | - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
20 | 36 | | |
| 37 | + | |
21 | 38 | | |
22 | | - | |
| 39 | + | |
23 | 40 | | |
24 | 41 | | |
25 | 42 | | |
| 43 | + | |
26 | 44 | | |
27 | 45 | | |
28 | 46 | | |
29 | 47 | | |
30 | 48 | | |
31 | 49 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
57 | 76 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments