Skip to content

Commit a2c53c6

Browse files
authored
Merge branch 'DSpace:main' into translation_hindi_gu_ma
2 parents 5ac8dc1 + a9c50c1 commit a2c53c6

4 files changed

Lines changed: 93 additions & 11 deletions

File tree

.github/dependabot.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ updates:
1313
directory: "/"
1414
schedule:
1515
interval: "weekly"
16+
time: "05:00"
1617
# Allow up to 10 open PRs for dependencies
1718
open-pull-requests-limit: 10
1819
# Group together Angular package upgrades
@@ -146,13 +147,93 @@ updates:
146147
- dependency-name: "*"
147148
update-types: ["version-update:semver-major"]
148149
#####################
150+
## dspace-9_x branch
151+
#####################
152+
- package-ecosystem: "npm"
153+
directory: "/"
154+
target-branch: dspace-9_x
155+
schedule:
156+
interval: "weekly"
157+
time: "05:00"
158+
# Allow up to 10 open PRs for dependencies
159+
open-pull-requests-limit: 10
160+
# Group together Angular package upgrades
161+
groups:
162+
# Group together all patch version updates for Angular in a single PR
163+
angular:
164+
applies-to: version-updates
165+
patterns:
166+
- "@angular*"
167+
update-types:
168+
- "minor"
169+
- "patch"
170+
# Group together all minor/patch version updates for NgRx in a single PR
171+
ngrx:
172+
applies-to: version-updates
173+
patterns:
174+
- "@ngrx*"
175+
update-types:
176+
- "minor"
177+
- "patch"
178+
# Group together all patch version updates for eslint in a single PR
179+
eslint:
180+
applies-to: version-updates
181+
patterns:
182+
- "@typescript-eslint*"
183+
- "eslint*"
184+
update-types:
185+
- "minor"
186+
- "patch"
187+
# Group together any testing related version updates
188+
testing:
189+
applies-to: version-updates
190+
patterns:
191+
- "@cypress*"
192+
- "axe-*"
193+
- "cypress*"
194+
- "jasmine*"
195+
- "karma*"
196+
- "ng-mocks"
197+
update-types:
198+
- "minor"
199+
- "patch"
200+
# Group together any postcss related version updates
201+
postcss:
202+
applies-to: version-updates
203+
patterns:
204+
- "postcss*"
205+
update-types:
206+
- "minor"
207+
- "patch"
208+
# Group together any sass related version updates
209+
sass:
210+
applies-to: version-updates
211+
patterns:
212+
- "sass*"
213+
update-types:
214+
- "minor"
215+
- "patch"
216+
# Group together any webpack related version updates
217+
webpack:
218+
applies-to: version-updates
219+
patterns:
220+
- "webpack*"
221+
update-types:
222+
- "minor"
223+
- "patch"
224+
ignore:
225+
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
226+
- dependency-name: "*"
227+
update-types: ["version-update:semver-major"]
228+
#####################
149229
## dspace-8_x branch
150230
#####################
151231
- package-ecosystem: "npm"
152232
directory: "/"
153233
target-branch: dspace-8_x
154234
schedule:
155235
interval: "weekly"
236+
time: "05:00"
156237
# Allow up to 10 open PRs for dependencies
157238
open-pull-requests-limit: 10
158239
# Group together Angular package upgrades
@@ -231,6 +312,7 @@ updates:
231312
target-branch: dspace-7_x
232313
schedule:
233314
interval: "weekly"
315+
time: "05:00"
234316
# Allow up to 10 open PRs for dependencies
235317
open-pull-requests-limit: 10
236318
# Group together Angular package upgrades

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"@angular/platform-server": "^18.2.12",
104104
"@angular/router": "^18.2.12",
105105
"@angular/ssr": "^18.2.19",
106-
"@babel/runtime": "7.27.1",
106+
"@babel/runtime": "7.27.3",
107107
"@kolkov/ngx-gallery": "^2.0.1",
108108
"@ng-bootstrap/ng-bootstrap": "^12.0.0",
109109
"@ng-dynamic-forms/core": "^16.0.0",
@@ -237,7 +237,7 @@
237237
"sass-resources-loader": "^2.2.5",
238238
"ts-node": "^8.10.2",
239239
"typescript": "~5.4.5",
240-
"webpack": "5.99.8",
240+
"webpack": "5.99.9",
241241
"webpack-cli": "^5.1.4",
242242
"webpack-dev-server": "^4.15.1"
243243
}

src/assets/i18n/de.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2469,7 +2469,7 @@
24692469
"cookies.consent.content-modal.no-privacy-policy.text": "",
24702470

24712471
// "cookies.consent.content-modal.title": "Information that we collect",
2472-
"cookies.consent.content-modal.title": "Information, die wir sammeln",
2472+
"cookies.consent.content-modal.title": "Informationen, die wir sammeln",
24732473

24742474
// "cookies.consent.app.title.accessibility": "Accessibility Settings",
24752475
// TODO New key - Add a translation

0 commit comments

Comments
 (0)