Commit Graph

6640 Commits

Author SHA1 Message Date
David Baker b53c86c5f4
Merge pull request #7673 from aaronraimist/add-japanese
Add Japanese (#7599)
2018-11-09 10:53:43 +00:00
Weblate cbe6d31ee3 Merge remote-tracking branch 'origin/develop' into develop 2018-11-08 21:37:30 +00:00
Travis Ralston 5810221181
Merge pull request #7674 from jryans/webpack-bind-all
Allow Webpack dev server to listen to all interfaces
2018-11-08 14:37:24 -07:00
J. Ryan Stinnett e9f4594eb9 Allow Webpack dev server to listen to all interfaces
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-11-08 20:55:51 +01:00
Aaron Raimist 2f991d190f
Add Japanese (#7599)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-11-08 13:31:09 -06:00
Victor Grousset ae90b9877a Translated using Weblate (Esperanto)
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/eo/
2018-11-06 12:22:01 +00:00
Weblate 786c2a1fd7 Merge remote-tracking branch 'origin/develop' into develop 2018-11-02 15:39:21 +00:00
Travis Ralston eef4f7c4cf
Merge pull request #7637 from vector-im/travis/cleanup-request
Remove the request-only stuff we don't need anymore
2018-11-02 09:39:15 -06:00
Travis Ralston 36cc5de0e7 Remove the request-only stuff we don't need anymore
This was introduced in https://github.com/matrix-org/matrix-react-sdk/pull/2250 but can be pulled out due to https://github.com/matrix-org/matrix-js-sdk/pull/770. See https://github.com/vector-im/riot-web/issues/7634 for more information about the future.
2018-10-31 13:05:36 -06:00
Weblate 854798f470 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 14:31:01 +00:00
David Baker ca305399c3 npm update 2018-10-29 14:30:35 +00:00
Weblate 00a8d44ce1 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 14:28:30 +00:00
David Baker 79c7f331c9 develop js & react sdk deps 2018-10-29 14:28:13 +00:00
David Baker 409c48efcb Merge branch 'master' into develop 2018-10-29 14:27:46 +00:00
David Baker 29f3ff155a v0.17.3 2018-10-29 14:22:55 +00:00
David Baker 6c1deb41be Prepare changelog for v0.17.3 2018-10-29 14:22:55 +00:00
David Baker 4574415e97 v0.17.3 2018-10-29 14:20:59 +00:00
David Baker f05646c5a1 released js-sdk & react-sdk 2018-10-29 14:20:12 +00:00
Weblate a6f8f707f3 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 05:23:04 +00:00
పవి e19dbe4f3b Translated using Weblate (Telugu)
Currently translated at 27.0% (10 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2018-10-29 05:23:04 +00:00
Travis Ralston d393cd67f7
Merge pull request #7615 from vector-im/t3chguy/fix_author_of_electron_app
Correct the author of the electron app
2018-10-28 23:22:58 -06:00
Michael Telatynski c80f5ddcd1 Correct the author of the electron app
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:04:05 +01:00
Travis Ralston cebba5bfa3
Merge pull request #7552 from vector-im/travis/permalink-routing
Mock fs, tls, and net to support request in the browser
2018-10-26 14:22:38 -06:00
Travis Ralston 0f5c62d3cc Regenerate package-lock.json
due to conflicts
2018-10-26 10:06:27 -06:00
Travis Ralston f9fa338960 Merge branch 'develop' into travis/permalink-routing 2018-10-26 09:22:13 -06:00
Travis Ralston bb353b940e
Merge pull request #7598 from jryans/update-chokidar
Update chokidar to transitively get newer fsevents
2018-10-25 15:53:23 -06:00
J. Ryan Stinnett 9732d10f24 Update chokidar to transitively get newer fsevents
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-10-25 23:04:25 +02:00
David Baker 9b80aa76ce
Merge pull request #7385 from vector-im/dbkr/wasm
Support WebAssembly version of Olm
2018-10-25 15:58:24 +01:00
David Baker bc935012da Update to Olm 3 2018-10-25 15:44:22 +01:00
Travis Ralston e4025f1aff Mock fs, tls, and net to support request in the browser
fs is mocked using memfs, which needs to be installed at all 3 layers because webpack is silly
2018-10-24 16:59:14 -06:00
David Baker e2b55315a6 v0.17.3-rc.1 2018-10-24 11:31:59 +01:00
David Baker 1f8b0f2135 Prepare changelog for v0.17.3-rc.1 2018-10-24 11:31:59 +01:00
David Baker a9a45dc32b v0.17.3-rc.1 2018-10-24 11:30:44 +01:00
David Baker f7138c0516 react-sdk & js-sdk rc.1 2018-10-24 11:27:01 +01:00
David Baker d080a204a3 electron 3.0.5 2018-10-24 11:12:51 +01:00
David Baker fd31d58128
Merge pull request #7549 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-10-24 10:26:13 +01:00
Weblate 16b150039a Merge remote-tracking branch 'origin/develop' into develop 2018-10-19 15:07:56 +00:00
Bruno Windels ca1dec8e13 Merge branch 'master' into develop 2018-10-19 17:07:29 +02:00
Bruno Windels f81d3bc903 Merge branch 'release-v0.17.2' 2018-10-19 17:00:44 +02:00
Bruno Windels 88132067ad update version in package lock file 2018-10-19 17:00:13 +02:00
Bruno Windels f5eff7d349 v0.17.2 2018-10-19 16:54:27 +02:00
Bruno Windels 5f35b9903d Prepare changelog for v0.17.2 2018-10-19 16:54:26 +02:00
Bruno Windels 221f75542a v0.17.2 2018-10-19 16:51:26 +02:00
David Baker d0fcf3c952 Don't set tags on notifications
They are to suppress notifications that don't want to be shown in
addition to each other. This makes no sense for our notifications:
they're each for independent messages. Also settings tags on
notifications makes electron crash on windows when you close the
notif, as per https://github.com/vector-im/riot-web/issues/7512
2018-10-19 16:47:16 +02:00
Bruno Windels 62f664c592 update matrix-react-sdk to 0.14.1 2018-10-19 16:45:39 +02:00
Weblate deaeb1a715 Merge remote-tracking branch 'origin/develop' into develop 2018-10-18 18:26:13 +00:00
David Baker c1dfbd6993
Merge pull request #7518 from vector-im/dbkr/better_fix_for_windows_crashes
Don't set tags on notifications
2018-10-18 19:26:08 +01:00
David Baker 2854c0969b Don't set tags on notifications
They are to suppress notifications that don't want to be shown in
addition to each other. This makes no sense for our notifications:
they're each for independent messages. Also settings tags on
notifications makes electron crash on windows when you close the
notif, as per https://github.com/vector-im/riot-web/issues/7512
2018-10-18 19:07:59 +01:00
Weblate 1de5e61888 Merge remote-tracking branch 'origin/develop' into develop 2018-10-18 17:44:16 +00:00
David Baker 47493fa7d9 Merge branch 'master' into develop 2018-10-18 18:43:58 +01:00