Compare commits

...

37 Commits

Author SHA1 Message Date
David Baker 764797e211 v0.16.0 2018-07-30 12:19:27 +01:00
David Baker 31c4cf968b Prepare changelog for v0.16.0 2018-07-30 12:19:27 +01:00
David Baker 6e0aeeea83 v0.16.0 2018-07-30 12:14:55 +01:00
David Baker 88745a9f36 Released js-sdk & react-sdk 2018-07-30 12:13:29 +01:00
David Baker 8bd832b449 v0.16.0-rc.2 2018-07-24 19:42:11 +01:00
David Baker 5d2bf37ac9 Prepare changelog for v0.16.0-rc.2 2018-07-24 19:42:10 +01:00
David Baker f248da3e08 v0.16.0-rc.2 2018-07-24 19:40:52 +01:00
David Baker 8e5b67d7c9 react-sdk rc.2 2018-07-24 19:40:31 +01:00
David Baker f5a257ca79 v0.16.0-rc.1 2018-07-24 18:35:02 +01:00
David Baker ed90c491e2 Prepare changelog for v0.16.0-rc.1 2018-07-24 18:35:01 +01:00
David Baker ea00df0466 v0.16.0-rc.1 2018-07-24 18:33:53 +01:00
David Baker 96b624e941 js-sdk & react-sdk rc.1 2018-07-24 18:33:04 +01:00
David Baker 25c0656106 Update to electron 2.0.5 2018-07-24 18:28:48 +01:00
David Baker b361241c29 Merge pull request #7082 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-07-24 18:16:45 +01:00
Weblate d8c126f320 Merge remote-tracking branch 'origin/develop' into develop 2018-07-20 14:01:39 +00:00
Kyf Lee 6cd979d8d3 Translated using Weblate (Korean)
Currently translated at 94.5% (35 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
2018-07-20 14:01:38 +00:00
Hugues De Keyzer c6c2a77c3a Translated using Weblate (French)
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/fr/
2018-07-20 14:01:38 +00:00
David Baker 0458aec320 Merge pull request #7055 from vector-im/dbkr/use_configured_integ_url
Sample config for jitsi integration URL
2018-07-20 15:01:34 +01:00
David Baker b2ae1926a6 Sample cionfig for jitsi integration URL 2018-07-18 12:06:07 +01:00
David Baker 1ee4a7ec63 Merge branch 'master' into develop 2018-07-09 13:23:58 +01:00
David Baker 7e03b25030 v0.15.7 2018-07-09 13:20:29 +01:00
David Baker c68623ddb0 Prepare changelog for v0.15.7 2018-07-09 13:20:28 +01:00
David Baker 847df2f75b v0.15.7 2018-07-09 13:19:14 +01:00
David Baker 73be5005c2 Released react-sdk & js-sdk 2018-07-09 13:16:42 +01:00
David Baker c36b42af71 v0.15.7-rc.2 2018-07-06 16:01:42 +01:00
David Baker db3ffd29da Prepare changelog for v0.15.7-rc.2 2018-07-06 16:01:42 +01:00
David Baker d7ebd88804 v0.15.7-rc.2 2018-07-06 15:59:20 +01:00
David Baker 75e9489db5 js-sdk rc.1 & react-sdk rc.2 2018-07-06 15:58:39 +01:00
David Baker a94f5dd692 Update package-lock.json 2018-07-04 11:34:55 +01:00
David Baker 0de36d331f v0.15.7-rc.1 2018-07-04 11:28:19 +01:00
David Baker de713c564f Prepare changelog for v0.15.7-rc.1 2018-07-04 11:28:19 +01:00
David Baker 7e3cb3ba31 v0.15.7-rc.1 2018-07-04 11:27:21 +01:00
David Baker 6ada5e5b26 react-sdk rc.1 2018-07-04 11:26:33 +01:00
David Baker aee6b28469 Bump electron version 2018-07-04 11:18:30 +01:00
David Baker c08f31aa76 Merge branch 'master' into develop 2018-06-29 12:05:20 +01:00
Luke Barnard 5b3a462247 Merge pull request #6889 from vector-im/t3chguy/status_theme
add override for colour of room tile text within memberinfo (unreadable)
2018-06-21 11:27:49 +01:00
Michael Telatynski 7d47aebfc5 add override for colour of room tile text within memberinfo (unreadable)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 17:46:56 +01:00
8 changed files with 320 additions and 164 deletions
+40
View File
@@ -1,3 +1,43 @@
Changes in [0.16.0](https://github.com/vector-im/riot-web/releases/tag/v0.16.0) (2018-07-30)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.2...v0.16.0)
* Update react-sdk version for bugfixes with Jitsi widgets and the new composer
Changes in [0.16.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.2) (2018-07-24)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.1...v0.16.0-rc.2)
* Update to react-sdk rc.2 to remove Jitsi conference calling from labs
Changes in [0.16.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.1) (2018-07-24)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7...v0.16.0-rc.1)
* Update from Weblate.
[\#7082](https://github.com/vector-im/riot-web/pull/7082)
* Sample config for jitsi integration URL
[\#7055](https://github.com/vector-im/riot-web/pull/7055)
Changes in [0.15.7](https://github.com/vector-im/riot-web/releases/tag/v0.15.7) (2018-07-09)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.2...v0.15.7)
* No changes since rc.2
Changes in [0.15.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.2) (2018-07-06)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.1...v0.15.7-rc.2)
* Update react-sdk and js-sdk
Changes in [0.15.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.1) (2018-07-04)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6...v0.15.7-rc.1)
* add override for colour of room tile text within memberinfo (unreadable)
[\#6889](https://github.com/vector-im/riot-web/pull/6889)
Changes in [0.15.6](https://github.com/vector-im/riot-web/releases/tag/v0.15.6) (2018-06-29)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.2...v0.15.6)
+1
View File
@@ -8,6 +8,7 @@
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
"feature_groups": "labs",
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "0.15.6",
"version": "0.16.0",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
+244 -133
View File
@@ -1,6 +1,6 @@
{
"name": "riot-web",
"version": "0.15.4",
"version": "0.15.6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -260,6 +260,16 @@
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
"dev": true
},
"array-includes": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
"integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
"dev": true,
"requires": {
"define-properties": "1.1.2",
"es-abstract": "1.9.0"
}
},
"array-map": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
@@ -299,16 +309,6 @@
"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
"dev": true
},
"array.prototype.find": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz",
"integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=",
"dev": true,
"requires": {
"define-properties": "1.1.2",
"es-abstract": "1.9.0"
}
},
"arraybuffer.slice": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
@@ -1877,17 +1877,6 @@
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
"dev": true
},
"commonmark": {
"version": "0.27.0",
"resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.27.0.tgz",
"integrity": "sha1-2GwmK5YoIelIPGnFR7xYhAwEezQ=",
"requires": {
"entities": "1.1.1",
"mdurl": "1.0.1",
"minimist": "1.2.0",
"string.prototype.repeat": "0.2.0"
}
},
"compare-version": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
@@ -2414,22 +2403,6 @@
"integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
"dev": true
},
"disposables": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/disposables/-/disposables-1.0.1.tgz",
"integrity": "sha1-BkcnoltU9QK9griaot+4358bOeM="
},
"dnd-core": {
"version": "2.5.4",
"resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.5.4.tgz",
"integrity": "sha512-BcI782MfTm3wCxeIS5c7tAutyTwEIANtuu3W6/xkoJRwiqhRXKX3BbGlycUxxyzMsKdvvoavxgrC3EMPFNYL9A==",
"requires": {
"asap": "2.0.6",
"invariant": "2.2.2",
"lodash": "4.17.4",
"redux": "3.7.2"
}
},
"doctrine": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.2.3.tgz",
@@ -3202,16 +3175,54 @@
}
},
"eslint-plugin-react": {
"version": "6.10.3",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz",
"integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=",
"version": "7.10.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.10.0.tgz",
"integrity": "sha512-18rzWn4AtbSUxFKKM7aCVcj5LXOhOKdwBino3KKWy4psxfPW0YtIbE8WNRDUdyHFL50BeLb6qFd4vpvNYyp7hw==",
"dev": true,
"requires": {
"array.prototype.find": "2.0.4",
"doctrine": "1.2.3",
"has": "1.0.1",
"jsx-ast-utils": "1.4.1",
"object.assign": "4.0.4"
"doctrine": "2.1.0",
"has": "1.0.3",
"jsx-ast-utils": "2.0.1",
"prop-types": "15.6.2"
},
"dependencies": {
"doctrine": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"dev": true,
"requires": {
"esutils": "2.0.2"
}
},
"has": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
"dev": true,
"requires": {
"function-bind": "1.1.1"
}
},
"jsx-ast-utils": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz",
"integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
"dev": true,
"requires": {
"array-includes": "3.0.3"
}
},
"prop-types": {
"version": "15.6.2",
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
"integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
"dev": true,
"requires": {
"loose-envify": "1.3.1",
"object-assign": "4.1.1"
}
}
}
},
"espree": {
@@ -3699,6 +3710,22 @@
}
}
},
"focus-trap": {
"version": "2.4.6",
"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-2.4.6.tgz",
"integrity": "sha512-vWZTPtBU6pBoyWZDRZJHkXsyP2ZCZBHE3DRVXnSVdQKH/mcDtu9S5Kz8CUDyIqpfZfLEyI9rjKJLnc4Y40BRBg==",
"requires": {
"tabbable": "1.1.3"
}
},
"focus-trap-react": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/focus-trap-react/-/focus-trap-react-3.1.2.tgz",
"integrity": "sha512-MoQmONoy9gRPyrC5DGezkcOMGgx7MtIOAQDHe098UtL2sA2vmucJwEmQisb+8LRXNYFHxuw5zJ1oLFeKu4Mteg==",
"requires": {
"focus-trap": "2.4.6"
}
},
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -4657,8 +4684,7 @@
"tweetnacl": {
"version": "0.14.5",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"uid-number": {
"version": "0.0.6",
@@ -4959,11 +4985,6 @@
"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",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
"integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
},
"home-or-tmp": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -5696,12 +5717,6 @@
"verror": "1.10.0"
}
},
"jsx-ast-utils": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
"integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
"dev": true
},
"karma": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
@@ -5740,7 +5755,7 @@
"glob": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
"dev": true,
"requires": {
"fs.realpath": "1.0.0",
@@ -6049,6 +6064,11 @@
}
}
},
"lolex": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
"integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
},
"longest": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -6108,11 +6128,12 @@
"dev": true
},
"matrix-js-sdk": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.8.2.tgz",
"integrity": "sha1-e7mrVoXrNCFLOFlMiDn++pY2ViE=",
"version": "0.10.5",
"resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.10.5.tgz",
"integrity": "sha512-3Gt3tVKgkn4ufU9qLyrBxQqILZsSK3J58pmL+1IpDYEgA/lLeBPCtl2s5DL/CngjaWg6knph+1ZJO/fznTyTgQ==",
"requires": {
"another-json": "0.2.0",
"babel-runtime": "6.26.0",
"bluebird": "3.5.1",
"browser-request": "0.3.3",
"content-type": "1.0.4",
@@ -6130,9 +6151,9 @@
}
},
"matrix-react-sdk": {
"version": "0.10.2",
"resolved": "https://registry.npmjs.org/matrix-react-sdk/-/matrix-react-sdk-0.10.2.tgz",
"integrity": "sha1-TNSwkN1P4Jsl4Yh5Z/XOE17U8q4=",
"version": "0.12.8",
"resolved": "https://registry.npmjs.org/matrix-react-sdk/-/matrix-react-sdk-0.12.8.tgz",
"integrity": "sha512-K7Jpj8me8eywtv1LznGlsjiQGuVWIBXA/afshkRiEuSH13lk+XW8+9eQD+GcyZ0/6ziIkMMrmmgDH5gV0xKorA==",
"requires": {
"babel-runtime": "6.26.0",
"bluebird": "3.5.1",
@@ -6140,7 +6161,7 @@
"browser-encrypt-attachment": "0.3.0",
"browser-request": "0.3.3",
"classnames": "2.2.5",
"commonmark": "0.27.0",
"commonmark": "0.28.1",
"counterpart": "0.18.3",
"draft-js": "0.11.0-alpha",
"draft-js-export-html": "0.6.0",
@@ -6149,17 +6170,25 @@
"file-saver": "1.3.3",
"filesize": "3.5.6",
"flux": "2.1.1",
"focus-trap-react": "3.1.2",
"fuse.js": "2.7.4",
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b",
"gfm.css": "1.1.1",
"glob": "5.0.15",
"highlight.js": "8.9.1",
"highlight.js": "9.12.0",
"isomorphic-fetch": "2.2.1",
"linkifyjs": "2.1.5",
"lodash": "4.17.4",
"matrix-js-sdk": "0.8.2",
"lolex": "2.3.2",
"matrix-js-sdk": "0.10.5",
"optimist": "0.6.1",
"pako": "1.0.6",
"prop-types": "15.6.0",
"qrcode-react": "0.1.16",
"querystring": "0.2.0",
"react": "15.6.2",
"react-addons-css-transition-group": "15.3.2",
"react-beautiful-dnd": "4.0.1",
"react-dom": "15.6.2",
"react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
"sanitize-html": "1.14.1",
@@ -6169,10 +6198,28 @@
"whatwg-fetch": "1.1.1"
},
"dependencies": {
"highlight.js": {
"version": "8.9.1",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz",
"integrity": "sha1-uKnFSTISqTkvAiK2SclhFJfr+4g="
"commonmark": {
"version": "0.28.1",
"resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.28.1.tgz",
"integrity": "sha1-Buq41SM4uDn6Gi11rwCF7tGxvq4=",
"requires": {
"entities": "1.1.1",
"mdurl": "1.0.1",
"minimist": "1.2.0",
"string.prototype.repeat": "0.2.0"
}
},
"react-gemini-scrollbar": {
"version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
"requires": {
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
}
},
"velocity-vector": {
"version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
"requires": {
"jquery": "3.2.1"
}
},
"whatwg-fetch": {
"version": "1.1.1",
@@ -6202,6 +6249,11 @@
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
"dev": true
},
"memoize-one": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-3.1.1.tgz",
"integrity": "sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA=="
},
"memory-fs": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -6611,25 +6663,6 @@
"integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
"dev": true
},
"object.assign": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz",
"integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=",
"dev": true,
"requires": {
"define-properties": "1.1.2",
"function-bind": "1.1.1",
"object-keys": "1.0.11"
},
"dependencies": {
"object-keys": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
"dev": true
}
}
},
"object.entries": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
@@ -7322,6 +7355,19 @@
"integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=",
"dev": true
},
"qr.js": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz",
"integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
},
"qrcode-react": {
"version": "0.1.16",
"resolved": "https://registry.npmjs.org/qrcode-react/-/qrcode-react-0.1.16.tgz",
"integrity": "sha512-FK+QCfFqCQMSxUE1byzglERJQkwKqXYvYMCS+/Ad2zACJOfoHkHHtRqsQQPji7lfb1y1qCXLvL+3eP1hAfg8Ng==",
"requires": {
"qr.js": "0.0.0"
}
},
"qs": {
"version": "6.5.1",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
@@ -7344,6 +7390,19 @@
"integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
"dev": true
},
"raf": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz",
"integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==",
"requires": {
"performance-now": "2.1.0"
}
},
"raf-schd": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-2.1.2.tgz",
"integrity": "sha512-Orl0IEvMtUCgPddgSxtxreK77UiQz4nPYJy9RggVzu4mKsZkQWiAaG1y9HlYWdvm9xtN348xRaT37qkvL/+A+g=="
},
"randomatic": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
@@ -7448,25 +7507,21 @@
"integrity": "sha1-wStu/cIkfBDae4dw0YUICnsEcVY=",
"dev": true
},
"react-dnd": {
"version": "2.5.4",
"resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.5.4.tgz",
"integrity": "sha512-y9YmnusURc+3KPgvhYKvZ9oCucj51MSZWODyaeV0KFU0cquzA7dCD1g/OIYUKtNoZ+MXtacDngkdud2TklMSjw==",
"react-beautiful-dnd": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz",
"integrity": "sha512-d73RMu4QOFCyjUELLWFyY/EuclnfqulI9pECx+2gIuJvV0ycf1uR88o+1x0RSB9ILD70inHMzCBKNkWVbbt+vA==",
"requires": {
"disposables": "1.0.1",
"dnd-core": "2.5.4",
"hoist-non-react-statics": "2.3.1",
"babel-runtime": "6.26.0",
"invariant": "2.2.2",
"lodash": "4.17.4",
"prop-types": "15.6.0"
}
},
"react-dnd-html5-backend": {
"version": "2.5.4",
"resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.4.tgz",
"integrity": "sha512-jDqAkm/hI8Tl4HcsbhkBgB6HgpJR1e+ML1SbfxaegXYiuMxEVQm0FOwEH5WxUoo6fmIG4N+H0rSm59POuZOCaA==",
"requires": {
"lodash": "4.17.4"
"memoize-one": "3.1.1",
"prop-types": "15.6.0",
"raf-schd": "2.1.2",
"react-motion": "0.5.2",
"react-redux": "5.0.7",
"redux": "3.7.2",
"redux-thunk": "2.3.0",
"reselect": "3.0.1"
}
},
"react-dom": {
@@ -7480,10 +7535,51 @@
"prop-types": "15.6.0"
}
},
"react-gemini-scrollbar": {
"version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
"react-motion": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
"integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==",
"requires": {
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
"performance-now": "0.2.0",
"prop-types": "15.6.0",
"raf": "3.4.0"
},
"dependencies": {
"performance-now": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
}
}
},
"react-redux": {
"version": "5.0.7",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
"integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
"requires": {
"hoist-non-react-statics": "2.5.5",
"invariant": "2.2.2",
"lodash": "4.17.10",
"lodash-es": "4.17.10",
"loose-envify": "1.3.1",
"prop-types": "15.6.0"
},
"dependencies": {
"hoist-non-react-statics": {
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
},
"lodash": {
"version": "4.17.10",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
},
"lodash-es": {
"version": "4.17.10",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.10.tgz",
"integrity": "sha512-iesFYPmxYYGTcmQK0sL8bX3TGHyM6b2qREaB4kamHfQyfPJP0xgoGxp19nsH16nsfquLdiyKyX3mQkfiSGV8Rg=="
}
}
},
"read-all-stream": {
@@ -7591,6 +7687,11 @@
"symbol-observable": "1.0.4"
}
},
"redux-thunk": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz",
"integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw=="
},
"regenerate": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
@@ -7863,6 +7964,11 @@
"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
"dev": true
},
"reselect": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
"integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
},
"resolve": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
@@ -8360,30 +8466,36 @@
"dev": true
},
"source-map-loader": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.1.6.tgz",
"integrity": "sha1-wJkD2m1zueU7ftjuUkVZcFHpjpE=",
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.3.tgz",
"integrity": "sha512-MYbFX9DYxmTQFfy2v8FC1XZwpwHKYxg3SK8Wb7VPBKuhDjz8gi9re2819MsG4p49HDyiOSUKlmZ+nQBArW5CGw==",
"dev": true,
"requires": {
"async": "0.9.2",
"async": "2.6.1",
"loader-utils": "0.2.17",
"source-map": "0.1.43"
"source-map": "0.6.1"
},
"dependencies": {
"async": {
"version": "0.9.2",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
"integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
"dev": true,
"requires": {
"lodash": "4.17.10"
}
},
"lodash": {
"version": "4.17.10",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
"dev": true
},
"source-map": {
"version": "0.1.43",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
"dev": true,
"requires": {
"amdefine": "1.0.1"
}
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
}
},
@@ -8582,6 +8694,11 @@
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
"integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
},
"tabbable": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/tabbable/-/tabbable-1.1.3.tgz",
"integrity": "sha512-nOWwx35/JuDI4ONuF0ZTo6lYvI0fY0tZCH1ErzY2EXfu4az50ZyiUX8X073FLiZtmWUVlkRnuXsehjJgCw9tYg=="
},
"table": {
"version": "3.8.3",
"resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
@@ -9095,12 +9212,6 @@
"integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
"dev": true
},
"velocity-vector": {
"version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
"requires": {
"jquery": "3.2.1"
}
},
"verror": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+4 -4
View File
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.15.6",
"version": "0.16.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -64,8 +64,8 @@
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"matrix-js-sdk": "0.10.5",
"matrix-react-sdk": "0.12.8",
"matrix-js-sdk": "0.10.7",
"matrix-react-sdk": "0.13.0",
"modernizr": "^3.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.0",
@@ -144,7 +144,7 @@
"build": {
"appId": "im.riot.app",
"category": "Network",
"electronVersion": "2.0.2",
"electronVersion": "2.0.5",
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
"asar": false,
"dereference": true,
+5 -1
View File
@@ -283,4 +283,8 @@ $progressbar-color: #000;
.mx_RoomSubList_chevron {
top: 8px ! important;
}
}
.mx_MemberInfo .mx_RoomTile_name {
color: $primary-fg-color ! important;
}
+2 -2
View File
@@ -4,9 +4,9 @@
"powered by Matrix": "propulsé par Matrix",
"%(appName)s via %(browserName)s on %(osName)s": "%(appName)s dans %(browserName)s sous %(osName)s",
"Riot Desktop on %(platformName)s": "Version bureau de Riot sur %(platformName)s",
"Riot is not supported on mobile web. Install the app?": "Riot nest pas supporté sur les appareils mobiles. Installer lapplication ?",
"Riot is not supported on mobile web. Install the app?": "Riot nest pas disponible en version web mobile. Installer lapplication ?",
"Unknown device": "Appareil inconnu",
"You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.",
"You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
"Welcome to Riot.im": "Bienvenue sur Riot.im",
"Chat with Riot Bot": "Discussion avec Riot Bot",
"Search the room directory": "Rechercher dans le répertoire de salons",
+23 -23
View File
@@ -1,37 +1,37 @@
{
"Custom Server Options": "사용자 지정 서버 설정",
"Dismiss": "없애기",
"powered by Matrix": "매트릭스의 지원을 받고 있어요",
"Riot Desktop on %(platformName)s": "%(platformName)s에서 라이엇 컴퓨터판",
"Riot is not supported on mobile web. Install the app?": "라이엇은 모바일 사이트를 지원하지 않아요. 앱을 설치하시겠어요?",
"powered by Matrix": "Matrix의 지원을 받고 있어요",
"Riot Desktop on %(platformName)s": "%(platformName)s PC용 Riot",
"Riot is not supported on mobile web. Install the app?": "”Riot은 모바일 사이트를 지원하지 않습니다. 앱을 설치하시겠어요?",
"Unknown device": "알 수 없는 장치",
"Welcome to Riot.im": "라이엇에 오신 걸 환영해요",
"Chat with Riot Bot": "Riot 봇과 이야기하기",
"Welcome to Riot.im": "Riot에 오신 걸 환영해요",
"Chat with Riot Bot": "Riot 봇과 대화하기",
"%(appName)s via %(browserName)s on %(osName)s": "%(osName)s의 %(browserName)s을 통한 %(appName)s",
"You need to be using HTTPS to place a screen-sharing call.": "화면 공유를 려면 HTTPS를 써야만 해요.",
"You need to be using HTTPS to place a screen-sharing call.": "화면 공유 전화려면 HTTPS를 사용해야 합니다.",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "분산되고, 암호화된 대화 &amp; [matrix]의 지원으로 협력",
"Search the room directory": "방 목록 찾기",
"Search the room directory": "방 목록 찾기",
"Get started with some tips from Riot Bot!": "라이엇 봇에게 조언을 받고 시작하세요!",
"General discussion about Matrix and Riot": "매트릭스와 라이엇에 대한 일반 논의",
"Discussion of all things Matrix!": "매트릭스의 모든 것에 대한 토론!",
"Riot/Web &amp; Desktop chat": "라이엇/웹 &amp; 컴퓨터 이야기",
"Riot/iOS &amp; matrix-ios-sdk chat": "라이엇/IOS &amp; matrix-ios-sdk 대화",
"Riot/Android &amp; matrix-android-sdk chat": "매트릭스/안드로이드 &amp; matrix-ios-sdk 대화",
"Matrix technical discussions": "매트릭스 기술 논의",
"Running Matrix services": "매트릭스 서비스 실행",
"General discussion about Matrix and Riot": "Matrix와 Riot에 대한 일반적인 토론",
"Discussion of all things Matrix!": "모든 Matrix에 대한 토론!",
"Riot/Web &amp; Desktop chat": "Riot/웹 &amp; PC 대화",
"Riot/iOS &amp; matrix-ios-sdk chat": "Riot/IOS &amp; matrix-ios-sdk 대화",
"Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-ios-sdk 대화",
"Matrix technical discussions": "Matrix에 대한 기술적인 토론",
"Running Matrix services": "Matrix 서비스 실행",
"Community-run support for Synapse": "시냅스 커뮤니티 운영 지원",
"Admin support for Dendrite": "덴드라이트 관리 지원",
"Announcements about Synapse releases": "시냅스 공개 발표",
"Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 지원",
"Building services on Matrix": "매트릭스에서 서비스 구축",
"Admin support for Dendrite": "Dendrite 관리 지원",
"Announcements about Synapse releases": "Synapse 출시에 대한 발표",
"Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 위한 지원",
"Building services on Matrix": "Matrix에서 서비스 구축",
"Support for those using the Matrix spec": "Matrix spec을 사용하는 사람들을 지원",
"Design and implementation of E2E in Matrix": "매트릭스에서 E2E 설계와 구현",
"Implementing VR services with Matrix": "매트릭스로 VR 서비스 구현",
"Implementing VoIP services with Matrix": "매트릭스로 인터넷전화 서비스 구현",
"Implementing VoIP services with Matrix": "Matrix로 인터넷전화 서비스 구현",
"Discussion of the Identity Service API": "ID 서비스 API에 대한 논의",
"Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 지원",
"Contributing code to Matrix and Riot": "매트릭스와 라이엇에 코드 기여하기",
"Dev chat for the Riot/Web dev team": "라이엇/웹 개발 팀을 위한 개발자 대화",
"Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 위한 지원",
"Contributing code to Matrix and Riot": "Matrix와 Riot에 코드 기여하기",
"Dev chat for the Riot/Web dev team": "Riot/웹 개발 팀을 위한 개발자 대화",
"Dev chat for the Dendrite dev team": "덴드라이트 개발 팀을 위한 개발자 대화",
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 매트릭스에 있어요. 목록을 확인해보세요!"
"Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 Matrix에 있습니다. 목록을 확인해보세요!"
}