Skip to content

Commit 2270438

Browse files
foldleftfoldleft
committed
Merge branch 'develop' into foldleft/12014-big-previews-2
2 parents cbdb2ec + a1ff03c commit 2270438

95 files changed

Lines changed: 2259 additions & 3512 deletions

File tree

Some content is hidden

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

‎.dockerignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ test/
33
webapp/
44
lib/
55
node_modules/
6-
electron_app/
76
karma-reports/
87
.idea/
98
.tmp/

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
/key.pem
55
/lib
66
/node_modules
7-
/electron_app/node_modules
8-
/electron_app/dist
9-
/electron_app/pub
107
/packages/
118
/webapp
129
/.npmrc

‎CHANGELOG.md‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,99 @@
1+
Changes in [1.6.0](https://github.com/vector-im/riot-web/releases/tag/v1.6.0) (2020-05-05)
2+
==========================================================================================
3+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.6...v1.6.0)
4+
5+
* Cross-signing and E2EE by default for DMs and private rooms enabled
6+
* Upgrade to React SDK 2.5.0 and JS SDK 6.0.0
7+
8+
Changes in [1.6.0-rc.6](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.6) (2020-05-01)
9+
====================================================================================================
10+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.5...v1.6.0-rc.6)
11+
12+
* Upgrade to React SDK 2.5.0-rc.6 and JS SDK 6.0.0-rc.2
13+
14+
Changes in [1.6.0-rc.5](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.5) (2020-04-30)
15+
====================================================================================================
16+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.4...v1.6.0-rc.5)
17+
18+
* Upgrade to React SDK 2.5.0-rc.5 and JS SDK 6.0.0-rc.1
19+
* Remove feature flag docs from docs on release
20+
[\#13375](https://github.com/vector-im/riot-web/pull/13375)
21+
22+
Changes in [1.6.0-rc.4](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.4) (2020-04-23)
23+
====================================================================================================
24+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.3...v1.6.0-rc.4)
25+
26+
* Upgrade to React SDK 2.5.0-rc.4 and JS SDK 5.3.1-rc.4
27+
28+
Changes in [1.6.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.3) (2020-04-17)
29+
====================================================================================================
30+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.2...v1.6.0-rc.3)
31+
32+
* Upgrade to React SDK 2.5.0-rc.3 and JS SDK 5.3.1-rc.3
33+
34+
Changes in [1.6.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.2) (2020-04-16)
35+
====================================================================================================
36+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.1...v1.6.0-rc.2)
37+
38+
* Upgrade to React SDK 2.5.0-rc.2 and JS SDK 5.3.1-rc.2
39+
* Enable cross-signing / E2EE by default for DM without config changes
40+
41+
Changes in [1.6.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.1) (2020-04-15)
42+
====================================================================================================
43+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.16-rc.1...v1.6.0-rc.1)
44+
45+
* Enable cross-signing / E2EE by default for DM on release
46+
[\#13179](https://github.com/vector-im/riot-web/pull/13179)
47+
* Upgrade to React SDK 2.5.0-rc.1 and JS SDK 5.3.1-rc.1
48+
* Add instruction to resolve the inotify watch limit issue
49+
[\#13128](https://github.com/vector-im/riot-web/pull/13128)
50+
* docs: labs: add a pointer to config.md
51+
[\#13149](https://github.com/vector-im/riot-web/pull/13149)
52+
* Fix Electron SSO handling to support multiple profiles
53+
[\#13028](https://github.com/vector-im/riot-web/pull/13028)
54+
* Add riot-desktop shortcuts for forward/back matching browsers&slack
55+
[\#13133](https://github.com/vector-im/riot-web/pull/13133)
56+
* Allow rageshake to fail in init
57+
[\#13164](https://github.com/vector-im/riot-web/pull/13164)
58+
* Fix broken yarn install link in README.md
59+
[\#13125](https://github.com/vector-im/riot-web/pull/13125)
60+
* fix build:jitsi scripts crash caused by a missing folder
61+
[\#13122](https://github.com/vector-im/riot-web/pull/13122)
62+
* App load order changes to catch errors better
63+
[\#13095](https://github.com/vector-im/riot-web/pull/13095)
64+
* Upgrade deps
65+
[\#13080](https://github.com/vector-im/riot-web/pull/13080)
66+
67+
Changes in [1.5.16-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.16-rc.1) (2020-04-08)
68+
======================================================================================================
69+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.15...v1.5.16-rc.1)
70+
71+
* Upgrade React SDK to 2.4.0-rc.1 and JS SDK to 5.3.0-rc.1
72+
* Update from Weblate
73+
[\#13078](https://github.com/vector-im/riot-web/pull/13078)
74+
* Mention Jitsi support at the .well-known level in Jitsi docs
75+
[\#13047](https://github.com/vector-im/riot-web/pull/13047)
76+
* Add new default home page fallback
77+
[\#13049](https://github.com/vector-im/riot-web/pull/13049)
78+
* App load order tweaks for code splitting
79+
[\#13032](https://github.com/vector-im/riot-web/pull/13032)
80+
* Add some docs about Jitsi widgets and Jitsi configuration
81+
[\#13027](https://github.com/vector-im/riot-web/pull/13027)
82+
* Bump minimist from 1.2.2 to 1.2.3 in /electron_app
83+
[\#13030](https://github.com/vector-im/riot-web/pull/13030)
84+
* Fix Electron mac-specific shortcut being registered on Web too.
85+
[\#13020](https://github.com/vector-im/riot-web/pull/13020)
86+
* Add a console warning that errors from Jitsi Meet are fine
87+
[\#12968](https://github.com/vector-im/riot-web/pull/12968)
88+
* Fix popout support for jitsi widgets
89+
[\#12975](https://github.com/vector-im/riot-web/pull/12975)
90+
* Some grammar and clarifications
91+
[\#12925](https://github.com/vector-im/riot-web/pull/12925)
92+
* Don't immediately remove notifications from notification trays
93+
[\#12861](https://github.com/vector-im/riot-web/pull/12861)
94+
* Remove welcome user from config
95+
[\#12894](https://github.com/vector-im/riot-web/pull/12894)
96+
197
Changes in [1.5.15](https://github.com/vector-im/riot-web/releases/tag/v1.5.15) (2020-04-01)
298
============================================================================================
399
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.14...v1.5.15)

‎README.md‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -108,40 +108,7 @@ Riot can also be run as a desktop app, wrapped in Electron. You can download a
108108
pre-built version from https://riot.im/download/desktop/ or, if you prefer,
109109
build it yourself.
110110

111-
To build it yourself, follow the instructions below.
112-
113-
1. Follow the instructions in 'Building From Source' above, but run
114-
`yarn build` instead of `yarn dist` (since we don't need the tarball).
115-
2. Install Electron and run it:
116-
117-
```bash
118-
yarn electron
119-
```
120-
121-
To build packages, use `electron-builder`. This is configured to output:
122-
* `dmg` + `zip` for macOS
123-
* `exe` + `nupkg` for Windows
124-
* `deb` for Linux
125-
But this can be customised by editing the `build` section of package.json
126-
as per https://github.com/electron-userland/electron-builder/wiki/Options
127-
128-
See https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Build
129-
for dependencies required for building packages for various platforms.
130-
131-
The only platform that can build packages for all three platforms is macOS:
132-
```bash
133-
brew install mono
134-
yarn install
135-
yarn build:electron
136-
```
137-
138-
For other packages, use `electron-builder` manually. For example, to build a
139-
package for 64 bit Linux:
140-
141-
1. Follow the instructions in 'Building From Source' above
142-
2. `node_modules/.bin/build -l --x64`
143-
144-
All Electron packages go into `electron_app/dist/`
111+
To build it yourself, follow the instructions at https://github.com/vector-im/riot-desktop.
145112

146113
Many thanks to @aviraldg for the initial work on the Electron integration.
147114

@@ -310,7 +277,7 @@ modifying it. See the [configuration docs](docs/config.md) for details.
310277

311278
Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
312279

313-
**Note**: The build script uses inotify by default on Linux to monitor directories
280+
**Note**: The build script uses inotify by default on Linux to monitor directories
314281
for changes. If the inotify watch limit is too low your build will silently fail.
315282
To avoid this issue, we recommend a limit of at least 128M.
316283

‎__mocks__/cssMock.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "css-file-stub";

‎docs/config.md‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,24 +136,11 @@ If none of these sources have an identity server set, then Riot will prompt the
136136
user to set an identity server first when attempting to use features that
137137
require one.
138138

139-
Currently the only two public identity servers are https://vector.im and
139+
Currently, the only two public identity servers are https://vector.im and
140140
https://matrix.org, however in the future identity servers will be
141141
decentralised.
142142

143143
Desktop app configuration
144144
=========================
145145

146-
To run multiple instances of the desktop app for different accounts, you can
147-
launch the executable with the `--profile` argument followed by a unique
148-
identifier, e.g `riot-web --profile Work` for it to run a separate profile and
149-
not interfere with the default one.
150-
151-
Alternatively, a custom location for the profile data can be specified using the
152-
`--profile-dir` flag followed by the desired path.
153-
154-
+ `%APPDATA%\$NAME\config.json` on Windows
155-
+ `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux
156-
+ `~Library/Application Support/$NAME/config.json` on macOS
157-
158-
In the paths above, `$NAME` is typically `Riot`, unless you use `--profile
159-
$PROFILE` in which case it becomes `Riot-$PROFILE`.
146+
See https://github.com/vector-im/riot-desktop#user-specified-configjson

‎electron_app/build/entitlements.mac.plist‎

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

‎electron_app/build/icon.icns‎

-170 KB
Binary file not shown.

‎electron_app/build/icon.ico‎

-35.9 KB
Binary file not shown.

‎electron_app/build/icons/128x128.png‎

-2.72 KB
Binary file not shown.

0 commit comments

Comments
 (0)