d802ee0fa2
Move the max candidates constant out of the function
2018-10-26 10:25:23 -06:00
c389540522
Appease the linter
2018-10-26 10:22:18 -06:00
ef8c9246aa
Maybe fix UserSettings?
2018-10-26 10:07:21 -06:00
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
ea8a37ff21
Merge branch 'develop' into travis/permalink-routing
2018-10-26 09:19:58 -06:00
6c23dc0020
Merge pull request #2252 from jryans/dialog-padding
...
Repair DevTools button padding by centralizing styles
2018-10-26 09:11:18 -06:00
3d07f45370
remove CreateRoom page, dead code
2018-10-26 17:10:32 +02:00
e3a60b9524
Merge remote-tracking branch 'origin/develop' into develop
2018-10-26 14:09:33 +00:00
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
33925b2fd1
fix after merge conflict error
2018-10-26 15:57:57 +02:00
2c039483c6
Merge branch 'develop' into experimental
2018-10-26 15:33:39 +02:00
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
44ae73f1f5
Merge remote-tracking branch 'origin/develop' into develop
2018-10-26 09:13:35 +00:00
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
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
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
aaeb6e4978
Use about:blank instead
2018-10-25 15:59:42 -06:00
749441b4d3
Merge branch 'develop' into travis/redirect-widgets
2018-10-25 15:57:26 -06:00
d58ff90ec1
Merge branch 'develop' into travis/permalink-routing
2018-10-25 15:23:33 -06:00
52094964a0
Fix the server candidate picker to actually work
...
Tests do wonders.
2018-10-25 15:23:15 -06:00
43980addd0
Add hostname sanity tests
...
In the event someone changes how the hostname parsing works.
2018-10-25 15:22:52 -06:00
b9bfbdc22d
Fix the tests so they actually test something
2018-10-25 15:22:28 -06:00
54ff5d8f25
Fix Karma/Webpack so it can build the tests
2018-10-25 15:21:18 -06:00
9cdb527163
Merge branch 'develop' into travis/pinned-room-list
2018-10-25 10:57:08 -06:00
b59b8b7fca
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-10-25 17:42:46 +01:00
206ad3159c
disable e2e tests for PRs targeted at experimental (redesign)
2018-10-25 17:48:51 +02:00
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
777587827e
Merge remote-tracking branch 'origin/develop' into develop
2018-10-25 15:23:21 +00:00
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
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
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
5e81e5b8b8
Fix variable scope
2018-10-25 15:07:19 +01:00
401f6333ed
Do...while loops are a thing
2018-10-25 14:54:32 +01:00
adee0fdcef
Merge pull request #2248 from matrix-org/bwindels/memberpanel
...
Redesign: basic makeover of member info panel
2018-10-25 14:52:54 +01:00
3096bf42ef
fix css in chrome
2018-10-25 15:20:51 +02:00
030deba90c
avoid downloading avatars at full resolution
2018-10-25 15:20:33 +02:00
e8cb636631
Pick servers for ?via on matrix.to links based on some heuristics
2018-10-24 18:01:08 -06:00
a8782120fe
Install memfs because webpack is made of fail
2018-10-24 16:57:16 -06:00
6ee495b912
Merge remote-tracking branch 'origin/develop' into travis/permalink-routing
2018-10-24 16:36:39 -06:00
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
5d35ce9449
Changed letter case.
2018-10-24 19:06:48 +01:00
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
def0b2d8fb
Add developertools option to UserSettings
2018-10-24 18:20:16 +01:00
27a0f0ca62
Add i18n string
2018-10-24 18:16:55 +01:00
8118a9c71a
Wall devtools button behind a setting
2018-10-24 18:15:35 +01:00
a5ae599dcb
Add show developer tools option
2018-10-24 18:15:25 +01:00
3c045f3f65
Revert i18n changes for en_US
2018-10-24 18:02:45 +01:00
44a41b589d
Comma on strings and styling button
2018-10-24 17:50:27 +01:00
06c34cff9c
Add devtools string
2018-10-24 17:37:13 +01:00
79d467c551
Add button to open devtools in roomsettings
2018-10-24 17:36:58 +01:00
Travis Ralston