OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
29,995 Commits
212 Branches
549 Tags
667 MiB
Commit Graph

29995 Commits (d6312606e6e6afd362549670e3b9c98ad9777b21)

Author SHA1 Message Date
Kegsay c54004286b Merge pull request #86 from matrix-org/kegan/guest-peek-then-join 
Add a RoomPreviewBar which asks if you'd like to join a peeked room
 2016-01-13 13:23:30 +00:00
Kegan Dougal 69cac307d9 Merge branch 'develop' into kegan/guest-peek-then-join 2016-01-13 13:22:58 +00:00
Matthew Hodgson c9c496f0e5 WIP all new roomsettings 2016-01-13 13:15:13 +00:00
Matthew Hodgson 133a240fe9 Merge pull request #83 from matrix-org/matthew/roomsettings 
fix up RoomSettings somewhat and implement room colors
 2016-01-13 13:06:37 +00:00
Matthew Hodgson f715662d18 merge in develop, fixing conflicts 2016-01-13 13:06:27 +00:00
Matthew Hodgson 3934b42ac8 s/m.room.color_scheme/org.matrix.room.color_scheme/g # to make kegan happier 2016-01-13 13:01:00 +00:00
David Baker 67ff769962 Include invites in the badge count 2016-01-13 13:00:03 +00:00
Kegsay d10c96ede8 Merge pull request #87 from matrix-org/kegan/password-reset 
Implement password reset
 2016-01-13 10:35:54 +00:00
David Baker 2eb724f1f0 Merge pull request #85 from matrix-org/read_marker_animate 
Improve read markers so they show at appropriate times and animate away.
 2016-01-12 17:57:14 +00:00
David Baker 848cb30ea4 Remove ill-concieved delay before sending read receipts & instead just wait a bit before removing the ghost read marker. 2016-01-12 17:48:34 +00:00
Kegan Dougal ec4e0d7687 Implement password reset 
This adds a link to the login screen with "Forgot your password?". Clicking it
takes you to a form with fields for an email address and a new password. This
makes the same API calls as the Angular SDK.

Manually tested resetting + not clicking link + invalid email and it all seems
to work.
 2016-01-12 17:20:16 +00:00
David Baker 4a8b5dfe3a Don't display read markers (or ghosts) above our own messages. 2016-01-12 17:18:16 +00:00
David Baker 8b730c0a5d PR feedback 2016-01-12 16:38:09 +00:00
David Baker 37f1b4ba8a Tweaked style means we can have 100% width (well 99% otherwise we gain a horizontal scrollbar) 2016-01-12 14:13:42 +00:00
Kegan Dougal eb955eb371 Add a RoomPreviewBar which asks if you'd like to join a peeked room 2016-01-12 14:11:15 +00:00
Richard van der Hoff cd52549713 s/function/func/ in PropTypes declarations 2016-01-12 13:11:53 +00:00
Matthew Hodgson bd226609d0 fix onclick for all of room name 2016-01-11 18:44:36 +00:00
manuroe 953e138317 Settings page: Made the push notifications settings a separate component. This component is currently implemented at the app level 2016-01-11 17:05:27 +01:00
Richard van der Hoff 5a0adb9cdc Merge pull request #80 from matrix-org/rav/bad_scroll_on_video_resize 
Make the scrollpanel update itself correctly on video resize.

When we first get video, the video component will resize itself. This will
cause the page to be reflowed, but that doesn't trigger an update on the gemini
scrollbar. We therefore need to force an update on the messagepanel. Implement
this by providing an onResize property on the CallView component.

We need to do the same when we change the maxHeight on the video panel.

The same applies to resizing of the MessageComposer. That was previously
handled with a fugly roomView.forceUpdate() from MessageComposer - make it use
the same mechanism.

Finally: the messageComposer is at least 70 pixels, and up to 100 pixels high -
not 36. Fix the auxPanelMaxHeight calculation - and use a static constant
rather than hardcoding the number to avoid this happening again.
 2016-01-11 15:29:03 +00:00
Richard van der Hoff 243b2e4587 Make the scrollpanel update itself correctly on video resize. 
When we first get video, the video component will resize itself. This will
cause the page to be reflowed, but that doesn't trigger an update on the gemini
scrollbar. We therefore need to force an update on the messagepanel. Implement
this by providing an onResize property on the CallView component.

We need to do the same when we change the maxHeight on the video panel.

The same applies to resizing of the MessageComposer. That was previously
handled with a fugly roomView.forceUpdate() from MessageComposer - make it use
the same mechanism.

Finally: the messageComposer is at least 70 pixels, and up to 100 pixels high -
not 36. Fix the auxPanelMaxHeight calculation - and use a static constant
rather than hardcoding the number to avoid this happening again.
 2016-01-11 15:28:59 +00:00
