4f430db981
Merge pull request #2730 from matrix-org/dbkr/langs_file_resolve_alias
...
Use webpack alias to resolve the languages file
2019-03-01 12:13:31 +00:00
4f84311bde
Use $webapp rather than Webapp
2019-03-01 12:03:04 +00:00
f2328904cd
stray semicolon
2019-03-01 11:48:48 +00:00
53aceaa412
Add fallback for languages file
...
So we're not completely dependent on the alias being set
2019-03-01 11:44:44 +00:00
63c6f600bf
Use webpack alias to resolve the languages file
...
Hopefully this will end up simpler than having to figure out in
riot-web what the relative path is from react-sdk's
src/languageHandler.js to riot-web's webapp directory.
2019-03-01 11:30:50 +00:00
60c4c55010
Merge pull request #2721 from matrix-org/bwindels/e2emembericonmargin
...
Fix margin on e2e icon in member panel
2019-03-01 11:11:14 +01:00
fe3fe208e1
Merge pull request #2676 from matrix-org/bwindels/improvedscrolling
...
Improved scrolling & pagination
2019-03-01 11:09:23 +01:00
eb46e62a2e
delint NetworkDropdown
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-01 09:39:39 +00:00
0bc4243215
Merge pull request #2719 from matrix-org/jryans/nudge-karma
...
Nudge karma to 3.1.2
2019-03-01 09:36:57 +00:00
6b07195b63
Add missing permalinkCreator prop
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-01 09:36:36 +00:00
7d207ca2c3
speeling
2019-02-28 20:45:31 -07:00
9402e81835
Get confirmation before enabling encryption
...
Fixes https://github.com/vector-im/riot-web/issues/8843
2019-02-28 20:39:07 -07:00
12d939b36f
Support multiple email pushers and remove the legacy UserSettingsStore
...
Fixes https://github.com/vector-im/riot-web/issues/5496
Fixes https://github.com/vector-im/riot-web/issues/8424
2019-02-28 19:57:45 -07:00
b84b11d3bd
Don't re-enable the save button after saving profiles
...
Fixes https://github.com/vector-im/riot-web/issues/8569
2019-02-28 19:13:28 -07:00
a41df7ab68
Convert PowerSelector to use mxField instead
2019-02-28 19:00:57 -07:00
0978ab3da0
Support stacking dialogs to prevent unmounting
...
Fixes https://github.com/vector-im/riot-web/issues/8371
2019-02-28 15:55:58 -07:00
8d7837829e
Merge pull request #2722 from matrix-org/travis/misc-roomlist
...
Misc room list improvements & invite fix
2019-02-28 15:13:06 -07:00
940ba51f9f
Merge pull request #2723 from matrix-org/travis/destate-stickerpicker
...
Stop listening to account data when the stickerpicker is unmounted
2019-02-28 15:01:43 -07:00
b5ffd4a538
Stop listening to account data when the stickerpicker is unmounted
...
Fixes https://github.com/vector-im/riot-web/issues/8994
2019-02-28 14:15:01 -07:00
805676a511
Don't lose invites when multiple are pending
2019-02-28 14:03:28 -07:00
872cdaa9b3
Use the already available state for checking if custom tags are enabled
2019-02-28 14:03:28 -07:00
b1e16e9f49
Fix stacktrace when starting riot up with rooms
...
Settings can trigger before we're ready, so don't generate the room list. This also includes a comment to signify to future people that we need to track settings still.
2019-02-28 13:55:20 -07:00
b2f4de4488
Merge pull request #2716 from matrix-org/travis/what-even-is-a-category
...
Move complex part of room sorting to a dedicated function
2019-02-28 13:36:09 -07:00
a3342a5790
Standardize on "Category" being the canonical term for room list sections
2019-02-28 13:24:05 -07:00
0c06a702dc
pr feedback
2019-02-28 16:05:55 +01:00
52a2fe1c9c
v1.0.2-rc.1
2019-02-28 14:43:36 +00:00
89ad006d2d
Prepare changelog for v1.0.2-rc.1
2019-02-28 14:43:35 +00:00
69016e32a4
fix margin on e2e icon in member panel
2019-02-28 15:39:10 +01:00
95675461c8
js-sdk rc.1
2019-02-28 14:37:43 +00:00
c4c9c77330
Merge pull request #2718 from matrix-org/jaywink/stickerpicker-button-warning
...
Remove unnecessary ref from Stickerpicker
2019-02-28 16:23:09 +02:00
3fa4ecade9
Merge pull request #2720 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-02-28 14:22:17 +00:00
76eba5a9cf
Translated using Weblate (English (United States))
...
Currently translated at 48.8% (758 of 1552 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2019-02-28 14:21:08 +00:00
66f9a2cbe1
Merge pull request #2715 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2019-02-28 14:08:31 +00:00
e445ef7b1e
[matrix] -> Matrix
2019-02-28 14:05:20 +00:00
6976e23caf
manually comitting translations
2019-02-28 14:03:06 +00:00
ca1cbd9d67
Nudge karma to 3.1.2
...
This includes a fix for detecting the version of Chrome used to run tests.
2019-02-28 13:56:23 +00:00
a74cb001b4
Remove unnecessary ref from Stickerpicker
...
There is a ref=target in the call to render AccessibleButton for
the hide stickers button. This ref is not present in the show case.
When clicking the stickerpicker show button, React gives a warning:
> Warning: Stateless function components cannot be given refs
> (See ref "target" in AccessibleButton created by Stickerpicker).
> Attempts to access this ref will fail.
Removed the ref. Stickerpicker hide/show still works fine, no warning.
Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-02-28 15:51:36 +02:00
4866c0234b
Merge branch 'origin/develop' into Weblate.
2019-02-28 13:38:46 +00:00
527798db59
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 81.7% (1269 of 1552 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-02-28 13:37:27 +00:00
712522a16d
set chrome path for travis CI explicitly
...
karma seems to be giving priority to a location where an old version is installed.
2019-02-28 12:45:43 +01:00
8435406b7a
Translated using Weblate (French)
...
Currently translated at 100.0% (1552 of 1552 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-02-28 09:46:30 +00:00
bd8177de62
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (1552 of 1552 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-02-28 08:28:56 +00:00
d7e2938570
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1552 of 1552 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-02-28 04:01:17 +00:00
93043c8cc0
Merge pull request #2709 from matrix-org/t3chguy/badge_51
...
Show nearest lower badge, e.g show Mod for 51... etc
2019-02-27 18:30:57 -07:00
bafe59fe28
Appease the linter
2019-02-27 18:29:48 -07:00
c908a6cf1e
Move complex part of room sorting to a dedicated function
...
Pretty much cut/pasting it in, as there's not really a whole much to help make the code more understandable here.
This also includes a comment block longer than the code it describes in hopes it explains away the problem of understanding what it does.
Should fix https://github.com/vector-im/riot-web/issues/8861
2019-02-27 15:55:16 -07:00
2a9f150e4c
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1552 of 1552 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-02-27 20:37:04 +00:00
4ae40f6564
Translated using Weblate (Hungarian)
...
Currently translated at 98.3% (1526 of 1552 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-02-27 19:42:54 +00:00
2194eebfd0
Merge remote-tracking branch 'origin/develop' into develop
2019-02-27 17:33:37 +00:00
a7d993b7a7
Translated using Weblate (Ukrainian)
...
Currently translated at 33.8% (522 of 1543 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2019-02-27 17:33:34 +00:00
David Baker