ec2e27a754
Merge pull request #205 from matrix-org/rav/shouldComponentUpdates_2
Richard van der Hoff
2016-03-09 17:25:11 +00:00
aabdaa737e
Merge pull request #204 from matrix-org/rav/jump_to_read_marker_fix
Richard van der Hoff
2016-03-09 16:12:16 +00:00
4b333d2363
Update the timeline when a local echo arrives
Richard van der Hoff
2016-03-09 15:45:56 +00:00
6c928f12b2
ForceUpdate the scrollpanel when the aux panel changes size
Richard van der Hoff
2016-03-08 12:16:34 +00:00
393e8ff612
Revert "Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates""
Richard van der Hoff
2016-03-07 22:27:35 +00:00
a9da0a014e
Merge pull request #203 from matrix-org/rav/optimize_resize
Richard van der Hoff
2016-03-09 15:55:33 +00:00
1a371b346e
remove spurious debug
Richard van der Hoff
2016-03-09 15:29:12 +00:00
d54ee4f247
Merge pull request #201 from matrix-org/dbkr/reuse_guest_account
David Baker
2016-03-09 15:49:30 +00:00
b45c256427
Don't forceUpdate the message panel on resize
Richard van der Hoff
2016-03-08 12:15:02 +00:00
f60ac2aa5f
Make jump-to-read-marker work when the RM event isn't loaded.
Richard van der Hoff
2016-03-09 07:52:45 +00:00
f41c0d9bbf
Merge pull request #202 from matrix-org/rav/fix_image_load_again
Richard van der Hoff
2016-03-08 15:38:27 +00:00
6e23623c28
Fix checkScroll after image load
Richard van der Hoff
2016-03-07 22:23:14 +00:00
606fdcb8df
Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates"
Richard van der Hoff
2016-03-07 17:28:50 +00:00
42a90f49c2
Use the guest access tokens sent in 3pid invite emails.
David Baker
2016-03-07 17:11:01 +00:00
a2c6bd0e6c
Merge pull request #199 from mebjas/develop
David Baker
2016-03-07 16:15:45 +00:00
7e7493b336
removed typeof and todo
Minhaz A V
2016-03-07 21:16:35 +05:30
a7c75b1315
Merge pull request #193 from matrix-org/rav/shouldComponentUpdates
Richard van der Hoff
2016-03-07 11:50:38 +00:00
a82d3710d1
provide sensibile defaults for PasswordLogin
Matthew Hodgson
2016-03-06 18:42:09 -05:00
a4d22ffe8c
improve IS warning
Matthew Hodgson
2016-03-06 17:11:08 -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
Matthew Hodgson
2016-03-06 14:33:36 -05:00
622a4b0e4c
improve cosmetics of login prompts slightly
Matthew Hodgson
2016-03-06 13:46:27 -05:00
3c1312a9e6
fixed issue vector-im/vector-web 1079
Minhaz A V
2016-03-05 23:36:24 +05:30
b66ca74ede
fix comments
Matthew Hodgson
2016-03-05 02:05:29 +00:00
0d841551a0
prettyprint conference joins and parts properly
Matthew Hodgson
2016-03-05 02:30:18 +00:00
7433f50c8c
make settings button always visible
Matthew Hodgson
2016-03-04 23:16:27 +00:00
052925d95b
Merge pull request #194 from matrix-org/audio_notifications
David Baker
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.
David Baker
2016-03-04 18:16:02 +00:00
7820a5d900
Merge pull request #189 from matrix-org/rav/fix_timeline_react_keys
Richard van der Hoff
2016-03-04 17:56:18 +00:00
318bcb1284
Merge pull request #192 from matrix-org/rav/fix_read_receipts
Richard van der Hoff
2016-03-04 17:55:29 +00:00
1738fab2ee
Merge pull request #190 from matrix-org/rav/reduce_timeline_limit
Richard van der Hoff
2016-03-04 17:54:59 +00:00
9c82938b35
Merge pull request #1100 from vector-im/audio_notifications
David Baker
2016-03-04 17:54:57 +00:00
66bed45e67
Merge pull request #195 from matrix-org/dbkr/reenable_upgrade_registration
David Baker
2016-03-04 17:54:50 +00:00
4e3985d446
Merge pull request #1102 from vector-im/dbkr/reenable_upgrade_registration
David Baker
2016-03-04 17:54:47 +00:00
b9f508a61e
Merge pull request #197 from matrix-org/dbkr/starting_room_alias_tidy
David Baker
2016-03-04 17:54:37 +00:00
068429f3e3
Tidy up starting from a room alias when not logged in.
David Baker
2016-03-04 17:37:06 +00:00
ed4774efdb
Merge pull request #196 from matrix-org/matthew/bug186
David Baker
2016-03-04 16:58:56 +00:00
fcf17adf14
hopefully fix bug186 by ensuring room members never have null users
Matthew Hodgson
2016-03-04 16:57:20 +00:00
d732927dba
Re-enable upgrade registration.
David Baker
2016-03-04 15:42:22 +00:00
4da0e2fd95
Re-enable upgrade registration.
David Baker
2016-03-04 15:41:32 +00:00
2a1e8ef39b
Make audio notifs only play if the sound tweak is set
David Baker
2016-03-04 15:29:33 +00:00
0343bd1022
Merge pull request #1098 from ajohnson23/audio_notifications
David Baker
2016-03-04 15:27:54 +00:00
b75cb3c6cb
Added audio/source tags for message notifications.
Andrew Johnson
2016-03-03 08:11:46 -05:00
bc5ae6a6ad
Add shouldComponentUpdate() methods to RoomView and TimelinePanel
Richard van der Hoff
2016-03-04 14:51:55 +00:00
31df97e486
Make sure we update the timelinepanel when a read-receipt arrives
Richard van der Hoff
2016-03-04 14:47:11 +00:00
1c90288bfb
Merge pull request #191 from ajohnson23/audio_notifications
David Baker
2016-03-04 14:17:00 +00:00
c14b62ee64
Reduce the number of messages we show in the DOM to 250
Richard van der Hoff
2016-03-04 14:07:18 +00:00
3bb824484f
Added very basic audio notifications.
Andrew Johnson
2016-03-03 08:18:41 -05:00
6e86d7553f
Flatten arrays of components before adding to messagepanel li
Richard van der Hoff
2016-03-04 13:49:15 +00:00
4a3053a90b
Merge pull request #185 from matrix-org/dbkr/threepid_invite_wording
David Baker
2016-03-04 11:37:55 +00:00
82cdc15faf
unneccessary '+'
David Baker
2016-03-04 11:37:37 +00:00
05a3dab528
fix roomavatars on FF
Matthew Hodgson
2016-03-03 16:16:40 +00:00
2586280f2c
add opera
Matthew Hodgson
2016-03-03 15:31:08 +00:00
516647ad04
fix placeholder opacity on moz
Matthew Hodgson
2016-03-03 15:31:02 +00:00
04fb8f9a81
de-kegan the CompatibilityPage :(
Matthew Hodgson
2016-03-03 15:22:12 +00:00
52f259ccfa
explicit fg color for MessageComposer
Matthew Hodgson
2016-03-03 15:08:13 +00:00
27fea6bc95
make the newly invited warning prettier
Matthew Hodgson
2016-03-03 15:02:11 +00:00
f89fe4fff8
when we set an explicit form foreground colour, set an explicit background one too to prevent system-level dark themes on Linux etc making the foreground text unreadable
Matthew Hodgson
2016-03-03 14:37:11 +00:00
acaacae697
Fix 3pid invite acceptance with desired wording.
David Baker
2016-03-02 16:04:24 +00:00
1522c0ad76
Merge pull request #184 from matrix-org/dbkr/roomheader_unused_voip
David Baker
2016-03-02 14:58:16 +00:00
45857fa12c
Remove unused voice & video on-clicks from RoomHeader.
David Baker
2016-03-02 14:54:38 +00:00
adb6ab311c
Merge pull request #1069 from vector-im/dbkr/directory_room_metadata
David Baker
2016-03-02 14:35:29 +00:00
b03e6a8d73
add comment explaining data passing hack
David Baker
2016-03-02 14:34:31 +00:00
0051c91126
Merge pull request #183 from matrix-org/dbkr/3pid_invite_metadata
David Baker
2016-03-02 14:31:58 +00:00
c585b3edee
anothert stray room_
David Baker
2016-03-02 14:31:01 +00:00
2271ec7634
Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS)
David Baker
2016-03-02 14:24:00 +00:00
332354e5b6
Uncommit 71cb04c50a (I failed to branch)
David Baker
2016-03-02 14:23:20 +00:00
71cb04c50a
Display room metadata from room previews when we come from the public room directory (more hacks to work around the fact that we can't get this data from the HS)
David Baker
2016-03-02 14:21:32 +00:00
de2eaa3078
Document inviterName
David Baker
2016-03-02 14:04:51 +00:00
5827a883bf
This should be just oob_data too
David Baker
2016-03-02 14:02:36 +00:00
4184158a9a
Make comment match reality, attempt 2.
David Baker
2016-03-02 14:01:21 +00:00
6319c85272
Make comment match reality
David Baker
2016-03-02 13:59:55 +00:00
5bd2316e7f
Oops, it's just oob_data here
David Baker
2016-03-02 13:58:52 +00:00
2dbed2aa02
Clarify when room / oobData can/can't be set
David Baker
2016-03-02 11:59:17 +00:00
d61f383748
Oops, actually assign variable
David Baker
2016-03-02 11:57:05 +00:00
acb5f5d69b
This should be props, not state
David Baker
2016-03-02 11:56:18 +00:00
7ae2c5b11b
Document fields of oob_data
David Baker
2016-03-02 11:51:47 +00:00
10b1b6443d
Fix rooms we don't have any info about
David Baker
2016-03-02 10:59:54 +00:00
9085a2a866
Pass room metadata from 3pid invite emails all the way through to the relevant components so we can display it.
David Baker
2016-03-01 18:23:57 +00:00
3718377355
Merge pull request #182 from matrix-org/rav/pagination_race
Richard van der Hoff
2016-03-01 11:50:09 +00:00
1e3040d19a
Fix a race condition handling gappy syncs
Richard van der Hoff
2016-03-01 10:41:56 +00:00
dc9a7e5e28
Merge pull request #181 from matrix-org/rav/issue_1049
Richard van der Hoff
2016-02-29 17:51:39 +00:00
559f60d43e
unmounted check in TimelinePanel
Richard van der Hoff
2016-02-29 14:09:42 +00:00
3b2d0a6c01
Fix up reading the push rules
Mark Haines
2016-02-29 16:56:33 +00:00
30abf81ed4
Fix CallView in left panel
Richard van der Hoff
2016-02-29 13:43:22 +00:00
db1e1c7df0
Fix NPE when re-joining a room
Richard van der Hoff
2016-02-26 23:05:41 +00:00
acfc7b3719
Don't throw exceptions when room changes in a timelinepanel
Richard van der Hoff
2016-02-26 22:38:05 +00:00
731d94eea4
Update the actions of default rules instead of overriding.
Mark Haines
2016-02-26 20:51:16 +00:00
543f444174
Merge commit 'd9e58d9' into develop
Richard van der Hoff
2016-02-26 16:31:02 +00:00
a4402073fb
Merge branch 'rav/roomview_works' into develop
Richard van der Hoff
2016-02-26 14:04:15 +00:00
d5c83347a6
Merge pull request #173 from matrix-org/rav/configurable_sync_limit
Richard van der Hoff
2016-02-26 13:55:25 +00:00
a9d363c668
Merge pull request #180 from matrix-org/rav/optimise_timeline_load
Richard van der Hoff
2016-02-26 13:29:35 +00:00
65ecbf93fe
Merge pull request #178 from matrix-org/rav/reset_timeline
Richard van der Hoff
2016-02-26 13:28:20 +00:00
c4603d3474
Merge pull request #179 from matrix-org/rav/pagination_spinners
Richard van der Hoff
2016-02-26 13:28:01 +00:00
0d1c85eb7c
Make room-switching quicker
Richard van der Hoff
2016-02-26 12:25:46 +00:00
c3b819b4da
fix the version and improve changelog
Matthew Hodgson
2016-02-25 20:12:57 +01:00
e634f98a13
Show spinners when forward/back paginating.
Richard van der Hoff
2016-02-24 13:38:55 +00:00
4be29401ce
Reload the timeline when we get a gappy sync
Richard van der Hoff
2016-02-25 18:28:07 +00:00
2bd6529ca0
Merge remote-tracking branch 'origin/develop' into develop
Richard van der Hoff
2016-02-25 18:38:14 +00:00
Richard van der Hoff