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
0857e2c5e9
Clarify why we pick popular servers over the one that created the room
2018-10-26 12:21:27 -06:00
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
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
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
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
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
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
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
206ad3159c
disable e2e tests for PRs targeted at experimental (redesign)
2018-10-25 17:48:51 +02: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
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
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
6b13a071f3
Merge pull request #2242 from aaronraimist/leave-group-warning
...
Add warning when administrator leaves community (#5724 )
2018-10-24 10:26:25 -06:00
78d8d22457
Fix emoji replacement in composer
...
* Re-scan the slate document tree on each emoji replacement since
doing a replacement will invalidate all the offsets we have.
* Reset the emoji regex each time we use it.
Fixes https://github.com/vector-im/riot-web/issues/7550
2018-10-24 16:46:06 +01:00
d7367a7cfd
Merge branch 'develop' into travis/permalink-routing
2018-10-24 09:12:14 -06:00
4c3c8a6285
Merge pull request #2244 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-10-24 11:20:02 +01:00
ef50e05580
Translated using Weblate (Esperanto)
...
Currently translated at 86.3% (1098 of 1271 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-10-24 09:24:46 +00:00
fe901142aa
Split long string over two lines
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 17:20:57 -05:00
92bfb42784
Use one string instead of two
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 13:11:36 -05:00
a6c78ace4f
Add warning when administrator leaves community
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 12:25:12 -05:00
87ae1ce458
Merge remote-tracking branch 'origin/develop' into develop
2018-10-23 09:18:12 +00:00
690405d3f6
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 98.7% (1255 of 1271 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-10-23 09:18:11 +00:00
5206719663
Merge pull request #2223 from matrix-org/travis/fix-group-members
...
Show the group member list again
2018-10-23 10:18:06 +01:00
a5ea073350
Merge remote-tracking branch 'origin/develop' into develop
2018-10-23 04:44:19 +00:00
8ff1da11ed
Merge pull request #2237 from aaronraimist/camel-case
...
lint: make colorScheme camel case
2018-10-22 22:44:14 -06:00
1aa3085958
Oh right, can't change these
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-22 23:33:38 -05:00
Travis Ralston