PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
6841 commits 1 branch 0 tags 338 MiB
Commit graph

6841 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
cc4d0af713 Merge branch 'master' into develop 2018-11-13 19:02:34 +00:00
David Baker
4a217d9e9f v0.17.5 2018-11-13 18:54:25 +00:00
David Baker
122caf7a95 Prepare changelog for v0.17.5 2018-11-13 18:54:25 +00:00
David Baker
a1e5c72eb9 v0.17.5 2018-11-13 18:52:59 +00:00
David Baker
7dd163ac85 bump react-sdk 2018-11-13 18:52:16 +00:00
Weblate
01432d3848 Merge remote-tracking branch 'origin/develop' into develop 2018-11-13 18:19:27 +00:00
toriko
d3cae13552 Translated using Weblate (Japanese) 
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/ja/
 2018-11-13 18:19:26 +00:00
David Baker
061838bdab Merge branch 'master' into develop 2018-11-13 18:19:10 +00:00
David Baker
24846a1d64 v0.17.4 2018-11-13 18:11:12 +00:00
David Baker
0b31d32793 Prepare changelog for v0.17.4 2018-11-13 18:11:12 +00:00
David Baker
71403980cc v0.17.4 2018-11-13 18:09:48 +00:00
David Baker
f8ab754af4 bump react-sdk 2018-11-13 18:09:10 +00:00
Weblate
fd3ed9e119 Merge remote-tracking branch 'origin/develop' into develop 2018-11-09 10:53:49 +00:00
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
Bruno Windels
ade0f34c6f Merge branch 'develop' into experimental 2018-10-31 14:36:43 +01: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
Aaron Raimist
a02009d31f
Update package-lock.json 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:21:40 -05:00
Aaron Raimist
a4ed1afeb5
Update babel-eslint to 8.1.1 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:07:35 -05:00
Travis Ralston
1fea7c022e Fix order of operations for npm install on Travis CI 2018-10-26 20:44:14 -06:00
Travis Ralston
e7f5aee9fb Regenerate package-lock.json (again) 2018-10-26 20:43:53 -06:00
Travis Ralston
d3805f7545 Regenerate package-lock.json and upgrade eslint again 2018-10-26 20:12:43 -06:00
Travis Ralston
70891f41a5 Merge branch 'develop' into lint 2018-10-26 19:56:33 -06: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
Bruno Windels
18daa186b0 Merge branch 'develop' into experimental 2018-10-26 15:33:57 +02:00
Travis Ralston
ad7ac26ff3 Upgrade babel-eslint and regenerate package-lock.json 2018-10-25 16:10:27 -06:00
Travis Ralston
10efaaa078 Merge branch 'develop' into lint 2018-10-25 16:06:02 -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