Skip to content

Commit 2645e6f

Browse files
committed
Merge branches 'develop' and 't3chguy/usercontent' of github.com:vector-im/riot-web into t3chguy/usercontent
2 parents 0c62db3 + 036348c commit 2645e6f

6 files changed

Lines changed: 326 additions & 267 deletions

File tree

docs/shortcuts.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ The modifier is <kbd>Ctrl</kbd> on Windows & Linux and <kbd>⌘</kbd> on Mac.
1111
- <kbd>Alt</kbd>+<kbd>↑</kbd>/<kbd>↓</kbd> - resend previous messages when the composer is in focus
1212
- <kbd>PageUp</kbd>/<kbd>PageDown</kbd> - scroll timeline up/down
1313
- <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>Home</kbd>/<kbd>End</kbd> - jump to timeline start/end
14+
- <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>`</kbd> - toggle the top left menu

electron_app/build/entitlements.mac.plist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
Latest electron-builder does, but it appears to be causing issues:
1010
(https://github.com/electron-userland/electron-builder/issues/4390)
1111
-->
12+
<!-- https://github.com/electron/electron-notarize#prerequisites -->
13+
<key>com.apple.security.cs.allow-jit</key>
14+
<true/>
1215
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
1316
<true/>
1417
<!-- https://github.com/electron-userland/electron-builder/issues/3940 -->

electron_app/build/linux/after-install.tpl

Lines changed: 0 additions & 14 deletions
This file was deleted.

package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
"cpx": "^1.3.2",
107107
"cross-env": "^6.0.3",
108108
"css-loader": "^3.3.2",
109-
"electron-builder": "^21.2.0",
110-
"electron-builder-squirrel-windows": "^21.2.0",
109+
"electron-builder": "^22.3.2",
110+
"electron-builder-squirrel-windows": "^22.3.2",
111111
"electron-devtools-installer": "^2.2.4",
112112
"electron-notarize": "^0.2.0",
113113
"eslint": "^5.8.0",
@@ -153,7 +153,7 @@
153153
},
154154
"build": {
155155
"appId": "im.riot.app",
156-
"electronVersion": "7.1.9",
156+
"electronVersion": "7.1.12",
157157
"files": [
158158
"node_modules/**",
159159
"src/**"
@@ -173,9 +173,6 @@
173173
"StartupWMClass": "riot"
174174
}
175175
},
176-
"deb": {
177-
"afterInstall": "electron_app/build/linux/after-install.tpl"
178-
},
179176
"mac": {
180177
"category": "public.app-category.social-networking",
181178
"darkModeSupport": true

src/i18n/strings/kab.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)