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

17158 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arnaud Castellanos Galea
0a188494e8 Translated using Weblate (Spanish) 
Currently translated at 77.1% (1300 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:20:34 +00:00
J. Ryan Stinnett
d57a0dec64 Use URL to parse IM origins 
This allows the configuration for `integrations_ui_url` to be more flexible. In
particular, it no longer matters whether you include a trailing slash after the
port, for example.
 2019-07-12 19:18:34 +01:00
J. Ryan Stinnett
dc9b5fa996 Log when integration manager origin is invalid 2019-07-12 19:04:20 +01:00
Bruno Windels
380639516b
Merge pull request #3216 from matrix-org/bwindels/fix-powerlevels-crash 
Check content and content.users in power levels
 2019-07-12 16:59:16 +00:00
Bruno Windels
5c7e9812a1 also check content and content.users before proceeding 2019-07-12 18:50:13 +02:00
RiotRobot
f05a7b2195 v1.4.0-rc.2 2019-07-12 17:33:21 +01:00
RiotRobot
c600947cfd Prepare changelog for v1.4.0-rc.2 2019-07-12 17:33:21 +01:00
RiotRobot
6a6108f496 Upgrade to JS SDK 2.2.0-rc.2 2019-07-12 17:29:36 +01:00
J. Ryan Stinnett
64f52cac73
Merge pull request #3215 from matrix-org/jryans/v1.4.0/logout-text 
Remove misleading text about admins logging people out from soft logout
 2019-07-12 16:50:02 +01:00
Travis Ralston
178427c2e4 Remove misleading text about admins logging people out from soft logout 2019-07-12 16:42:09 +01:00
Travis Ralston
78ba22d12e
Merge pull request #3206 from matrix-org/travis/tombstone-autojoin 
Autojoin rooms when clicking the tombstone
 2019-07-12 08:14:42 -06:00
Travis Ralston
187e656bfa
Merge pull request #3209 from matrix-org/travis/ci-i18n 
Verify i18n in CI
 2019-07-12 08:14:31 -06:00
Travis Ralston
ff0c4c0571
Merge pull request #3211 from matrix-org/travis/send-proper-uia 
Send the correct UIA alongside the wrong UIA for backwards comaptibility
 2019-07-12 08:14:01 -06:00
Travis Ralston
5f98e4ea61
Merge pull request #3213 from matrix-org/travis/remove-is-flag 
Remove unused identityEnabled property from ValidatedServerConfig
 2019-07-12 08:11:55 -06:00
David Baker
28c3578b02
Merge pull request #3205 from matrix-org/travis/soft-logout-copy 
Remove misleading text about admins logging people out from soft logout
 2019-07-12 12:32:24 +01:00
RiotRobot
a0dc4db234 v1.4.0-rc.1 2019-07-12 11:28:50 +01:00
RiotRobot
c071f5af8e Prepare changelog for v1.4.0-rc.1 2019-07-12 11:28:49 +01:00
RiotRobot
34c642ce9a Upgrade JS SDK to 2.2.0-rc.1 2019-07-12 11:23:01 +01:00
J. Ryan Stinnett
0ac167ede6
Merge pull request #3214 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-07-12 10:53:16 +01:00
Kévin C
7773722202 Translated using Weblate (French) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-12 09:51:25 +00:00
Weblate
7afb0e9019 Merge branch 'origin/develop' into Weblate. 2019-07-12 08:42:39 +00:00
J. Ryan Stinnett
b27c1a45e4 Adjust spelling on debug log screen 2019-07-12 09:42:02 +01:00
Weblate
36946dbb4d Merge branch 'origin/develop' into Weblate. 2019-07-12 08:25:11 +00:00
Kévin C
1ab99c89fe Translated using Weblate (French) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-12 08:25:11 +00:00
Bruno Windels
7fc19e61a9
Merge pull request #3210 from matrix-org/bwindels/prevent-autocomplete-on-paste 
Prevent autocomplete on paste, and verserev-ing text before and after :
 2019-07-12 08:25:06 +00:00
Bruno Windels
ee9dd8ce81 adjust jsdoc 2019-07-12 10:06:38 +02:00
Weblate
0a108b3de4 Merge branch 'origin/develop' into Weblate. 2019-07-11 22:03:33 +00:00
Szimszon
30002b48f9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-07-11 22:03:33 +00:00
Travis Ralston
5daf2741a0
Merge pull request #3212 from matrix-org/travis/close-settings 
Close settings after deactivating
 2019-07-11 16:03:27 -06:00
Travis Ralston
285b126530 Appease the linter 2019-07-11 15:14:05 -06:00
Travis Ralston
7a3aa9be2e Remove unused identityEnabled property from ValidatedServerConfig 
See https://github.com/vector-im/riot-web/issues/10229
 2019-07-11 15:11:09 -06:00
Travis Ralston
ba5238d86a Finally fix tests 2019-07-11 15:01:56 -06:00
Travis Ralston
733401652b Close settings after deactivating 
Fixes https://github.com/vector-im/riot-web/issues/9566
 2019-07-11 14:54:49 -06:00
Travis Ralston
5958cf0693 Merge branch 'develop' into travis/soft-logout-copy 2019-07-11 14:47:13 -06:00
Travis Ralston
698fd3b897 Hopefully actually make the tests happy 2019-07-11 14:45:36 -06:00
Travis Ralston
a9419135aa Fix tests to use UIA proper 2019-07-11 14:38:28 -06:00
Travis Ralston
862fb16120 Send the correct UIA alongside the wrong UIA for backwards comaptibility 
Fixes https://github.com/vector-im/riot-web/issues/10312
 2019-07-11 14:28:10 -06:00
Weblate
3c1935e9a7 Merge branch 'origin/develop' into Weblate. 2019-07-11 19:01:42 +00:00
Travis Ralston
0950037ca3
Merge pull request #3207 from matrix-org/travis/rageshake-required 
Require an issue URL (or notes) on rageshakes
 2019-07-11 13:01:38 -06:00
Travis Ralston
c89a864a82 update copy 2019-07-11 12:54:26 -06:00
Travis Ralston
40b5b784a3 Break out into sections 2019-07-11 12:49:08 -06:00
Travis Ralston
b52b420b1f Fix i18n 2019-07-11 12:39:26 -06:00
Travis Ralston
f6af464fff Verify i18n in CI 
To protect developers from mistakes such as missing strings or getting them out of order.
 2019-07-11 12:37:17 -06:00
Bruno Windels
dedf978948 prevent inserting parts at index -1 for empty documents 2019-07-11 18:46:56 +02:00
Bruno Windels
06fb892df9 prevent autocomplete when doing bulk insertion (paste, drop text) 2019-07-11 18:46:56 +02:00
Bruno Windels
507b89fc61 manually attach input event handler, as React doesn't pass inputType 2019-07-11 18:46:56 +02:00
David Baker
f13dc82d14 getTerms doesn't need an access token 2019-07-11 16:28:24 +01:00
Travis Ralston
000d545ffd Remove misleading text about admins logging people out from soft logout 2019-07-11 09:18:33 -06:00
Travis Ralston
5f9a123a80 Require an issue URL (or notes) on rageshakes 
Fixes https://github.com/vector-im/riot-web/issues/8155
 2019-07-11 09:14:31 -06:00
David Baker
e6fdff43d8 unsused variable 2019-07-11 16:02:02 +01:00