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

1190 Commits (b66ca74ede3f84cffd69b6b24f23a4d0bee2caa8)

Author SHA1 Message Date
Matthew Hodgson b66ca74ede fix comments 2016-03-05 02:35:17 +00:00
David Baker 052925d95b Merge pull request #194 from matrix-org/audio_notifications 
Make audio notifications work
 2016-03-04 18:24:01 +00:00
David Baker 69a8d65407 Don't pause the audio when we hide the notif: shouldn't be necessary and could cause sound to stop mid-way if a prior notif times out while the sound from a later one is playing. 2016-03-04 18:16:02 +00:00
Richard van der Hoff 7820a5d900 Merge pull request #189 from matrix-org/rav/fix_timeline_react_keys 
Flatten arrays of components before adding to messagepanel li
 2016-03-04 17:56:18 +00:00
Richard van der Hoff 318bcb1284 Merge pull request #192 from matrix-org/rav/fix_read_receipts 
Make sure we update the timelinepanel when a read-receipt arrives
 2016-03-04 17:55:29 +00:00
Richard van der Hoff 1738fab2ee Merge pull request #190 from matrix-org/rav/reduce_timeline_limit 
Reduce the number of messages we show in the DOM to 250
 2016-03-04 17:54:59 +00:00
David Baker 66bed45e67 Merge pull request #195 from matrix-org/dbkr/reenable_upgrade_registration 
Re-enable upgrade registration.
 2016-03-04 17:54:50 +00:00
David Baker b9f508a61e Merge pull request #197 from matrix-org/dbkr/starting_room_alias_tidy 
Tidy up starting from a room alias when not logged in.
 2016-03-04 17:54:37 +00:00
David Baker 068429f3e3 Tidy up starting from a room alias when not logged in. 2016-03-04 17:37:06 +00:00
David Baker ed4774efdb Merge pull request #196 from matrix-org/matthew/bug186 
hopefully fix bug186 by ensuring room members never have null users
 2016-03-04 16:58:56 +00:00
Matthew Hodgson fcf17adf14 hopefully fix bug186 by ensuring room members never have null users 2016-03-04 16:57:20 +00:00
David Baker 4da0e2fd95 Re-enable upgrade registration. 
Revert https://github.com/vector-im/vector-web/issues/818 now that https://github.com/vector-im/vector-web/issues/759 is fixed.
 2016-03-04 15:41:32 +00:00
David Baker 2a1e8ef39b Make audio notifs only play if the sound tweak is set 2016-03-04 15:29:33 +00:00
Richard van der Hoff 31df97e486 Make sure we update the timelinepanel when a read-receipt arrives 
Fixes https://github.com/vector-im/vector-web/issues/1094
 2016-03-04 14:47:11 +00:00
David Baker 1c90288bfb Merge pull request #191 from ajohnson23/audio_notifications 
Added very basic audio notifications.
 2016-03-04 14:17:00 +00:00
Richard van der Hoff c14b62ee64 Reduce the number of messages we show in the DOM to 250 
... as per https://github.com/vector-im/vector-web/issues/1077
 2016-03-04 14:07:18 +00:00
Andrew Johnson 3bb824484f Added very basic audio notifications. 
This plays the same message.ogg/message.mp3 regardless of event type.
It also does not check the user's event settings (LOUD/OFF/etc), instead
playing a sound upon every single notification.
Clearly, it still needs some work.

Signed-off-by: Andrew Johnson <ajohnson@draster.com>
 2016-03-04 09:07:18 -05:00
Richard van der Hoff 6e86d7553f Flatten arrays of components before adding to messagepanel li 
Avoid updating the whole DOM when we paginating by making sure the keys are
right
 2016-03-04 13:49:15 +00:00
David Baker 4a3053a90b Merge pull request #185 from matrix-org/dbkr/threepid_invite_wording 
Fix 3pid invite acceptance with desired wording.
 2016-03-04 11:37:55 +00:00
David Baker 82cdc15faf unneccessary '+' 2016-03-04 11:37:37 +00:00
Matthew Hodgson 05a3dab528 fix roomavatars on FF 2016-03-03 16:16:40 +00:00
Matthew Hodgson 27fea6bc95 make the newly invited warning prettier 2016-03-03 15:02:11 +00:00
Matthew Hodgson cfd6546fe9 default missing state_default to 50, as per https://github.com/matrix-org/matrix-doc/pull/286/files 2016-03-03 12:11:22 +00:00
David Baker acaacae697 Fix 3pid invite acceptance with desired wording. 
Fixes https://github.com/vector-im/vector-web/issues/1070
 2016-03-02 16:04:24 +00:00
