mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
12762 commits 203 branches 553 tags 406 MiB
Commit graph

12762 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
8fa7ec0fac fix lint 2019-01-07 16:03:24 +01:00
Bruno Windels
81c48f07c7 clear width of right panel container when collapsed in grid view 2019-01-07 15:20:39 +01:00
Bruno Windels
b63bd5ea54 allow right panel to be hidden (although container is still visible) 2019-01-07 14:59:00 +01:00
Bruno Windels
290dc9d8fb Merge branch 'experimental' into bwindels/roomgridview-experimental 2019-01-07 14:17:57 +01:00
Travis Ralston
5fb6da886c
Merge pull request #2404 from jaywink/jaywink/improve-readme-for-devs 
Clarify readme instructions for developers
 2019-01-07 01:01:59 -07:00
Travis Ralston
633b8d419f
Mention node 8.x as recommended in development docs 
Co-Authored-By: jaywink <mail@jasonrobinson.me>
 2019-01-06 15:13:07 +02:00
J. Ryan Stinnett
a7c9d4ea1f Use same link style in HTML messages 
Links in HTML messages were missing the usual underline style, making them
look different from links in text messages (which already do this).

Fixes vector-im/riot-web#4655.
 2019-01-04 18:32:43 -06:00
J. Ryan Stinnett
5419b4279b Simplify create key backup maze 
The download / copy actions to store the new recovery key now send you forward
(the most likely case) with a Back button in case you wanted to also do the
other storing type.
 2019-01-04 17:14:10 -06:00
J. Ryan Stinnett
2769e68169 Give the create key backup title more space 2019-01-04 17:14:10 -06:00
J. Ryan Stinnett
97747640bb Record keys button styling tweak 2019-01-04 17:14:10 -06:00
J. Ryan Stinnett
e6b6b463ce
Merge pull request #2401 from christopherjmedlin/name-command 
Add slash command for changing room name
 2019-01-04 14:22:40 -06:00
Christopher Medlin
e102000e58 Change to 'roomname' instead of 'name'. 2019-01-04 11:29:51 -08:00
Travis Ralston
7b6a51cf9f
Merge pull request #2381 from matrix-org/travis/fix-memberlist-order 
Flatten and simplify the memberlist sorting algorithm
 2019-01-04 08:13:45 -07:00
Jason Robinson
e876edcbc3 Clarify readme instructions for developers 
Setting up the SDK for development, I noticed that 3 tests failed on
develop branch. Linking the JS SDK made the tests pass. It looks like
the assumption is that developers link against the develop branch
of JS SDK to develop the React SDK.

Clarify this in the readme for completeness sake.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2019-01-04 11:01:35 +02:00
Travis Ralston
0ebde5266e Appease the linter again 2019-01-03 22:40:44 -07:00
Travis Ralston
f59625f7bd Fix last active test 
Time is backwards from all the other tests: larger is older, so we want LessThanOrEqual. Also ensure all the power levels are the same to prevent the sort algorithm from running a PL ordering.
 2019-01-03 22:24:24 -07:00
Travis Ralston
34d5870a03 Appease the linter 2019-01-03 22:07:09 -07:00
Travis Ralston
5a2113e1a9 Fix a comparison bug in ordering the MemberList 2019-01-03 21:56:19 -07:00
Travis Ralston
77dfba8a22 Add unit tests for MemberList 
Particularly the ordering of the tiles.
 2019-01-03 21:55:52 -07:00
Travis Ralston
cc8fa7911b Merge remote-tracking branch 'origin/experimental' into travis/fix-memberlist-order 2019-01-03 20:01:28 -07:00
Travis Ralston
e1d2065f73
Merge pull request #2403 from matrix-org/travis/fix-status-messages 
Tiny fixes for custom status messages on experimental
 2019-01-03 18:23:52 -07:00
Travis Ralston
93ea9d3617 Condense .mx_RoomTile_avatar properties 
Looks like the develop->experimental merge duplicated the definition. We'll take the best of both and make it work.
 2019-01-03 18:07:34 -07:00
Travis Ralston
852d6df580 Fix composer avatar being an oval when a custom status is set 
Fixes this: https://t2l.io/_matrix/media/v1/download/t2l.io/0d5c7fa9a4b5bf226a020def8480a887
 2019-01-03 18:06:37 -07:00
Travis Ralston
51dc1fe9bf Fix badges on room tiles not being right aligned 
Thanks to Ryan for fixing this!

Problem: https://t2l.io/_matrix/media/v1/download/t2l.io/da6fccb60969da1c455630faae990881
 2019-01-03 18:05:59 -07:00
J. Ryan Stinnett
920911c0a1 Room list fixes for custom status 2019-01-03 18:49:15 -06:00
Christopher Medlin
c89b6e1e27 Add slash command for changing room name 
Signed-off-by: Christopher Medlin <christopherjmedlin@protonmail.com>
 2019-01-03 15:42:17 -08:00
Travis Ralston
46aa543934
Merge pull request #2400 from matrix-org/travis/re-apply-exp-changes 
Part 3 of 3: Apply today's changes to experimental again
 2019-01-03 16:42:05 -07:00
Travis Ralston
ff2faf7996 Add missing CSS to dharma theme 2019-01-03 16:32:52 -07:00
Travis Ralston
502288d4cc Merge branch 'travis/room-list-hover' into travis/re-apply-exp-changes 2019-01-03 16:28:05 -07:00
Travis Ralston
1481dcf9d7 Don't re-sort the room list if the user is hovering over it 
Fixes vector-im/riot-web#5624
 2019-01-03 16:27:59 -07:00
Travis Ralston
42ddea10ba Merge branch 'travis/back-button' into travis/re-apply-exp-changes 2019-01-03 16:26:18 -07:00
Travis Ralston
643dd5ca47 Add a comment explaining the reason for setting the LOGGED_IN view 2019-01-03 16:26:09 -07:00
Travis Ralston
d8f6a7c684 Add missing stopPropagation 2019-01-03 16:26:01 -07:00
Travis Ralston
2e5b3ec0f1 Use the safer way to set the logged in view state 2019-01-03 16:25:55 -07:00
Travis Ralston
8f5e825cd5 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 16:25:51 -07:00
Travis Ralston
5d3f585c1e
Merge pull request #2399 from matrix-org/travis/develop-for-real 
Part 2 of 3: Merge develop->experimental minus #2336
 2019-01-03 16:15:53 -07:00
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