OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
622 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

622 Commits (acce08194d64bd9d2347f3b290ececbf20c144f1)

Author SHA1 Message Date
David Baker acce08194d Apply patch to the right branch: update for new count format 2016-01-21 10:23:18 +00:00
David Baker 83634bf930 Update for new unread count format 2016-01-20 15:56:11 +00:00
David Baker 67ff769962 Include invites in the badge count 2016-01-13 13:00:03 +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 0772f50fab update copyright for 2016 2016-01-07 04:06:52 +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
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
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
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
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
Richard van der Hoff e177263d9f Address review comments 
Minor fixes post-review
 2016-01-04 16:54:27 +00:00
Richard van der Hoff b5eae891b4 Address review comments 
Make onFillRequest always return a promise
 2016-01-04 16:28:32 +00:00
Richard van der Hoff 722c7033bc Merge pull request #73 from matrix-org/rav/on_highlight_click 
Expose onHighlightClick on the event tiles
 2016-01-04 15:23:45 +00:00
Richard van der Hoff 89fcf019e1 Merge branch 'develop' into rav/scrollpanel_promises 
Conflicts:
	src/components/structures/RoomView.js
 2016-01-04 12:56:39 +00:00
Kegan Dougal 75ad96c8ba Null guard getMember 2016-01-04 10:11:42 +00:00
Matthew Hodgson 640aa45956 fix comedy bug where dates in timestamps were spectacularly wrong 2016-01-03 00:40:05 +00:00
Matthew Hodgson 3fd5a3a19f Merge pull request #75 from matrix-org/matthew/css-refactor 
sync CSS classnames with current react component names
 2016-01-03 00:15:07 +00:00
Matthew Hodgson 441a9540ca sync CSS classnames with current react component names 2016-01-03 00:11:11 +00:00
Matthew Hodgson 15f19be408 highlight case insensitively 2015-12-28 03:14:50 +00:00
Matthew Hodgson 970bc84bb6 explicitly rejoin parted rooms 2015-12-28 02:58:40 +00:00
Matthew Hodgson 424540e57a fix NPE if messagePanel isn't yet defined 2015-12-28 02:40:17 +00:00
Matthew Hodgson 50ac0ab4cf wire up RoomAlias's homeserver as intended 2015-12-28 02:36:28 +00:00
Matthew Hodgson bd498b47b3 fix 'this' scoping bug that could never have worked... 2015-12-28 02:36:18 +00:00
Richard van der Hoff 93e7f90ae4 ScrollPanel: implement forward-fill 2015-12-24 14:30:49 +00:00
Richard van der Hoff f2a24521dc Make ScrollPanel keep track of when fill requests are happening 
The dance to avoid doing repeated fill requests on every update is common, so
add it to ScrollPanel. Let onFillRequest return a promise, which prevents any
updates until it completes.
 2015-12-24 14:15:50 +00:00
Richard van der Hoff b0adb1945f Expose onHighlightClick on the event tiles 2015-12-24 13:51:14 +00:00
Richard van der Hoff cc72f7ec24 Use new searchRoomEvents and backPaginateRoomEventsSearch methods 
MatrixClient now exposes higher-level search APIs, so use them.
 2015-12-24 13:33:58 +00:00
Kegan Dougal 103b0a03b1 Hotfix for tab press bug 
The bug was that *sometimes* typing in some letters then
pressing tab would flash red and not auto-complete. This was
happening because nextMatchedEntry was being called with 0
because the state of inPassiveMode was wrong.
 2015-12-24 11:56:50 +00:00
Kegsay b941904078 Merge pull request #33 from matrix-org/matthew/settings 
WIP experiment of turning UserSettings controller into UserSettingsStore
 2015-12-24 10:54:26 +00:00
Kegan Dougal 5d490841bc Review comments 2015-12-24 10:50:47 +00:00
Kegan Dougal 5286ec170f Wrangle CSS to get avatar in right place 2015-12-24 09:20:16 +00:00
Richard van der Hoff 32c1af54d8 Merge pull request #69 from matrix-org/rav/refactor_body_to_html 
Refactor bodyToHtml, and allow onHighlightClicked

Factor out a Highlighter class to avoid passing round the static state
everywhere.

Add an optional 'opts' argument which can take an 'onHighlightClick' member.
 2015-12-23 23:50:38 +00:00
Richard van der Hoff b4436df5e4 Refactor bodyToHtml, and allow onHighlightClicked 
Factor out a Highlighter class to avoid passing round the static state
everywhere.

Add an optional 'opts' argument which can take an 'onHighlightClick' member.
 2015-12-23 23:50:35 +00:00
Kegan Dougal 05d1d7c82d Better error message for failing to set avatars with no connection 2015-12-23 17:30:25 +00:00
Kegan Dougal abb170ebde Keep one source of truth (the Notifier) when toggling notification state. Fixes notifications. 2015-12-23 17:06:30 +00:00
Kegan Dougal a279dce027 Get avatar display and uploads working 2015-12-23 16:52:59 +00:00
Kegan Dougal 19bd39b066 More random tweaks 
- Make onBlur reset the EditText to show that it hasn't submitted it.
- Add the user ID of the logged in user to Advanced.
- Remove remnants of the Save/Cancel buttons.
 2015-12-23 16:02:18 +00:00
Kegan Dougal 72b8cf1be2 Refactor ChangePassword to get it working. Add 'Account' section because trying to make ChangePassword divs part of the same table as the display name is nigh impossible. Feels okay though 2015-12-23 15:38:28 +00:00
Kegan Dougal 6295cf2ec9 Merge branch 'develop' into matthew/settings 2015-12-23 14:19:42 +00:00