Skip to content

Commit 72521d0

Browse files
committed
Merge branch 'development' into release
2 parents 7e44b19 + 889b0da commit 72521d0

Some content is hidden

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

88 files changed

+515
-375
lines changed

.github/translators.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ robing29 :: German
348348
Bruno Eduardo de Jesus Barroso (brunoejb) :: Portuguese, Brazilian
349349
Igor V Belousov (biv) :: Russian
350350
David Bauer (davbauer) :: German
351-
Guttorm Hveem (guttormhveem) :: Norwegian Bokmal; Norwegian Nynorsk
351+
Guttorm Hveem (guttormhveem) :: Norwegian Nynorsk; Norwegian Bokmal
352352
Minh Giang Truong (minhgiang1204) :: Vietnamese
353353
Ioannis Ioannides (i.ioannides) :: Greek
354354
Vadim (vadrozh) :: Russian
@@ -357,13 +357,15 @@ Paulo Henrique (paulohsantos114) :: Portuguese, Brazilian
357357
Dženan (Dzenan) :: Swedish
358358
Péter Péli (peter.peli) :: Hungarian
359359
TWME :: Chinese Traditional
360-
Sascha (Man-in-Black) :: German
360+
Sascha (Man-in-Black) :: German; German Informal
361361
Mohammadreza Madadi (madadi.efl) :: Persian
362-
Konstantin Kovacheli (kkovacheli) :: Ukrainian
362+
Konstantin (kkovacheli) :: Ukrainian; Russian
363363
link1183 :: French
364364
Renan (rfpe) :: Portuguese, Brazilian
365365
Lowkey (bbsweb) :: Chinese Simplified
366366
ZZnOB (zznobzz) :: Russian
367367
rupus :: Swedish
368368
developernecsys :: Norwegian Nynorsk
369369
xuan LI (xuanli233) :: Chinese Simplified
370+
LameeQS :: Latvian
371+
Sorin T. (trimbitassorin) :: Romanian

.github/workflows/test-migrations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-22.04
1717
strategy:
1818
matrix:
19-
php: ['8.0', '8.1', '8.2']
19+
php: ['8.0', '8.1', '8.2', '8.3']
2020
steps:
2121
- uses: actions/checkout@v1
2222

.github/workflows/test-php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-22.04
1717
strategy:
1818
matrix:
19-
php: ['8.0', '8.1', '8.2']
19+
php: ['8.0', '8.1', '8.2', '8.3']
2020
steps:
2121
- uses: actions/checkout@v1
2222

