OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into travis/sourcemaps

pull/11843/head
Travis Ralston 2020-01-13 11:21:51 -07:00
parent 455b7ae347 6ce5377747
commit f73d2bae1f
12 changed files with 1041 additions and 880 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
CHANGELOG.md
View File

@ -1,3 +1,45 @@
Changes in [1.5.7](https://github.com/vector-im/riot-web/releases/tag/v1.5.7) (2020-01-13)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.7-rc.2...v1.5.7)
* Enable and document presence in room list feature flag
[\#11830](https://github.com/vector-im/riot-web/pull/11830)
Changes in [1.5.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.7-rc.2) (2020-01-08)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.7-rc.1...v1.5.7-rc.2)
* Update to react-sdk rc.2 to fix build
Changes in [1.5.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.7-rc.1) (2020-01-06)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.6...v1.5.7-rc.1)
* Update from Weblate
[\#11784](https://github.com/vector-im/riot-web/pull/11784)
* Add docs for feature_bridge_state flag
[\#11778](https://github.com/vector-im/riot-web/pull/11778)
* Add docs for feature_ftue_dms flag
[\#11758](https://github.com/vector-im/riot-web/pull/11758)
* Fix version file for Docker images
[\#11721](https://github.com/vector-im/riot-web/pull/11721)
* Add accelerators to context menu options like cut&paste in electron
[\#11690](https://github.com/vector-im/riot-web/pull/11690)
* electron-main: Provide a better error message if Seshat isn't installed.
[\#11691](https://github.com/vector-im/riot-web/pull/11691)
* Update from Weblate
[\#11672](https://github.com/vector-im/riot-web/pull/11672)
* Remove babel-plugin-transform-async-to-bluebird
[\#11662](https://github.com/vector-im/riot-web/pull/11662)
* Clarify which versions of what we support
[\#11658](https://github.com/vector-im/riot-web/pull/11658)
* Remove the code that calls the origin migrator
[\#11631](https://github.com/vector-im/riot-web/pull/11631)
* yarn upgrade
[\#11617](https://github.com/vector-im/riot-web/pull/11617)
* Remove draft-js dependency
[\#11616](https://github.com/vector-im/riot-web/pull/11616)
Changes in [1.5.6](https://github.com/vector-im/riot-web/releases/tag/v1.5.6) (2019-12-09)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.6-rc.1...v1.5.6)

5
docs/labs.md
View File

@ -95,3 +95,8 @@ Adds a "Bridge Info" tab to the Room Settings dialog, if a compatible bridge is
present in the room. The Bridge info tab pulls information from the `m.bridge` state event ([MSC2346](https://github.com/matrix-org/matrix-doc/pull/2346)). Since the feature is based upon a MSC, most
bridges are not expected to be compatible, and users should not rely on this
tab as the single source of truth just yet.
## Presence indicator in room list (`feature_presence_in_room_list`)
This adds a presence indicator in the room list next to DM rooms where the other
person is online.

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.5.6",
"version": "1.5.7",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {

6
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "1.5.6",
"version": "1.5.7",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -65,8 +65,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "3.0.0",
"matrix-react-sdk": "1.7.6",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"postcss-easings": "^2.0.0",

1
res/sw.js Normal file
View File

@ -0,0 +1 @@
self.addEventListener('fetch',() => {});

3
riot.im/develop/config.json
View File

@ -23,7 +23,8 @@
"feature_cross_signing": "labs",
"feature_event_indexing": "labs",
"feature_ftue_dms": "labs",
"feature_bridge_state": "labs"
"feature_bridge_state": "labs",
"feature_presence_in_room_list": "labs"
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {

1
scripts/copy-res.js
View File

@ -58,6 +58,7 @@ const INCLUDE_LANGS = [
// "dest/b/...".
const COPY_LIST = [
["res/manifest.json", "webapp"],
["res/sw.js", "webapp"],
["res/welcome.html", "webapp"],
["res/welcome/**", "webapp/welcome"],
["res/themes/**", "webapp/themes"],

2
src/components/views/auth/VectorAuthFooter.js
View File

@ -22,7 +22,7 @@ import { _t } from 'matrix-react-sdk/src/languageHandler';
const VectorAuthFooter = () => {
const brandingConfig = SdkConfig.get().branding;
let links = [
{"text": "blog", "url": "https://medium.com/@RiotChat"},
{"text": "blog", "url": "https://blog.riot.im"},
{"text": "twitter", "url": "https://twitter.com/@RiotChat"},
{"text": "github", "url": "https://github.com/vector-im/riot-web"},
];

2
src/i18n/strings/lt.json
View File

@ -12,7 +12,7 @@
"Sign In": "Prisijungti",
"Create Account": "Sukurti paskyrą",
"Need help?": "Reikia pagalbos?",
"Explore rooms": "Peržiūrėti kambarius",
"Explore rooms": "Žvalgyti kambarius",
"Room Directory": "Kambarių katalogas",
"Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsų Riot konfigūracijoje yra klaidingas JSON. Prašome pataisyti problemą ir iš naujo užkrauti puslapį.",
"The message from the parser is: %(message)s": "Analizatoriaus žinutė yra: %(message)s",

2
src/i18n/strings/tr.json
View File

@ -10,7 +10,7 @@
"Decentralised, encrypted chat & collaboration powered by [matrix]": "Merkezsiz, şifreli sohbet & işbirliği ile Matrix tarafından desteklenmektedir",
"Chat with Riot Bot": "Riot Bot ile sohbet et",
"You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Özel sunucu seçenekleri kullanıp farklı bir anamakine URL'si belirleyerek diğer Matrix sunucularına giriş yapabilirsin. Bu Riot'u varolan bir Matrix hesabı ile farklı anamakine de kullanmanı sağlar.",
"Sign In": "Giriş yap",
"Sign In": "Giriş Yap",
"Create Account": "Kayıt Ol",
"Need help?": "Yardıma mı ihtiyacın var?",
"Explore rooms": "Odaları keşfet",

5
src/vector/index.html
View File

@ -41,6 +41,11 @@
window.vector_indexeddb_worker_script = '<%= htmlWebpackPlugin.files.chunks['indexeddb-worker'].entry %>';
</script>
<script src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
<script>
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('sw.js');
}
</script>
<img src="<%= require('matrix-react-sdk/res/img/warning.svg') %>" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
<img src="<%= require('matrix-react-sdk/res/img/e2e/warning.svg') %>" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
<img src="<%= require('matrix-react-sdk/res/img/feather-customised/warning-triangle.svg') %>" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>

1850
yarn.lock
View File

File diff suppressed because it is too large Load Diff