Skip to content

Commit f4b8486

Browse files
authored
Merge pull request #10100 from nextcloud/feature/governanceLabelsIntegration
Feature/governance labels integration
2 parents 8a39db5 + 7c72a6d commit f4b8486

42 files changed

Lines changed: 2975 additions & 1 deletion

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

REUSE.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ precedence = "aggregate"
125125
SPDX-FileCopyrightText = "2018-2025 Google LLC"
126126
SPDX-License-Identifier = "Apache-2.0"
127127

128+
[[annotations]]
129+
path = ["theme/security.svg", "theme/file-clock-outline.svg"]
130+
precedence = "aggregate"
131+
SPDX-FileCopyrightText = "Material Design Authors"
132+
SPDX-License-Identifier = "Apache-2.0"
133+
128134
[[annotations]]
129135
path = [
130136
"Nextcloud Desktop Client.xcworkspace/**",

resources.qrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,12 @@
7777
<file>src/gui/wizard/qml/ServerPage.qml</file>
7878
<file>src/gui/wizard/qml/SyncOptionsPage.qml</file>
7979
<file>src/gui/wizard/qml/WizardButton.qml</file>
80+
<file>src/gui/wizard/qml/WizardComboBox.qml</file>
8081
<file>src/gui/wizard/qml/WizardDialogFrame.qml</file>
8182
<file>src/gui/wizard/qml/WizardTextField.qml</file>
8283
<file>src/gui/macOS/ui/FileProviderSettings.qml</file>
8384
<file>src/gui/macOS/ui/FileProviderFileDelegate.qml</file>
8485
<file>src/gui/integration/FileActionsWindow.qml</file>
86+
<file>src/gui/GovernanceLabelsDialog.qml</file>
8587
</qresource>
8688
</RCC>

src/gui/CMakeLists.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,27 @@ set(client_SRCS
208208
filedetails/shareemodel.cpp
209209
filedetails/sortedsharemodel.h
210210
filedetails/sortedsharemodel.cpp
211+
governance/governancenetworkjob.h
212+
governance/governancenetworkjob.cpp
213+
governance/getgovernancelabels.h
214+
governance/getgovernancelabels.cpp
215+
governance/getavailablegovernancelabels.h
216+
governance/getavailablegovernancelabels.cpp
217+
governance/applygovernancelabel.h
218+
governance/applygovernancelabel.cpp
219+
governance/deletegovernancelabel.h
220+
governance/deletegovernancelabel.cpp
221+
governance/typedgovernancenetworkjob.h
222+
governance/typedgovernancenetworkjob.cpp
223+
governance/ocsgovernancejob.h
224+
governance/ocsgovernancejob.cpp
225+
governance/typedwithlabelidgovernancenetworkjob.h
226+
governance/typedwithlabelidgovernancenetworkjob.cpp
227+
governance/governancelabelinfo.h
228+
governance/governancelabelinfo.cpp
229+
governance/governancelabelslistmodel.h
230+
governance/governancelabelslistmodel.cpp
231+
governance/governancetypes.h
211232
tray/svgimageprovider.h
212233
tray/svgimageprovider.cpp
213234
tray/syncstatussummary.h

0 commit comments

Comments
 (0)