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

13174 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
01eacfa26a Regenerate en_EN.json 2019-01-03 16:02:36 -07:00
Travis Ralston
8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real 2019-01-03 16:00:23 -07:00
Travis Ralston
2fe2e76fa5
Merge pull request #2398 from matrix-org/travis/back-out-bad-merge 
Part 1 of 3: Back out bad merge for develop->experimental
 2019-01-03 15:48:42 -07:00
Travis Ralston
6447a60e1f Revert "Merge pull request #2336 from matrix-org/travis/notif-button" 
This reverts commit 96300b45b7.
 2019-01-03 15:44:07 -07:00
David Baker
f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" 
This reverts commit ad47144355.
 2019-01-03 15:37:03 -07:00
Travis Ralston
d111fe27bb Revert "Merge pull request #2396 from matrix-org/travis/room-list-hover" 
This reverts commit 5098b28672.
 2019-01-03 15:36:56 -07:00
Travis Ralston
0978687c65 Revert "Merge pull request #2383 from matrix-org/travis/back-button" 
This reverts commit 78592286bd.
 2019-01-03 15:36:51 -07:00
Travis Ralston
78592286bd
Merge pull request #2383 from matrix-org/travis/back-button 
Fix browser navigation not working between /home, /login, /register, etc
 2019-01-03 14:37:04 -07:00
Travis Ralston
5098b28672
Merge pull request #2396 from matrix-org/travis/room-list-hover 
Don't re-sort the room list if the user is hovering over it
 2019-01-03 14:34:18 -07:00
Travis Ralston
e5192811a1 Add a comment explaining the reason for setting the LOGGED_IN view 2019-01-03 14:23:27 -07:00
Travis Ralston
4c264b87fa Add missing stopPropagation 2019-01-03 14:23:26 -07:00
Travis Ralston
7904b91b58 Use the safer way to set the logged in view state 2019-01-03 14:23:26 -07:00
Travis Ralston
223a49d81f Don't re-sort the room list if the user is hovering over it 
Fixes vector-im/riot-web#5624
 2019-01-03 13:57:20 -07:00
Travis Ralston
95844ebf9d Comment out debugging statements 
They are useful to have around, but not to have enabled all the time.
 2019-01-03 12:15:27 -07:00
Travis Ralston
63a7b86eac Flatten and simplify the memberlist sorting algorithm 
The previous algorithm had a bug where it was getting stuck on the power level comparison, leaving the memberlist incorrectly ordered. The new algorithm uses less branching to try and walk through the different cases instead. Additionally, the steps used to determine the order have changed slightly to better represent an active member list.

This commit also includes changes to try and re-sort the member list more often during presence changes. Events are not always emitted, however. This may be a js-sdk bug but appears to happen prior to these changes as well.

Fixes https://github.com/vector-im/riot-web/issues/6953
 2019-01-03 12:15:19 -07:00
Travis Ralston
35c9dce241 Fix browser navigation not working between /home, /login, /register, etc 
All of the anchors were pointed at `#` which, when clicked, would trigger a hash change in the browser. This change races the change made by the screen handling where the screen handling ends up losing. Because the hash is then tracked as empty rather than `#/login` (for example), the state machine considers future changes as no-ops and doesn't do anything with them.

By using `preventDefault` and `stopPropagation` on the anchor click events, we prevent the browser from automatically going to an empty hash, which then means the screen handling isn't racing the browser, and the hash change state machine doesn't no-op.

After applying that fix, going between pages worked great unless you were going from /login to /home. This is because the MatrixChat state machine was now out of sync (a `view` of `LOGIN` but a `page` of `HomePage` - an invalid state). All we have to do here is ensure the right view is used when navigating to the homepage. 

Fixes https://github.com/vector-im/riot-web/issues/4061

Note: the concerns in 4061 about logging out upon entering the view appear to have been solved. Navigating to the login page doesn't obliterate your session, at least in my testing.
 2019-01-03 12:13:41 -07:00
David Baker
ad47144355
Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental 
Merge develop into experimental
 2019-01-03 18:55:56 +00:00
David Baker
982e037822 Fix merge 2019-01-03 18:05:38 +00:00
David Baker
7d161de35b Partial merge of develop to experimental 
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
 2019-01-03 15:02:58 +00:00
