forked from matrix/element-web
Merge branch 'develop' into webpack4
This commit is contained in:
David Baker
GitHub
commit
8f4953c182
61
CHANGELOG.md
61
CHANGELOG.md
|
|
@ -1,3 +1,64 @@
|
|||
Changes in [0.14.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2) (2018-04-30)
|
||||
============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.3...v0.14.2)
|
||||
|
||||
* No changes since rc.3
|
||||
|
||||
Changes in [0.14.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.3) (2018-04-26)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.2...v0.14.2-rc.3)
|
||||
|
||||
* Fix CSS dependency versions to be the same as those in react-sdk to fix
|
||||
left panel header positions.
|
||||
|
||||
Changes in [0.14.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.2) (2018-04-26)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.1...v0.14.2-rc.2)
|
||||
|
||||
* Fix Download of attachments in e2e encrypted rooms in Firefox
|
||||
|
||||
Changes in [0.14.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.1) (2018-04-25)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.1...v0.14.2-rc.1)
|
||||
|
||||
* Update from Weblate.
|
||||
[\#6602](https://github.com/vector-im/riot-web/pull/6602)
|
||||
* Add readme bit on cross-origin renderer
|
||||
[\#6600](https://github.com/vector-im/riot-web/pull/6600)
|
||||
* Update from Weblate.
|
||||
[\#6573](https://github.com/vector-im/riot-web/pull/6573)
|
||||
* Copy media from react-sdk
|
||||
[\#6588](https://github.com/vector-im/riot-web/pull/6588)
|
||||
* Fix favicon
|
||||
[\#6580](https://github.com/vector-im/riot-web/pull/6580)
|
||||
* Update from Weblate.
|
||||
[\#6569](https://github.com/vector-im/riot-web/pull/6569)
|
||||
* move everything not explicitly riot (or status) branded into matrix-react-
|
||||
sdk
|
||||
[\#6500](https://github.com/vector-im/riot-web/pull/6500)
|
||||
* Remove presence management
|
||||
[\#5881](https://github.com/vector-im/riot-web/pull/5881)
|
||||
* change vector-web repo to riot-web in changelog
|
||||
[\#6480](https://github.com/vector-im/riot-web/pull/6480)
|
||||
* Update from Weblate.
|
||||
[\#6473](https://github.com/vector-im/riot-web/pull/6473)
|
||||
* Bump source-map-loader version to avoid bug /w inline base64 maps
|
||||
[\#6472](https://github.com/vector-im/riot-web/pull/6472)
|
||||
* Add CSS for new group admin radio button
|
||||
[\#6415](https://github.com/vector-im/riot-web/pull/6415)
|
||||
* Rxl881/sticker picker styling
|
||||
[\#6447](https://github.com/vector-im/riot-web/pull/6447)
|
||||
* Stickerpacks
|
||||
[\#6242](https://github.com/vector-im/riot-web/pull/6242)
|
||||
* Force gemini on HomePage
|
||||
[\#6368](https://github.com/vector-im/riot-web/pull/6368)
|
||||
* Rename the Riot-Web Translations Room
|
||||
[\#6348](https://github.com/vector-im/riot-web/pull/6348)
|
||||
* Add disable-presence-by-hs option to sample config
|
||||
[\#6350](https://github.com/vector-im/riot-web/pull/6350)
|
||||
* Reword the BugReportDialog.js as per @lampholder
|
||||
[\#6354](https://github.com/vector-im/riot-web/pull/6354)
|
||||
|
||||
Changes in [0.14.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.1) (2018-04-12)
|
||||
============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0...v0.14.1)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "0.14.1",
|
||||
"version": "0.14.2",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Vector Creations Ltd.",
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -19,5 +19,8 @@
|
|||
"piwik": {
|
||||
"url": "https://piwik.riot.im/",
|
||||
"siteId": 1
|
||||
},
|
||||
"enable_presence_by_hs_url": {
|
||||
"https://matrix.org": false
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4955,9 +4955,9 @@
|
|||
"integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
|
||||
},
|
||||
"hoek": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
|
||||
"integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
|
||||
"integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
|
||||
},
|
||||
"hoist-non-react-statics": {
|
||||
"version": "2.3.1",
|
||||
|
|
|
|||
10
package.json
10
package.json
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "electron_app/src/electron-main.js",
|
||||
"version": "0.14.1",
|
||||
"version": "0.14.2",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
|
@ -59,9 +59,13 @@
|
|||
"bluebird": "^3.5.0",
|
||||
"browser-request": "^0.3.3",
|
||||
"extract-text-webpack-plugin": "^4.0.0-beta.0",
|
||||
"draft-js": "^0.11.0-alpha",
|
||||
"favico.js": "^0.3.10",
|
||||
"matrix-js-sdk": "0.10.1",
|
||||
"matrix-react-sdk": "0.12.2",
|
||||
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
|
||||
"gfm.css": "^1.1.1",
|
||||
"highlight.js": "^9.0.0",
|
||||
"matrix-js-sdk": "0.10.2",
|
||||
"matrix-react-sdk": "0.12.4-rc.1",
|
||||
"modernizr": "^3.1.0",
|
||||
"prop-types": "^15.5.10",
|
||||
"react": "^15.6.0",
|
||||
|
|
|
|||
|
|
@ -33,5 +33,6 @@
|
|||
"Implementing VoIP services with Matrix": "پیادهسازی سرویسهای VoIP با ماتریکس",
|
||||
"Discussion of the Identity Service API": "بحث درمورد API سرویس هویت",
|
||||
"Building services on Matrix": "ساخت سرویس بر روی ماتریکس",
|
||||
"Support for those using the Matrix spec": "پشتیبانی برای آنان که از مستندات ماتریکس استفاده میکنند"
|
||||
"Support for those using the Matrix spec": "پشتیبانی برای آنان که از مستندات ماتریکس استفاده میکنند",
|
||||
"Co-ordination for Riot translators": "هماهنگی برای مترجمان Riot"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"Riot Desktop on %(platformName)s": "Riot Desktop su %(platformName)s",
|
||||
"Riot is not supported on mobile web. Install the app?": "Riot non è supportato sul web mobile. Vuoi installare l'applicazione?",
|
||||
"Unknown device": "Dispositivo sconosciuto",
|
||||
"You need to be using HTTPS to place a screen-sharing call.": "Devi usare HTTPS per utilizzare una chiamata con condivisione schermo.",
|
||||
"You need to be using HTTPS to place a screen-sharing call.": "Devi usare HTTPS per instaurare una chiamata con condivisione schermo.",
|
||||
"Welcome to Riot.im": "Benvenuto/a su Riot.im",
|
||||
"Search the room directory": "Cerca nella lista delle stanze",
|
||||
"Chat with Riot Bot": "Chatta con Riot Bot",
|
||||
|
|
|
|||
|
|
@ -34,5 +34,6 @@
|
|||
"Dev chat for the Dendrite dev team": "Chat de desenvolvimento para o time devel do Dendrite",
|
||||
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muitas salas já existem no Matrix, algumas independentes, e outras relacionadas a redes existentes (tais como Slack, IRC, Gitter, entre outras). Dê uma olhada na lista de salas públicas!",
|
||||
"Decentralised, encrypted chat & collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]",
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Você pode usar as opções customizadas de servidor para conectar-se a outros servidores Matrix ao especificar uma outra URL de Servidor de Base (homeserver).<br/> Isso permite que você use o Riot com uma conta Matrix existente em outro servidor de base.<br/><br/>Você também pode definir um servidor de identidade customizado, mas neste caso você não poderá convidar outras pesoas por endereço de email, ou ser convidada/o pelo seu endereço de email."
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Você pode usar as opções customizadas de servidor para conectar-se a outros servidores Matrix ao especificar uma outra URL de Servidor de Base (homeserver).<br/> Isso permite que você use o Riot com uma conta Matrix existente em outro servidor de base.<br/><br/>Você também pode definir um servidor de identidade customizado, mas neste caso você não poderá convidar outras pesoas por endereço de email, ou ser convidada/o pelo seu endereço de email.",
|
||||
"Co-ordination for Riot translators": "Coordenação para tradutores Riot"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,5 +34,6 @@
|
|||
"Support for those using, running and writing other bridges": "Podpora pre používateľov, prevádzkovateľov a tvorcov premostení do ďalších sietí",
|
||||
"Contributing code to Matrix and Riot": "Prispievanie kódu projektom Matrix a Riot",
|
||||
"Dev chat for the Riot/Web dev team": "Diskusia pre tím vývojárov Riot/Web",
|
||||
"Dev chat for the Dendrite dev team": "Diskusia pre tím vývojárov Dendrite"
|
||||
"Dev chat for the Dendrite dev team": "Diskusia pre tím vývojárov Dendrite",
|
||||
"Co-ordination for Riot translators": "Koordinácia prekladov Riot"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,5 +34,6 @@
|
|||
"Support for those using, running and writing other bridges": "Подршка за оне који користе, одржавају и пишу друге мостове",
|
||||
"Contributing code to Matrix and Riot": "Додавање кода у Матрикс и Riot",
|
||||
"Dev chat for the Riot/Web dev team": "Програмерско ћаскање за Riot/веб програмерски тим",
|
||||
"Dev chat for the Dendrite dev team": "Програмерско ћаскање за Dendrite програмерски тим"
|
||||
"Dev chat for the Dendrite dev team": "Програмерско ћаскање за Dendrite програмерски тим",
|
||||
"Co-ordination for Riot translators": "Координација за Riot преводиоце"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,5 +34,6 @@
|
|||
"Riot/Android & matrix-android-sdk chat": "Riot/Android & matrix-android-sdk-chatt",
|
||||
"Admin support for Dendrite": "Hjälp för administratörer av Dendrite",
|
||||
"Building services on Matrix": "Bygga tjänster med Matrix",
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan använda anpassade serverinställningar för att logga in på andra Matrix-servrar genom att ange en annan hemserver-URL.<BR/>Du kan då använda Riot med ett befintligt Matrix-konto på en annan hemserver.<br/><br/>Du kan också ange en anpassad identitetsserver men kommer då inte kunna bjuda in användare med epostadress, eller själv bli inbjuden med epostadress."
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan använda anpassade serverinställningar för att logga in på andra Matrix-servrar genom att ange en annan hemserver-URL.<BR/>Du kan då använda Riot med ett befintligt Matrix-konto på en annan hemserver.<br/><br/>Du kan också ange en anpassad identitetsserver men kommer då inte kunna bjuda in användare med epostadress, eller själv bli inbjuden med epostadress.",
|
||||
"Co-ordination for Riot translators": "Koordination för Riot-översättare"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,5 +34,6 @@
|
|||
"Dev chat for the Dendrite dev team": "Чат команди розробників Dendrite",
|
||||
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "У мережі Matrix вже існує багато кімнат, що з'єднані як з існуючими мережами (Slack, IRC, Gitter тощо), так і незалежними. Подивіться у каталозі кімнат!",
|
||||
"Running Matrix services": "Запуск служби Matrix",
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Ви можете використовувати параметри користувача сервера для входа на другі сервера Matrix, вказав другий URL-адресу домашнього сервера. <br/>Це дозволяє використовувати Riot з обліковим записом Matrix який існує на другому домашньому сервері.<br/><br/>Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному використовуючи адресу електронної пошти."
|
||||
"You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Ви можете використовувати параметри користувача сервера для входа на другі сервера Matrix, вказав другий URL-адресу домашнього сервера. <br/>Це дозволяє використовувати Riot з обліковим записом Matrix який існує на другому домашньому сервері.<br/><br/>Окрім цього, можливо встановити ідентифікаційний сервер користувача, але ви не зможете запросити других користувачів та бути запрошенному використовуючи адресу електронної пошти.",
|
||||
"Co-ordination for Riot translators": "Координаційний чат для перекладачів Riot"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,25 +17,13 @@ limitations under the License.
|
|||
|
||||
'use strict';
|
||||
|
||||
// for ES6 stuff like startsWith() that Safari doesn't handle
|
||||
// and babel doesn't do by default
|
||||
// Note we use this, as well as the babel transform-runtime plugin
|
||||
// since transform-runtime does not cover instance methods
|
||||
// such as "foobar".includes("foo") which bits of our library
|
||||
// code use, but the babel transform-runtime plugin allows the
|
||||
// regenerator runtime to be injected early enough in the process
|
||||
// (it can't be here as it's too late: the alternative is to put
|
||||
// the babel-polyfill as the first 'entry' in the webpack config).
|
||||
// https://babeljs.io/docs/plugins/transform-runtime/
|
||||
require('babel-polyfill');
|
||||
|
||||
// Require common CSS here; this will make webpack process it into bundle.css.
|
||||
// Our own CSS (which is themed) is imported via separate webpack entry points
|
||||
// in webpack.config.js
|
||||
require('matrix-react-sdk/node_modules/gemini-scrollbar/gemini-scrollbar.css');
|
||||
require('matrix-react-sdk/node_modules/gfm.css/gfm.css');
|
||||
require('matrix-react-sdk/node_modules/highlight.js/styles/github.css');
|
||||
require('matrix-react-sdk/node_modules/draft-js/dist/Draft.css');
|
||||
require('gemini-scrollbar/gemini-scrollbar.css');
|
||||
require('gfm.css/gfm.css');
|
||||
require('highlight.js/styles/github.css');
|
||||
require('draft-js/dist/Draft.css');
|
||||
|
||||
const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
|
||||
rageshake.init().then(() => {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,9 @@ if (!og_image_url) og_image_url = 'https://riot.im/app/themes/riot/img/logos/rio
|
|||
|
||||
module.exports = {
|
||||
entry: {
|
||||
"bundle": "./src/vector/index.js",
|
||||
// Load babel-polyfill first to avoid issues where some imports (namely react)
|
||||
// are potentially loaded before babel-polyfill.
|
||||
"bundle": ["babel-polyfill", "./src/vector/index.js"],
|
||||
"indexeddb-worker": "./src/vector/indexeddb-worker.js",
|
||||
|
||||
// We ship olm.js as a separate lump of javascript. This makes it get
|
||||
|
|
|
|||
Loading…
Reference in New Issue