OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
14,575 Commits
211 Branches
549 Tags
666 MiB
Commit Graph

14575 Commits (9da13fe430eff77ac765c00f091215659c047efd)

Author SHA1 Message Date
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
David Baker 99abd58f1a Merge remote-tracking branch 'origin/develop' into notif_sync 2016-01-07 10:41:16 +00:00
David Baker 287da54fbc Address PR comments 2016-01-07 10:38:44 +00:00
Matthew Hodgson fd32362aa6 oops, initialise fixups per-object, not per-prototype 2016-01-07 10:18:18 +00:00
Matthew Hodgson 0772f50fab update copyright for 2016 2016-01-07 04:06:52 +00:00
Matthew Hodgson 296b626ed9 oops, we actually need to cache the fixups in TintableSvg 2016-01-07 03:59:09 +00:00
Matthew Hodgson 0f52c0a514 make TintableSvgs responsible for updating their own tints, and stop storing SVG DOM fragments in Tinter to avoid leaking them 2016-01-07 03:39:00 +00:00
David Baker 76177378f3 Comment & change the default to assuming there are unread messages. 2016-01-06 18:28:13 +00:00
David Baker 04c7792b51 Use our read receipt to calculate whether rooms are unread. 2016-01-06 18:07:24 +00:00
Richard van der Hoff 4e4f8fad23 Merge pull request #79 from matrix-org/rav/dispatcher_leak 
VideoView: Fix a dispatcher leak
 2016-01-06 17:52:13 +00:00
Richard van der Hoff f4fcc91481 Merge pull request #72 from matrix-org/rav/search_results_panel 
Factor out a separate SearchResultTile
 2016-01-06 17:51:14 +00:00
Kegan Dougal 29587ec347 No longer persist guest room IDs. Replace with transient peeked room ID. 2016-01-06 17:33:00 +00:00
Richard van der Hoff 4624e7a485 Address review comments 
s/onClick/onSelect/
 2016-01-06 16:46:29 +00:00
Richard van der Hoff 0d0a379cd8 VideoView: Fix a dispatcher leak 
Make sure we unregister from the dispatcher when the videoview goes
away.
 2016-01-06 15:17:58 +00:00
Kegan Dougal afbb451d4a Merge branch 'develop' into kegan/guest-access 2016-01-06 13:59:33 +00:00
Matthew Hodgson 8c1bb90347 add fixme 2016-01-06 02:41:10 +00:00
Matthew Hodgson f499c60b12 sundry PR feedback 2016-01-06 02:29:08 +00:00
Matthew Hodgson 44a0fa19ae comment /tint 2016-01-06 02:12:53 +00:00
Matthew Hodgson 509ea7c4f3 factor out tintable SVGs into their own component, and use plain DOM onload rather than react synthetic events 2016-01-06 02:11:07 +00:00
Matthew Hodgson 9e8daba8d7 Merge branch 'develop' into matthew/dynamic-svg 2016-01-06 01:11:34 +00:00
Richard van der Hoff 75302b1f97 Factor out a separate SearchResultTile 2016-01-05 17:56:59 +00:00