Szimszon
255688546c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1418 of 1418 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-01-03 11:51:57 +00:00
Kévin C
ea7b7797a7 Translated using Weblate (French) 
Currently translated at 100.0% (1418 of 1418 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-01-03 10:57:29 +00:00
Besnik Bleta
451743c459 Translated using Weblate (Albanian) 
Currently translated at 99.2% (1408 of 1418 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-01-03 10:48:02 +00:00
Weblate
90622b58b1 Merge remote-tracking branch 'origin/develop' into develop 2019-01-03 10:27:40 +00:00
David Baker
c11d0bdf0c
Merge pull request #2394 from jryans/key-backup-unverified-creator 
Show in-room reminder when key backup creating device unverified
 2019-01-03 10:27:35 +00:00
Weblate
04b5100dcb Merge remote-tracking branch 'origin/develop' into develop 2019-01-02 22:59:53 +00:00
Stephen Solka
0bb35944f9 replace expect.createSpy() with jest.fn() 
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
 2019-01-02 16:59:48 -06:00
Stephen Solka
c3185a4cdb breaking changes from expect upgrade 
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
 2019-01-02 16:59:48 -06:00
Stephen Solka
22167f8538 upgrade expect to 23.6.0 
Signed-off-by: Stephen Solka <stephen0q@gmail.com>
 2019-01-02 16:59:48 -06:00
Weblate
5c3d11dddc Merge remote-tracking branch 'origin/develop' into develop 2019-01-02 22:35:55 +00:00
Silvano
8e9fcbefff Translated using Weblate (Italian) 
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-01-02 22:35:55 +00:00
Jeff Huang
1d5b3df5f1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-01-02 22:35:54 +00:00
J. Ryan Stinnett
758e867208
Merge pull request #2389 from christopherjmedlin/consistent-flair-ordering 
Consistent flair ordering.
 2019-01-02 16:35:50 -06:00
J. Ryan Stinnett
402f58225f Show in-room reminder when key backup creating device unverified 
If the current device hasn't verified the device that created the account's
current key backup version, then the current device is won't use the key backup.
This change adjusts an existing in-room reminder to do the right thing for this
case by allowing the user to verify the device that created the key backup.

Fixes vector-im/riot-web#7902.
 2019-01-02 15:36:40 -06:00
J. Ryan Stinnett
00405e7f22 Use Nunito font from the server only 
There are various versions of Nunito in circulation, and some have errors in
their metrics or smaller supported character sets. To ensure all users get the
expected experience, don't allow local copies of Nunito to be used.

Fixes vector-im/riot-web#7959.
 2018-12-31 12:26:35 -06:00
Osoitz
3f6bd1f94b Translated using Weblate (Basque) 
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-12-30 12:03:39 +00:00
Weblate
ae175910dd Merge remote-tracking branch 'origin/develop' into develop 2018-12-29 03:01:23 +00:00
Travis Ralston
a3778dc822
Merge pull request #2387 from matrix-org/travis/fix-build 
Fetch matching e2e-test branch
 2018-12-28 20:01:18 -07:00
J. Ryan Stinnett
135a0884c9
Update scripts/fetchdep.sh 
Co-Authored-By: turt2live <travpc@gmail.com>
 2018-12-28 19:42:13 -07:00
Weblate
fb29eff011 Merge remote-tracking branch 'origin/develop' into develop 2018-12-29 02:16:13 +00:00
Karol Kosek
fbded08050 Translated using Weblate (Polish) 
Currently translated at 92.0% (1304 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-12-29 02:16:13 +00:00
Szimszon
2340798fcf Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-12-29 02:16:12 +00:00
Osoitz
d4aab3dc81 Translated using Weblate (Basque) 
Currently translated at 99.5% (1410 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-12-29 02:16:11 +00:00
Travis Ralston
1b8a8e9552
Merge pull request #2385 from matrix-org/travis/7838-logging 
Add some logging for riot-web#7838
 2018-12-28 19:16:07 -07:00
Christopher Medlin
384320e29f Consistently order flairs based on room configuration. 2018-12-24 14:46:36 -08:00
Weblate
9d175f9a05 Merge remote-tracking branch 'origin/develop' into develop 2018-12-24 09:43:08 +00:00
Karol Kosek
09dc0f2a3a Translated using Weblate (Polish) 
Currently translated at 92.0% (1304 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-12-24 09:43:08 +00:00
Besnik Bleta
095f43c896 Translated using Weblate (Albanian) 
Currently translated at 99.2% (1407 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-12-24 09:43:06 +00:00
Richard van der Hoff
3dab1b817c
Merge pull request #2384 from matrix-org/rav/well_known_in_login_response 
Handle well-known data in the login response
 2018-12-24 10:43:01 +01:00
Travis Ralston
310f634a0d Ensure we install the master branch of the e2e tests as a default 2018-12-21 19:24:07 -07:00
Travis Ralston
df89d973a0 Fetch matching e2e-test branch 2018-12-21 18:48:27 -07:00