mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 09:51:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
12492 commits 219 branches 562 tags 474 MiB
Commit graph

12492 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Travis Ralston
43980addd0 Add hostname sanity tests 
In the event someone changes how the hostname parsing works.
 2018-10-25 15:22:52 -06:00
Travis Ralston
b9bfbdc22d Fix the tests so they actually test something 2018-10-25 15:22:28 -06:00
Travis Ralston
54ff5d8f25 Fix Karma/Webpack so it can build the tests 2018-10-25 15:21:18 -06:00
Travis Ralston
9cdb527163
Merge branch 'develop' into travis/pinned-room-list 2018-10-25 10:57:08 -06:00
David Baker
b59b8b7fca Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-25 17:42:46 +01:00
Bruno Windels
206ad3159c disable e2e tests for PRs targeted at experimental (redesign) 2018-10-25 17:48:51 +02:00
Osoitz
4eb9363348 Translated using Weblate (Basque) 
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/eu/
 2018-10-25 15:33:42 +00:00
Weblate
777587827e Merge remote-tracking branch 'origin/develop' into develop 2018-10-25 15:23:21 +00:00
Karol Kosek
694f04b6cb Translated using Weblate (Polish) 
Currently translated at 92.7% (1180 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-25 15:23:20 +00:00
Jessica Wan
4e5ed99fec Translated using Weblate (Chinese (Simplified)) 
Currently translated at 98.6% (1255 of 1272 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-10-25 15:23:19 +00:00
David Baker
85bb8392c4
Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement 
Fix emoji replacement in composer
 2018-10-25 16:23:13 +01:00
David Baker
5e81e5b8b8 Fix variable scope 2018-10-25 15:07:19 +01:00
David Baker
401f6333ed Do...while loops are a thing 2018-10-25 14:54:32 +01:00
Travis Ralston
e8cb636631 Pick servers for ?via on matrix.to links based on some heuristics 2018-10-24 18:01:08 -06:00
Travis Ralston
a8782120fe Install memfs because webpack is made of fail 2018-10-24 16:57:16 -06:00
Travis Ralston
6ee495b912 Merge remote-tracking branch 'origin/develop' into travis/permalink-routing 2018-10-24 16:36:39 -06:00
Szimszon
2707fcc575 Translated using Weblate (Hungarian) 
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/hu/
 2018-10-24 18:17:27 +00:00
Maxwell Kepler
5d35ce9449 Changed letter case. 2018-10-24 19:06:48 +01:00
Travis Ralston
8d47baa95a
Merge pull request #2249 from Half-Shot/hs/devtools-in-roomsettings 
Add a devtools button to roomsettings
 2018-10-24 11:40:36 -06:00
Will Hunt
def0b2d8fb Add developertools option to UserSettings 2018-10-24 18:20:16 +01:00
Will Hunt
27a0f0ca62 Add i18n string 2018-10-24 18:16:55 +01:00
Will Hunt
8118a9c71a Wall devtools button behind a setting 2018-10-24 18:15:35 +01:00
Will Hunt
a5ae599dcb Add show developer tools option 2018-10-24 18:15:25 +01:00
Will Hunt
3c045f3f65 Revert i18n changes for en_US 2018-10-24 18:02:45 +01:00
Will Hunt
44a41b589d Comma on strings and styling button 2018-10-24 17:50:27 +01:00
Will Hunt
06c34cff9c Add devtools string 2018-10-24 17:37:13 +01:00