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

12468 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
33e2fc28b7
Merge pull request #2254 from matrix-org/travis/permalink-routing-2 
Fix and test matrix.to alias permalinks
 2018-10-29 15:55:11 +00:00
Weblate
6205e64c37 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 14:10:48 +00:00
David Baker
507bfb4b69 Merge branch 'master' into develop 2018-10-29 14:10:28 +00:00
David Baker
c5004ffbe3 v0.14.2 2018-10-29 14:07:03 +00:00
David Baker
2077678088 Prepare changelog for v0.14.2 2018-10-29 14:06:41 +00:00
David Baker
eb22b9141a released js-sdk 2018-10-29 14:03:19 +00:00
David Baker
69a8b3bd95
Merge pull request #2258 from matrix-org/dbkr/fix_ascii_smiley_emojification_2 
Fix autoreplacement of ascii emoji
 2018-10-29 13:57:09 +00:00
David Baker
9933a3cc63 Fix autoreplacement of ascii emoji 
More slate API updates in code paths I didn't test

Fixes https://github.com/vector-im/riot-web/issues/7509
 2018-10-29 13:55:41 +00:00
Weblate
9d155fcbc9 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 11:38:02 +00:00
David Baker
04ed61ec4e
Merge pull request #2257 from matrix-org/t3chguy/view_community_context_menu 
click-through svg on tag tile context menu to make it less weird
 2018-10-29 11:37:56 +00:00
Weblate
52ae11deff Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 05:22:47 +00:00
Travis Ralston
fcbc16337e
Merge pull request #2256 from matrix-org/t3chguy/hide_timetravel 
Hide Matthew's Time Machine
 2018-10-28 23:22:43 -06:00
Weblate
b57fc50620 Merge remote-tracking branch 'origin/develop' into develop 2018-10-29 05:21:47 +00:00
పవి
8fc8c5e780 Translated using Weblate (Telugu) 
Currently translated at 22.7% (290 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
 2018-10-29 05:21:47 +00:00
Karol Kosek
ac669e824b Translated using Weblate (Polish) 
Currently translated at 93.4% (1189 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-29 05:21:46 +00:00
Travis Ralston
c2b7df763d
Merge pull request #2255 from aaronraimist/lint 
Update babel-eslint to 8.1.1
 2018-10-28 23:21:39 -06:00
Michael Telatynski
8a3824b9ca click-through svg on tag tile context menu to make it less weird 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-10-27 11:27:43 +01:00
Michael Telatynski
d54bf13fab Hide all the time travel. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-10-27 11:06:52 +01:00
Aaron Raimist
e61e7f2626
Fix eslint --fix 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 23:04:00 -05:00
Aaron Raimist
5f3b03c85a
Fix a few no-useless-escape lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 23:00:54 -05:00
Aaron Raimist
49ce4ef117
eslint --fix src/ 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:50:38 -05:00
Aaron Raimist
952bdba979
Update more eslint related packages 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:48:18 -05:00
Aaron Raimist
790ecbcbb0
Update babel-eslint to 8.1.1 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:07:30 -05:00
Travis Ralston
0cdc44a205 Appease the linter 2018-10-26 20:49:01 -06:00
Travis Ralston
5b22d157a7 Fix candidate server encoding 2018-10-26 20:34:06 -06:00
Travis Ralston
3bc5e2beb3 Fix and test matrix.to alias permalinks 
Fixes https://github.com/vector-im/riot-web/issues/7614
Regression of https://github.com/matrix-org/matrix-react-sdk/pull/2250
 2018-10-26 19:47:53 -06:00
Weblate
18f4edcd7a Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 20:23:35 +00:00
Travis Ralston
0bd1d6b778
Merge pull request #2250 from matrix-org/travis/permalink-routing 
Support routing matrix.to links to joinable rooms
 2018-10-26 14:23:30 -06:00
Travis Ralston
0857e2c5e9 Clarify why we pick popular servers over the one that created the room 2018-10-26 12:21:27 -06:00
Travis Ralston
3734c8ab91 Don't mention that matrix.org is likely to be popular 
This is untrue for quite a few real scenarios, including private federations and a ton of rooms.
 2018-10-26 12:21:02 -06:00
David Baker
de366fa0e8 Add cancel button to error stage 2018-10-26 17:55:59 +01:00
Weblate
a58e1c04fd Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 16:46:34 +00:00
David Baker
3b6a0f9132
Merge pull request #2253 from matrix-org/dbkr/fix_ascii_smiley_emojification 
Fix autoreplacement of ascii emoji
 2018-10-26 17:46:29 +01:00
Travis Ralston
d802ee0fa2 Move the max candidates constant out of the function 2018-10-26 10:25:23 -06:00
Travis Ralston
c389540522 Appease the linter 2018-10-26 10:22:18 -06:00
Travis Ralston
ef8c9246aa Maybe fix UserSettings? 2018-10-26 10:07:21 -06:00
David Baker
156ffd1334 Fix autoreplacement of ascii emoji 
More slate API updates in code paths I didn't test

Fixes https://github.com/vector-im/riot-web/issues/7509
 2018-10-26 17:01:44 +01:00
Travis Ralston
ea8a37ff21 Merge branch 'develop' into travis/permalink-routing 2018-10-26 09:19:58 -06:00
Travis Ralston
6c23dc0020
Merge pull request #2252 from jryans/dialog-padding 
Repair DevTools button padding by centralizing styles
 2018-10-26 09:11:18 -06:00
Weblate
e3a60b9524 Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 14:09:33 +00:00
Travis Ralston
eaa2230d6a
Merge pull request #2232 from matrix-org/travis/redirect-widgets 
Redirect widgets to another location before deleting them
 2018-10-26 08:09:27 -06:00
J. Ryan Stinnett
2dc335798d Repair DevTools button padding by centralizing styles 
This moves the padding styles for dialog content to the .mx_Dialog rule. In
addition, it fixes vector-im/riot-web#7548 where the DevTools buttons had double
padding.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-10-26 14:15:46 +02:00
Weblate
44ae73f1f5 Merge remote-tracking branch 'origin/develop' into develop 2018-10-26 09:13:35 +00:00
Karol Kosek
ff1552c2f0 Translated using Weblate (Polish) 
Currently translated at 93.3% (1188 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-26 09:13:35 +00:00
Bruno Windels
e799b30b89
Merge pull request #2251 from matrix-org/bwindels/noe2eforredesign 
disable e2e tests for PRs targeted at experimental (redesign)
 2018-10-26 09:13:30 +00:00
Kévin C
2bdff52937 Translated using Weblate (French) 
Currently translated at 100.0% (1272 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-10-26 06:57:43 +00:00
Travis Ralston
aaeb6e4978 Use about:blank instead 2018-10-25 15:59:42 -06:00
Travis Ralston
749441b4d3 Merge branch 'develop' into travis/redirect-widgets 2018-10-25 15:57:26 -06:00
Travis Ralston
d58ff90ec1 Merge branch 'develop' into travis/permalink-routing 2018-10-25 15:23:33 -06:00
Travis Ralston
52094964a0 Fix the server candidate picker to actually work 
Tests do wonders.
 2018-10-25 15:23:15 -06:00