Compare commits

..

41 Commits

Author SHA1 Message Date
Luke Barnard
2ea7ad6d7b v0.15.0-rc.1 2018-05-09 15:31:25 +01:00
Luke Barnard
3a30feaa52 Prepare changelog for v0.15.0-rc.1 2018-05-09 15:31:25 +01:00
Luke Barnard
98c9dd23d5 v0.15.0-rc.1 2018-05-09 15:27:48 +01:00
Luke Barnard
fb0bbf31c4 v0.14.3-rc.1 2018-05-09 13:52:27 +01:00
Luke Barnard
e87c44c38b Prepare changelog for v0.14.3-rc.1 2018-05-09 13:52:27 +01:00
Luke Barnard
371ea7c078 v0.14.3-rc.1 2018-05-09 13:50:45 +01:00
Luke Barnard
0e00677851 Bump react-sdk dep to 12.4-rc.1 2018-05-09 13:48:06 +01:00
Luke Barnard
7f50fb3023 Merge branch 'master' into develop 2018-05-09 13:32:06 +01:00
Luke Barnard
9dc61307fa Merge pull request #6688 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-05-09 11:59:47 +01:00
Simone Salsi
83d9ca080a Translated using Weblate (Italian)
Currently translated at 97.2% (36 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2018-05-09 10:51:52 +00:00
Walter
a8a5d9e053 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2018-05-04 17:55:51 +00:00
daniel tygel
5bab9a7e34 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
2018-05-04 17:18:52 +00:00
Kenneth Larsson
81c2bf6814 Translated using Weblate (Swedish)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
2018-05-03 20:29:24 +00:00
Weblate
e69f7602ea Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 15:18:30 +00:00
Goudarz Jafari
d2e4d3bc1c Translated using Weblate (Persian)
Currently translated at 97.2% (36 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fa/
2018-04-30 15:18:30 +00:00
David Baker
0e2ee5f127 Merge pull request #6638 from vector-im/dbkr/disable_presence_for_matrix_org
Don't show presence on matrix.org
2018-04-30 16:18:26 +01:00
David Baker
dd7ae83226 No trailing / 2018-04-30 16:12:53 +01:00
David Baker
48a16464d5 Don't show presence on matrix.org 2018-04-30 16:00:17 +01:00
David Baker
76d4a4f3fe v0.14.2 2018-04-30 13:44:23 +01:00
David Baker
8afdbab9d5 Prepare changelog for v0.14.2 2018-04-30 13:44:23 +01:00
David Baker
9235c0dcfa v0.14.2 2018-04-30 13:43:04 +01:00
David Baker
ff8f617fc6 Released react-sdk & js-sdk 2018-04-30 13:42:38 +01:00
Peter Vágner
181efcfbae Translated using Weblate (Slovak)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
2018-04-28 21:43:22 +00:00
Weblate
d291a7cccd Merge remote-tracking branch 'origin/develop' into develop 2018-04-27 14:42:42 +00:00
David Baker
5c722f31ff Merge pull request #6625 from vector-im/luke/fix-compatibility-page
Enforce loading babel-polyfill first
2018-04-27 15:42:37 +01:00
Luke Barnard
c56b54eddd Load babel-polyfill in the bundle entry, before index.js 2018-04-27 15:12:16 +01:00
Weblate
4d02d28aef Merge remote-tracking branch 'origin/develop' into develop 2018-04-27 12:39:38 +00:00
Luke Barnard
cb061d80fa Merge pull request #6624 from vector-im/dbkr/update_hoek
Update hoek
2018-04-27 13:39:33 +01:00
Luke Barnard
9b055171ab Enforce loading babel-polyfill first
This is to avoid loading anything before loading the polyfill, otherwise
we risk loading dependencies (such as React) before it.

This was causing the compatibility page to fail somehow.

See https://github.com/facebook/react/issues/8379

Fixes https://github.com/vector-im/riot-web/issues/6562
2018-04-27 13:32:09 +01:00
David Baker
3df214c56e Update hoek 2018-04-27 12:57:37 +01:00
Марко М. Костић
53f44c5459 Translated using Weblate (Serbian)
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
2018-04-26 17:01:56 +00:00
David Baker
137665685d v0.14.2-rc.3 2018-04-26 15:38:18 +01:00
David Baker
3d1c2fa5f1 Prepare changelog for v0.14.2-rc.3 2018-04-26 15:38:17 +01:00
David Baker
6dad8e695e v0.14.2-rc.3 2018-04-26 15:35:51 +01:00
David Baker
1eb82d97ae Fix dependencies to the same versions as react-sdk
Otherwise Things Get Weird, eg. headers in the left panel end up in
the wrong place because the gemini scrollbar CSS has changed
between versions.
2018-04-26 15:25:20 +01:00
Weblate
a17a9521b4 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 12:06:41 +00:00
Luke Barnard
2dc1c5c618 Merge pull request #6614 from vector-im/dbkr/fix_release_wrapper
Fix args in the release wrapper script
2018-04-26 13:06:34 +01:00
David Baker
d5a07a446d typo 2018-04-26 12:55:12 +01:00
David Baker
7232c01a80 Fix args in the release wrapper script
It was assuming the version was always $1 which meant there was no
way to pass options (eg. -x to skip changelog generation) through
to the underlying release script without breaking the wrapper
script.
2018-04-26 12:07:02 +01:00
Weblate
e5eb617447 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 14:17:38 +00:00
Weblate
cb51ad929e Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 14:00:54 +00:00
15 changed files with 74 additions and 32 deletions

View File

@@ -1,3 +1,37 @@
Changes in [0.15.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.1) (2018-05-09)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.3-rc.1...v0.15.0-rc.1)
* No changes since 0.14.3-rc.1
Changes in [0.14.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.3-rc.1) (2018-05-09)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2...v0.14.3-rc.1)
* Update from Weblate.
[\#6688](https://github.com/vector-im/riot-web/pull/6688)
* Don't show presence on matrix.org
[\#6638](https://github.com/vector-im/riot-web/pull/6638)
* Enforce loading babel-polyfill first
[\#6625](https://github.com/vector-im/riot-web/pull/6625)
* Update hoek
[\#6624](https://github.com/vector-im/riot-web/pull/6624)
* Fix args in the release wrapper script
[\#6614](https://github.com/vector-im/riot-web/pull/6614)
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)

View File

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

View File

@@ -19,5 +19,8 @@
"piwik": {
"url": "https://piwik.riot.im/",
"siteId": 1
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
}
}

6
package-lock.json generated
View File

@@ -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",

View File

@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.14.2-rc.2",
"version": "0.15.0-rc.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -58,14 +58,14 @@
"babel-runtime": "^6.11.6",
"bluebird": "^3.5.0",
"browser-request": "^0.3.3",
"draft-js": "^0.10.5",
"draft-js": "^0.11.0-alpha",
"extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10",
"gemini-scrollbar": "^1.5.3",
"gfm.css": "^1.1.2",
"highlight.js": "^9.12.0",
"matrix-js-sdk": "0.10.2-rc.1",
"matrix-react-sdk": "0.12.3-rc.3",
"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",

View File

@@ -7,6 +7,15 @@
set -e
orig_args=$@
# chomp any args starting with '-' as these need to go
# through to the release script and otherwise we'll get
# confused about what the version arg is.
while [[ "$1" == -* ]]; do
shift
done
cd `dirname $0`
for i in matrix-js-sdk matrix-react-sdk
@@ -38,4 +47,4 @@ git commit package.json -m "$tag"
cd ..
exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
exec ./node_modules/matrix-js-sdk/release.sh -z "$orig_args"

View File

@@ -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"
}

View File

@@ -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",

View File

@@ -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"
}

View File

@@ -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"
}

View File

@@ -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 преводиоце"
}

View File

@@ -34,5 +34,6 @@
"Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; 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"
}

View File

@@ -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"
}

View File

@@ -17,18 +17,6 @@ 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

View File

@@ -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