David Baker 1522c0ad76 Merge pull request #184 from matrix-org/dbkr/roomheader_unused_voip 
Remove unused voice & video on-clicks from RoomHeader.
 2016-03-02 14:58:16 +00:00
David Baker 45857fa12c Remove unused voice & video on-clicks from RoomHeader. 2016-03-02 14:54:38 +00:00
David Baker 0051c91126 Merge pull request #183 from matrix-org/dbkr/3pid_invite_metadata 
Pass room metadata from 3pid invite emails all the way through to the…
 2016-03-02 14:31:58 +00:00
David Baker c585b3edee anothert stray room_ 2016-03-02 14:31:01 +00:00
David Baker de2eaa3078 Document inviterName 2016-03-02 14:04:51 +00:00
David Baker 5827a883bf This should be just oob_data too 2016-03-02 14:02:36 +00:00
David Baker 4184158a9a Make comment match reality, attempt 2. 2016-03-02 14:01:21 +00:00
David Baker 6319c85272 Make comment match reality 2016-03-02 13:59:55 +00:00
David Baker 5bd2316e7f Oops, it's just oob_data here 2016-03-02 13:58:52 +00:00
David Baker 2dbed2aa02 Clarify when room / oobData can/can't be set 2016-03-02 11:59:17 +00:00
David Baker d61f383748 Oops, actually assign variable 2016-03-02 11:57:05 +00:00
David Baker acb5f5d69b This should be props, not state 2016-03-02 11:56:18 +00:00
David Baker 7ae2c5b11b Document fields of oob_data 2016-03-02 11:51:47 +00:00
David Baker 10b1b6443d Fix rooms we don't have any info about 2016-03-02 10:59:54 +00:00
David Baker 9085a2a866 Pass room metadata from 3pid invite emails all the way through to the relevant components so we can display it. 2016-03-01 18:23:57 +00:00
Richard van der Hoff 3718377355 Merge pull request #182 from matrix-org/rav/pagination_race 
Fix a race condition handling gappy syncs
 2016-03-01 11:50:09 +00:00
Richard van der Hoff 1e3040d19a Fix a race condition handling gappy syncs 
We had a problem handling gappy syncs: resetting the timeline would trigger a
pagination request (which would return no results, because there are no events
at this point); this would make the pagination requests which are spawned when
we process the events in the sync get ignored - with the result that we get a
blank window.

The fix is to avoid the ScrollPanel when we are processing new live events and
tell the TimelineWindow to paginate itself directly.
 2016-03-01 10:52:56 +00:00
Richard van der Hoff dc9a7e5e28 Merge pull request #181 from matrix-org/rav/issue_1049 
Fix CallView in left panel
 2016-02-29 17:51:39 +00:00
Richard van der Hoff 559f60d43e unmounted check in TimelinePanel 2016-02-29 17:06:38 +00:00
Richard van der Hoff 30abf81ed4 Fix CallView in left panel 
Make CallView cope with not being passed a room. Fixes
https://github.com/vector-im/vector-web/issues/1049, introduced in
7a20fda7, which made vector crash when you switched to another room with an
active call.
 2016-02-29 13:43:22 +00:00
Richard van der Hoff db1e1c7df0 Fix NPE when re-joining a room 
Fix the length check on state.events
 2016-02-26 23:05:41 +00:00
Richard van der Hoff acfc7b3719 Don't throw exceptions when room changes in a timelinepanel 
This does happen - fortunately only in circumstances where it's not a
problem. Downgrade the exception to a warning.

Fixes https://github.com/vector-im/vector-web/issues/1036
 2016-02-26 22:39:25 +00:00
Richard van der Hoff 543f444174 Merge commit 'd9e58d9' into develop 
Undo an over-zealous force-push :(
 2016-02-26 16:31:02 +00:00
Richard van der Hoff a4402073fb Merge branch 'rav/roomview_works' into develop 2016-02-26 14:04:15 +00:00
Richard van der Hoff d5c83347a6 Merge pull request #173 from matrix-org/rav/configurable_sync_limit 
Make the initialSyncLimit configurable
 2016-02-26 13:57:30 +00:00
Richard van der Hoff a9d363c668 Merge pull request #180 from matrix-org/rav/optimise_timeline_load 
Make room-switching quicker
 2016-02-26 13:29:35 +00:00