Richard van der Hoff e7740cbc8b Merge pull request #84 from matrix-org/rav/fix_refs_npes 
Fix some races due to promises completing after we've switched rooms
 2016-01-11 15:25:17 +00:00
Kegsay 3cd805e71d Merge pull request #82 from matrix-org/kegan/guest-access 
Implement guest access and upgrading
 2016-01-11 15:19:39 +00:00
Kegan Dougal fcdfce3760 Toggle auto-reg off when successfully registered as a guest. 
Otherwise if you refresh -> auto-reg -> logout, you will get an infinite
spinner as it will think it is auto-registering again.
 2016-01-11 15:12:55 +00:00
Matthew Hodgson ddd8838b24 linkify topics 2016-01-11 12:46:12 +00:00
Richard van der Hoff c30aeac315 Set our own booleans instead of using isMounted 2016-01-11 11:38:04 +00:00
Matthew Hodgson 6351258b0e use room.getImplicitRoomName() from matthew/roomsettings2 branch of matrix-js-sdk for the placeholder roomname 2016-01-10 20:01:30 +00:00
Matthew Hodgson 0cb6094992 show implicit names as placeholders if available 2016-01-10 18:46:08 +00:00
Matthew Hodgson d39a9a0f18 bring back select-all-on-click 2016-01-10 13:14:12 +00:00
Matthew Hodgson aa80a5d494 fix layout bug for general auxPanel 2016-01-10 13:03:37 +00:00
Matthew Hodgson 684255044a switch EditableText to be built on contentEditable rather than switching divs and inputs, so that it can be used for managing multiline content like topics and room names, and use it in RoomHeader/RoomSettings 2016-01-10 12:56:45 +00:00
Matthew Hodgson 4f14ead741 idiot - fix bind warnings 2016-01-10 04:22:09 +00:00
Matthew Hodgson 2d5cba89e8 tint Dave's read-up-to marker 2016-01-09 21:27:00 +00:00
Matthew Hodgson 27d72fb1dc tint Dave's read-up-to marker 2016-01-09 01:05:43 +00:00
David Baker 1507b39940 Redundant line. 2016-01-09 00:07:51 +00:00
David Baker 581111e1a7 Use wheel, not scroll as we get scroll events from auto scroll down. Also only do the cursor move check for mouse move events. 2016-01-09 00:06:54 +00:00
David Baker 7b2d56f619 Calculate what event we send a read receipt for after the delay so we send a receipt for the one the user actually settles on. 2016-01-08 22:19:51 +00:00
David Baker 1c4d1d2507 Make scrolling count as user activity. 2016-01-08 22:19:31 +00:00
David Baker 7913b0b465 Length of the returned array, not the index of the timeline event. 2016-01-08 21:51:14 +00:00
David Baker d63f83187f Only show read marker if it's somewhere other than at the bottom, make it animate away and put a short delay before the read marker advances so quickly changing to a room and then away again doesn't advance your read marker. 2016-01-08 21:18:47 +00:00
David Baker b37ea52a1f Some null checks in animation code 2016-01-08 16:47:13 +00:00
Richard van der Hoff 223f6f7914 Fix sorting of search result highlights 
Make sure that we *actually* give preference to longer search result
highlights; it turns out that the code that looked like it was doing so has
never worked.
 2016-01-08 13:25:03 +00:00
Richard van der Hoff 62cf34b58c Fix some races due to promises completing after we've switched rooms 
Add a few isMounted() checks to promise handlers so that we don't end up
throwing NPEs.
 2016-01-08 12:03:45 +00:00
Matthew Hodgson ef00a1624d fix up RoomSettings somewhat and implement room colors 2016-01-08 03:22:38 +00:00
Kegan Dougal a3df50f4c3 Implement guest account upgrading 2016-01-07 17:23:32 +00:00
Kegan Dougal 458d71a496 Attempt to peek into rooms we don't know about. 
Also: display an error dialog if we fail to join the room if you click Join Room.
 2016-01-07 16:22:17 +00:00
Kegan Dougal c64f36c81b Merge branch 'develop' into kegan/guest-access 2016-01-07 13:21:06 +00:00
David Baker ba51c68844 Merge remote-tracking branch 'origin/notif_sync' into unread_sync 2016-01-07 11:44:50 +00:00
Matthew Hodgson 8170288acb Merge pull request #77 from matrix-org/matthew/dynamic-svg 
Make SVGs and CSS dynamically recolourable
 2016-01-07 11:42:30 +00:00
David Baker dc2e395878 Merge pull request #81 from matrix-org/green_line 
Add self read-up-to marker
 2016-01-07 11:40:02 +00:00
David Baker ef473dec72 Add read-up-to green* line 
* not actually green without CSS in vector-web
 2016-01-07 11:18:41 +00:00