Skip to content

Commit 201c522

Browse files
darcywong00darcywong00
authored
Merge pull request #2202 from keymanapp/chore/merge-master-to-staging-a19s9
chore: Merge master to staging for Sprint A19S9
2 parents 4d44cab + b2c78c7 commit 201c522

File tree

49 files changed

+251
-123
lines changed

Some content is hidden

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

49 files changed

+251
-123
lines changed

‎.github/multi-labeler.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
version: v1
2+
3+
# This file adds labels based on the scopes in
4+
# keymanapp/keyman:resources/scopes/commit-types.json
5+
# Currently it must be manually kept up to date. Not all labels are added, only
6+
# common ones. The others are commented out.
7+
8+
9+
labels:
10+
#
11+
# conventional commit / semantic PR styles
12+
#
13+
14+
- label: 'auto'
15+
matcher:
16+
title: '^auto(\(|:)'
17+
- label: 'change'
18+
matcher:
19+
title: '^change(\(|:)'
20+
- label: 'chore'
21+
matcher:
22+
title: '^chore(\(|:)'
23+
- label: 'docs'
24+
matcher:
25+
title: '^docs(\(|:)'
26+
- label: 'feat'
27+
matcher:
28+
title: '^feat(\(|:)'
29+
- label: 'fix'
30+
matcher:
31+
title: '^fix(\(|:)'
32+
- label: 'maint'
33+
matcher:
34+
title: '^maint(\(|:)'
35+
- label: 'refactor'
36+
matcher:
37+
title: '^refactor(\(|:)'
38+
- label: 'style'
39+
matcher:
40+
title: '^style(\(|:)'
41+
- label: 'test'
42+
matcher:
43+
title: '^test(\(|:)'

‎.github/workflows/labeler.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: "Pull Request Labeler"
2+
on:
3+
- pull_request
4+
5+
jobs:
6+
triage:
7+
if: github.repository == 'keymanapp/help.keyman.com'
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Update labels based on PR title
11+
id: labeler
12+
uses: fuxingloh/multi-labeler@f5bd7323b53b0833c1e4ed8d7b797ae995ef75b4 # v2.0.1
13+
with:
14+
github-token: ${{secrets.GITHUB_TOKEN}}
15+
config-path: .github/multi-labeler.yml

‎cdn/dev/css/template.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,7 @@ table.platform {
11921192
#osk-phone,
11931193
#osk-tablet{
11941194
position: relative;
1195+
z-index: 0;
11951196
}
11961197

11971198
#osk .kmw-osk-inner-frame{

‎developer/language/reference/version.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ version that supports the full set of features used in the keyboard, and
3636
assign that version number value to this store internally. The compiler will
3737
also report on the version it infers in the compile process.
3838

39-
There is one scenario where the `&version` store is required: multi-part
40-
Unicode identifiers in the touch layout (e.g. `U_0061_0300`) are processed
41-
too late in the compile process to affect the minimum version inference, and
42-
so in this situation, `&version` must be set to `15.0` or later.
39+
> [!NOTE] With Keyman Developer 15.0, 16.0, and 17.0, there is one scenario where
40+
> the `&version` store is required: multi-part Unicode identifiers in the touch
41+
> layout (e.g. `U_0061_0300`) are processed too late in the compile process to
42+
> affect the minimum version inference, and so in this situation, `&version`
43+
> must be set to `15.0` or later. In Keyman Developer 18.0, the compiler has
44+
> been updated to resolve this, so the `&version` store is no longer required.
4345
4446
> [!NOTE]
4547
> The `VERSION 'x.y'` format of this statement is deprecated and will be

‎keyboard/basic_kbdcherp/1.1.0/basic_kbdcherp.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<p>This keyboard utilizes dead keys to reach the Cherokee characters. The dead keys on this layout have square brackets around them. For example, "[q]" is a dead key.</p>
5050

5151

52-
<h2>Keyboard Layout</h1>
5352
<h2>Desktop Keyboard Layout</h2>
5453
<div id='osk' data-states='default shift'>
5554
</div>

‎keyboard/basic_kbdmon/1.1.1/basic_kbdmon.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
require_once('header.php');
66
?>
77

8-
9-
<h1>Start Using Mongolian Cyrillic Basic</h1>
10-
118
<p>
129
Mongolian Cyrillic Basic. The keyboard layout follows the Windows 10 layout.
1310
</p>

‎keyboard/basic_kbdtifi/1.0.1/basic_kbdtifi.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
$pagename = 'Tifinagh (Basic) Basic Keyboard Help';
3+
$pagetitle = 'Tifinagh (Basic) Basic Keyboard Help';
4+
// Header we will tidy up later
5+
require_once('header.php');
6+
?>
7+
8+
<p>
9+
This keyboard is designed for the Central Atlas Tamazight language of Morocco (Tifinagh script).
10+
</p>
11+
12+
<h2>Desktop Keyboard Layout</h2>
13+
<div id='osk' data-states='default shift rightalt'>
14+
</div>
15+
16+
<h2>Mobile/Tablet Keyboard Layout</h2>
17+
<div id='osk-tablet' data-states='default shift rightalt'>
18+
</div>
19+
20+

‎keyboard/basic_kbdtifi2/1.0.2/basic_kbdtifi2.php‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
$pagename = 'Tifinagh (Full) Basic Keyboard Help';
3+
$pagetitle = 'Tifinagh (Full) Basic Keyboard Help';
4+
// Header we will tidy up later
5+
require_once('header.php');
6+
7+
8+
?>
9+
10+
11+
<p>
12+
This keyboard is designed for languages which use the Tifinagh script. This keyboard does not support the consonant joiner (U+2D7F) for forming bi-consonants. It also does not support U+2D66, U+2D67, U+2D70.
13+
</p>
14+
15+
<br/>
16+
17+
<h2>Desktop Keyboard Layout</h2>
18+
<div id='osk' data-states='default shift rightalt'>
19+
</div>
20+
21+
<h2>Mobile/Tablet Keyboard Layout</h2>
22+
<div id='osk-tablet' data-states='default shift rightalt'>
23+
</div>
24+
25+

‎keyboard/baybayin/1.2.1/baybayin.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
This keyboard lets you type Baybayin script in Unicode. This keyboard includes an on screen keyboard which can be viewed by clicking on the Keyman icon and selecting the On Screen Keyboard menu item.
1010
</p>
1111

12-
<h1>Desktop Keyboard Layout</h1>
12+
<h2>Desktop Keyboard Layout</h2>
1313
<div id='osk' data-states='default shift'>
1414
</div>
1515

‎keyboard/bu_phonetic/2.1/bu_phonetic.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
$pagetitle = $pagename;
2020
require_once('header.php');
2121
?>
22-
<h1>The BU Phonetic Keyboarding System</h1>
23-
<h2>Albert Bickford</h2>
2422

2523
<p>The BU Phonetic Keyboard provides access to a wide range of characters for Latin-based scripts in Unicode (<a href='http://www.unicode.org/'>www.unicode.org</a>), including:</p>
2624
<ul>

0 commit comments

Comments
 (0)