OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
41,662 Commits
214 Branches
562 Tags
496 MiB
Commit Graph

41662 Commits (32fcf8d99556b7a1c2deec1f0fc2a0b35973335a)

Author SHA1 Message Date
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
Richard van der Hoff 49c1d39f93 Merge pull request #71 from matrix-org/rav/new_search_api 
Use new searchRoomEvents and backPaginateRoomEventsSearch methods
 2016-01-05 17:56:13 +00:00
Kegan Dougal d729dee31d Make the settings page load for guests. Add checkboxes for guest r/w 2016-01-05 17:34:25 +00:00
Richard van der Hoff a2b7c9ba96 RoomHeader: Make 'undefined' check more explicit 2016-01-05 15:57:58 +00:00
Richard van der Hoff 4730179c26 Fix slight mis-merge 
We need to return 'true' from our promise of search result pagination.

Also inline _backPaginateSearch which mostly served to confuse, and use
debuglog instead of checking DEBUG_SCROLL
 2016-01-05 15:51:16 +00:00
Richard van der Hoff 583d35e39f Merge branch 'develop' into rav/new_search_api 
Conflicts:
	src/components/structures/RoomView.js
 2016-01-05 15:38:30 +00:00
Richard van der Hoff 6c99fab3dd Highlight the search term in search results 
Sometimes we don't get the search term back in the highlights list, so make
sure we add it.
 2016-01-05 15:28:32 +00:00
Matthew Hodgson a9f7bf63ff spell out we're doing 3PID invites 2016-01-05 14:24:36 +00:00
Richard van der Hoff 355cabb7ee Merge pull request #70 from matrix-org/rav/scrollpanel_promises 
Make ScrollPanel keep track of when fill requests are happening
 2016-01-05 13:52:04 +00:00
Kegan Dougal 8bd4fdbd5a Don't set presence 2016-01-05 13:24:05 +00:00
Kegan Dougal ae7b2d54bb Merge branch 'develop' into kegan/guest-access 2016-01-05 11:39:36 +00:00
Kegsay a6e735dbde Merge pull request #76 from matrix-org/kegan/bugfix-read-receipt 
Null guard getMember

Fixes https://github.com/vector-im/vector-web/issues/566
 2016-01-05 11:26:04 +00:00
Richard van der Hoff 7640dd52e3 Merge pull request #78 from matrix-org/rav/fix_unread_messages 
Make ScrollPanel.isAtBottom more reliable
 2016-01-05 11:18:40 +00:00
Richard van der Hoff 2b169b06f5 Make ScrollPanel.isAtBottom more reliable 
Given we want to use isAtBottom to figure out whether to show 'unread messages'
counts, we ought to return the current scroll state, rather than the saved one.

This fixes vector-im/vector-web#576
 2016-01-05 11:02:18 +00:00