dev/docs/javascript-public-events.md

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,3 +253,69 @@ window.addEventListener('library-cm6::configure-theme', event => {
253253
});
254254
```
255255
</details>
256+
257+
### `library-cm6::pre-init`
258+
259+
This event is called just before any CodeMirror instances are initialised so that the instance configuration can be viewed and altered before the instance is created.
260+
261+
#### Event Data
262+
263+
- `usage` - A string label to identify the usage type of the CodeMirror instance in BookStack.
264+
- `editorViewConfig` - A reference to the [EditorViewConfig](https://codemirror.net/docs/ref/#view.EditorViewConfig) that will be used to create the instance.
265+
- `libEditorView` - The CodeMirror [EditorView](https://codemirror.net/docs/ref/#view.EditorView) class object, provided for convenience.
266+
- `libEditorState` - The CodeMirror [EditorState](https://codemirror.net/docs/ref/#state.EditorState) class object, provided for convenience.
267+
- `libCompartment` - The CodeMirror [Compartment](https://codemirror.net/docs/ref/#state.Compartment) class object, provided for convenience.
268+
269+
##### Example
270+
271+
The below shows how you'd enable the built-in line wrapping extension for page content code blocks:
272+
273+
<details>
274+
<summary>Show Example</summary>
275+
276+
```javascript
277+
window.addEventListener('library-cm6::pre-init', event => {
278+
const detail = event.detail;
279+
const config = detail.editorViewConfig;
280+
const EditorView = detail.libEditorView;
281+
282+
if (detail.usage === 'content-code-block') {
283+
config.extensions.push(EditorView.lineWrapping);
284+
}
285+
});
286+
```
287+
</details>
288+
289+
### `library-cm6::post-init`
290+
291+
This event is called just after any CodeMirror instances are initialised so that you're able to gain a reference to the CodeMirror EditorView instance.
292+
293+
#### Event Data
294+
295+
- `usage` - A string label to identify the usage type of the CodeMirror instance in BookStack.
296+
- `editorView` - A reference to the [EditorView](https://codemirror.net/docs/ref/#view.EditorView) instance that has been created.
297+
- `editorViewConfig` - A reference to the [EditorViewConfig](https://codemirror.net/docs/ref/#view.EditorViewConfig) that was used to create the instance.
298+
- `libEditorView` - The CodeMirror [EditorView](https://codemirror.net/docs/ref/#view.EditorView) class object, provided for convenience.
299+
- `libEditorState` - The CodeMirror [EditorState](https://codemirror.net/docs/ref/#state.EditorState) class object, provided for convenience.
300+
- `libCompartment` - The CodeMirror [Compartment](https://codemirror.net/docs/ref/#state.Compartment) class object, provided for convenience.
301+
302+
##### Example
303+
304+
The below shows how you'd prepend some default text to all content (page) code blocks.
305+
306+
<details>
307+
<summary>Show Example</summary>
308+
309+
```javascript
310+
window.addEventListener('library-cm6::post-init', event => {
311+
const detail = event.detail;
312+
const editorView = detail.editorView;
313+
314+
if (detail.usage === 'content-code-block') {
315+
editorView.dispatch({
316+
changes: {from: 0, to: 0, insert: 'Copyright 2023\n\n'}
317+
});
318+
}
319+
});
320+
```
321+
</details>

lang/ar/settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@
306306
'ko' => '한국어',
307307
'lt' => 'Lietuvių Kalba',
308308
'lv' => 'Latviešu Valoda',
309-
'nl' => 'Nederlands',
310309
'nb' => 'Norsk (Bokmål)',
310+
'nn' => 'Nynorsk',
311+
'nl' => 'Nederlands',
311312
'pl' => 'Polski',
312313
'pt' => 'Português',
313314
'pt_BR' => 'Português do Brasil',

lang/bg/settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@
306306
'ko' => '한국어',
307307
'lt' => 'Lietuvių Kalba',
308308
'lv' => 'Latviešu Valoda',
309-
'nl' => 'Nederlands',
310309
'nb' => 'Norsk (Bokmål)',
310+
'nn' => 'Nynorsk',
311+
'nl' => 'Nederlands',
311312
'pl' => 'Polski',
312313
'pt' => 'Português',
313314
'pt_BR' => 'Português do Brasil',

lang/bs/settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@
306306
'ko' => '한국어',
307307
'lt' => 'Lietuvių Kalba',
308308
'lv' => 'Latviešu Valoda',
309-
'nl' => 'Nederlands',
310309
'nb' => 'Norsk (Bokmål)',
310+
'nn' => 'Nynorsk',
311+
'nl' => 'Nederlands',
311312
'pl' => 'Polski',
312313
'pt' => 'Português',
313314
'pt_BR' => 'Português do Brasil',

lang/ca/settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@
306306
'ko' => '한국어',
307307
'lt' => 'Lietuvių Kalba',
308308
'lv' => 'Latviešu Valoda',
309-
'nl' => 'Nederlands',
310309
'nb' => 'Norsk (Bokmål)',
310+
'nn' => 'Nynorsk',
311+
'nl' => 'Nederlands',
311312
'pl' => 'Polski',
312313
'pt' => 'Português',
313314
'pt_BR' => 'Português do Brasil',

lang/cs/settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@
306306
'ko' => '한국어',
307307
'lt' => 'Lietuvių Kalba',
308308
'lv' => 'Latviešu Valoda',
309-
'nl' => 'Nederlands',
310309
'nb' => 'Norsk (Bokmål)',
310+
'nn' => 'Nynorsk',
311+
'nl' => 'Nederlands',
311312
'pl' => 'Polski',
312313
'pt' => 'Português',
313314
'pt_BR' => 'Português do Brasil',

lang/cy/settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@
306306
'ko' => '한국어',
307307
'lt' => 'Lietuvių Kalba',
308308
'lv' => 'Latviešu Valoda',
309-
'nl' => 'Nederlands',
310309
'nb' => 'Norsk (Bokmål)',
310+
'nn' => 'Nynorsk',
311+
'nl' => 'Nederlands',
311312
'pl' => 'Polski',
312313
'pt' => 'Português',
313314
'pt_BR' => 'Português do Brasil',

0 commit comments

Comments
 (0)