f997a6fff2
Merge pull request #206 from matrix-org/dbkr/invites_silently_fail
...
Make 3pid invite failures show errors
2016-03-10 10:07:47 +00:00
a74e7b45d0
Return the promise so the failure actually propagates through the promise chain. Makes the invite error handling code work.
...
Fixes https://github.com/vector-im/vector-web/issues/691
2016-03-09 18:48:38 +00:00
ec2e27a754
Merge pull request #205 from matrix-org/rav/shouldComponentUpdates_2
...
Re-introduce shouldComponentUpdate methods in RoomView and TimelinePanel
2016-03-09 17:25:11 +00:00
aabdaa737e
Merge pull request #204 from matrix-org/rav/jump_to_read_marker_fix
...
Make jump-to-read-marker work when the RM event isn't loaded.
2016-03-09 16:12:16 +00:00
4b333d2363
Update the timeline when a local echo arrives
2016-03-09 15:56:54 +00:00
6c928f12b2
ForceUpdate the scrollpanel when the aux panel changes size
...
Catch some more cases when we ought to be updating the gemini scroll stuff.
2016-03-09 15:56:54 +00:00
393e8ff612
Revert "Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates""
...
Put the shouldComponentUpdate methods back in, now that Matthew has stopped
demoing.
This reverts commit 606fdcb8df
2016-03-09 15:56:53 +00:00
a9da0a014e
Merge pull request #203 from matrix-org/rav/optimize_resize
...
Don't forceUpdate the message panel on resize
2016-03-09 15:55:33 +00:00
1a371b346e
remove spurious debug
2016-03-09 15:51:17 +00:00
d54ee4f247
Merge pull request #201 from matrix-org/dbkr/reuse_guest_account
...
Use the guest access tokens sent in 3pid invite emails.
2016-03-09 15:49:30 +00:00
b45c256427
Don't forceUpdate the message panel on resize
...
We don't really need to forceUpdate() the entire timeline panel every time
something might resize it. It is sufficient to forceUpdate the ScrollPanel.
2016-03-09 15:40:19 +00:00
f60ac2aa5f
Make jump-to-read-marker work when the RM event isn't loaded.
...
If the event corresponding to the read-up-to mark hasn't been loaded into the
timeline window, we can't simply scroll to it. Instead, reload the timeline,
centered on the RM event.
Fixes https://github.com/vector-im/vector-web/issues/1055
2016-03-09 07:54:49 +00:00
f41c0d9bbf
Merge pull request #202 from matrix-org/rav/fix_image_load_again
...
Fix checkScroll after image load
2016-03-08 15:38:27 +00:00
6e23623c28
Fix checkScroll after image load
...
Make the onImageLoad handler call checkScroll on the right thing. This was
originally done in commit 99d2392
2016-03-07 22:23:14 +00:00
606fdcb8df
Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates"
...
This reverts commit a7c75b1315b66ca74ede
2016-03-07 17:28:50 +00:00
42a90f49c2
Use the guest access tokens sent in 3pid invite emails.
2016-03-07 17:11:01 +00:00
a2c6bd0e6c
Merge pull request #199 from mebjas/develop
...
fixed issue vector-im/vector-web 1079
2016-03-07 16:15:45 +00:00
7e7493b336
removed typeof and todo
...
Signed-off-by: Minhaz A V <minhazav@gmail.com>
2016-03-07 21:16:35 +05:30
a7c75b1315
Merge pull request #193 from matrix-org/rav/shouldComponentUpdates
...
Add shouldComponentUpdate() methods to RoomView and TimelinePanel
2016-03-07 11:50:38 +00:00
a82d3710d1
provide sensibile defaults for PasswordLogin
2016-03-06 18:42:09 -05:00
0bb58dd60c
brings back the functionality in login/register/screens that got lost in @kegsay's refactor. specifically:
...
1) custom HS/IS urls are now persisted in HTML5 local storage. As a result, all the login components now distinguish between default HS/IS URLs and custom specified ones again. (
2) custom HS/IS urls are synchronised between the instances of ServerConfig found in the Login, Registration and Forgot Password screens.
3) username are persisted over changing homeserver (but not password, to stop accidentally leaking passwords to the wrong server)
4) correctly interpret a blank URL field as meaning the placeholder text
5) when toggling custom URLs on and off, remember what the custom values were, and use the default URLs if custom mode is not engaged
also, guest access now upholds custom HS/IS URLs found in local storage rather than being limited to the server config ()
also adds assorted comments and improved console debug and a few minor cosmetic changes to the login components.
this commit sponsored by VS27...
2016-03-06 14:33:36 -05:00
3c1312a9e6
fixed issue vector-im/vector-web 1079
2016-03-05 23:36:24 +05:30
b66ca74ede
fix comments
2016-03-05 02:35:17 +00:00
0d841551a0
prettyprint conference joins and parts properly
2016-03-05 02:30:57 +00:00
052925d95b
Merge pull request #194 from matrix-org/audio_notifications
...
Make audio notifications work
2016-03-04 18:24:01 +00:00
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
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
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
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
66bed45e67
Merge pull request #195 from matrix-org/dbkr/reenable_upgrade_registration
...
Re-enable upgrade registration.
2016-03-04 17:54:50 +00:00
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
068429f3e3
Tidy up starting from a room alias when not logged in.
2016-03-04 17:37:06 +00:00
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
fcf17adf14
hopefully fix bug186 by ensuring room members never have null users
2016-03-04 16:57:20 +00:00
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
2a1e8ef39b
Make audio notifs only play if the sound tweak is set
2016-03-04 15:29:33 +00:00
bc5ae6a6ad
Add shouldComponentUpdate() methods to RoomView and TimelinePanel
...
This will avoid re-rendering the whole RoomView every time we get a scroll
event, and might even help with https://github.com/vector-im/vector-web/issues/1056 .
2016-03-04 14:51:55 +00:00
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
1c90288bfb
Merge pull request #191 from ajohnson23/audio_notifications
...
Added very basic audio notifications.
2016-03-04 14:17:00 +00:00
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
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
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
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
82cdc15faf
unneccessary '+'
2016-03-04 11:37:37 +00:00
5b505cd32d
Remove (broken, as it turns out) permission logic from react sdk and use https://github.com/matrix-org/matrix-js-sdk/pull/94 instead.
2016-03-03 17:58:41 +00:00
05a3dab528
fix roomavatars on FF
2016-03-03 16:16:40 +00:00
27fea6bc95
make the newly invited warning prettier
2016-03-03 15:02:11 +00:00
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
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
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