Skip to content

Feature/rest apiv2#745

Open
oben01 wants to merge 428 commits intodevelopfrom
feature/RestApiv2
Open

Feature/rest apiv2#745
oben01 wants to merge 428 commits intodevelopfrom
feature/RestApiv2

Conversation

@oben01
Copy link
Copy Markdown
Member

@oben01 oben01 commented Sep 10, 2023

No description provided.

# 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.h
# Conflicts:
#	tests/unit/sources/plugins/Linky/TestLinkyReceiveBufferHandler.cpp
#	tests/unit/sources/plugins/TeleInfo/TestTeleInfoReceiveBufferHandler.cpp
#	tests/unit/sources/server/pluginSystem/information/TestPluginInformation.cpp
#	tests/unit/sources/server/startupOptions/TestLoader.cpp
#	tests/unit/sources/shared/TestDataContainer.cpp
Add Bruno collection to test end-points
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants