Richard van der Hoff
e01d61dfeb
Merge branch 'rav/timeline_window' into rav/link_to_event
...
Conflicts:
src/components/structures/MatrixChat.js
src/components/structures/ScrollPanel.js
2016-02-03 14:12:28 +00:00
Richard van der Hoff
2479c81cf6
Merge remote-tracking branch 'origin/develop' into rav/timeline_window
2016-02-03 14:09:50 +00:00
Richard van der Hoff
c82b364ca8
Address review comments
...
Mostly renaming things and adding comments.
2016-02-03 08:03:10 +00:00
Richard van der Hoff
101f0219c4
Merge pull request #130 from matrix-org/rav/fix_rr_react_warning
...
Fix react warnings when a RR animation is happening during room switch
2016-02-02 19:07:57 +01:00
Richard van der Hoff
3b1ed3a014
Fix react warnings when a RR animation is happening during room switch
...
If the animation of an RR removal is active when we change room, we end up
getting a callback after the RoomView has been unmounted. Guard against this to
avoid getting React warnings.
2016-02-02 17:59:11 +00:00
David Baker
b0f0d5f6d0
Null check room because those events will be emitted before the room is stored.
2016-02-02 16:34:41 +00:00
Kegsay
20f77d1224
Merge pull request #125 from matrix-org/kegan/trailing-slash
...
Strip trailing slashes on HS/IS URLs on register/login
2016-02-02 16:04:19 +00:00
David Baker
1cabe2ec37
Don't auto join rooms: always 'autoPeek' (ie. see if we can peek, otherwise offer to join)
2016-02-02 15:50:15 +00:00
David Baker
4e4e5be9a1
Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818 .
2016-02-02 14:14:18 +00:00
Kegan Dougal
ce789ba962
Split out alias settings into its own component: AliasSettings
2016-02-02 12:46:14 +00:00
David Baker
34ba00d0ae
Merge pull request #127 from matrix-org/dbkr/fix_upgrade_with_email
...
Don't assert that we're not logged in before starting registration
2016-02-01 17:07:10 +00:00
David Baker
c187eda832
Don't assert that we're not logged in before starting registration because uprading is now a thing.
2016-02-01 16:53:39 +00:00
Richard van der Hoff
d9e13780b8
Implement direct-to-event linking.
...
This adds support for links to particular event ids: add /<eventId> to the URL
for a room.
This commit also ensures that we scroll to the 'read marker' when switching to
a room which has no previous scroll state, as well as preventing that marker
from going past the middle of the screen.
This also reinstates the preservation of scroll state when switching rooms,
which was disabled previously.
2016-02-01 16:31:12 +00:00
Kegan Dougal
e6c93530e2
Strip trailing slashes on HS/IS URLs on register/login
2016-02-01 14:19:20 +00:00
Richard van der Hoff
f0cf5c0aff
Update onRoomTimeline comment
2016-02-01 12:35:41 +00:00
Richard van der Hoff
2c04b9cb5b
Merge pull request #124 from ajohnson23/messages_scrolldown_fix
...
Fix improper scrolldown button display issue.
2016-02-01 11:38:14 +01:00
Andrew Johnson
fe9d7d10b9
Fix improper scrolldown button display issue.
...
This fixes an intermittent issue where the scrolldown button
or "new messages below" button would display even when the messages
panel was scrolled to the very bottom. Furthermore, when new messages
arrived, the messages panel would not automatically scroll down to show
the new messages.
Fixes https://github.com/vector-im/vector-web/issues/805
2016-01-29 22:32:32 -05:00
David Baker
7301f53807
Merge pull request #121 from matrix-org/dbkr/fix_registration_guest_access
...
Fix registration: don't auto-log in as a guest if we have a URL from …
2016-01-28 16:21:16 +00:00
Kegsay
6bb69ef2d1
Merge pull request #120 from matrix-org/kegan/bulk-email-invite
...
Support bulk invitations via text separators
2016-01-28 16:21:05 +00:00
David Baker
401d18bcc6
Fix registration: don't auto-log in as a guest if we have a URL from sydent.
2016-01-28 15:42:14 +00:00
David Baker
640e87e7c5
Merge pull request #117 from matrix-org/dbkr/guest_warning_bar
...
Add warning bar for guest users.
2016-01-28 13:44:06 +00:00
David Baker
83119d21d6
New style guest warning bar
2016-01-28 12:59:51 +00:00
David Baker
37ab225894
Merge pull request #119 from matrix-org/dbkr/own_messages_not_unread
...
Your own messages should not count as unread
2016-01-28 12:42:21 +00:00
Kegsay
12463aec4d
Merge pull request #115 from matrix-org/kegan/fix-3pid-signup
...
Redirect to the registration page when landing with ?email=
2016-01-28 12:00:06 +00:00
Kegan Dougal
bdc1028a7e
Support bulk invitations via text separators
...
Valid separators are , ; <space>
2016-01-28 11:56:20 +00:00
David Baker
796a2e5e3a
Revert e5f4fa8c46 as it's no longer what's desired.
2016-01-28 11:15:43 +00:00
David Baker
7d621d88d8
Your own messages should not count as unread
2016-01-28 11:12:56 +00:00
Richard van der Hoff
a4f4bb9e72
Convert RoomView to using a TimelineWindow
...
Instead of using the Room's active timeline directly, use a
TimelineWindow. This shouldn't (yet) have much effect, beyond maybe making
scrollback after a gappy sync slightly more efficient.
For now, I have disabled the 'restoreScrollState' functionality. This will be
reinstated once I land the link-to-event code.
2016-01-28 10:53:43 +00:00
Kegan Dougal
81cc30bab2
Null guard because this may not exist in the DOM.
2016-01-28 10:52:08 +00:00
Kegan Dougal
e017559765
New line
2016-01-28 09:58:51 +00:00
David Baker
58f9210b5a
Merge pull request #118 from matrix-org/dbkr/fix_custom_tags_exception
...
Fix exception thrown if any custom tags are set
2016-01-28 09:51:51 +00:00
David Baker
f745e941ec
Fix exception thrown if any custom tags are set
2016-01-28 09:41:46 +00:00
David Baker
7ea45f9888
Move message count to suffix in title, as requested by @ara4n
2016-01-27 18:03:01 +00:00
David Baker
74bd28025e
Merge pull request #116 from matrix-org/dbkr/no_reg_spinner
...
Don't show a spinner while we're waiting for the user to do something
2016-01-27 17:59:03 +00:00
David Baker
e5f4fa8c46
Add warning bar for guest users. Fixes https://github.com/vector-im/vector-web/issues/770
2016-01-27 17:58:47 +00:00
David Baker
4661bb0942
Don't show a spinner while we're waiting for the user to do something
2016-01-27 15:44:12 +00:00
David Baker
8360c112fb
Put the favicon badge call in a try block, as per comment
2016-01-27 15:19:25 +00:00
Kegan Dougal
db8fab8019
Redirect to the registration page when landing with ?email=
...
Fixes "Missing access token" error.
2016-01-27 10:47:54 +00:00
David Baker
fcf6afbe06
Merge pull request #113 from matrix-org/dbkr/unread_only_if_have_tile
...
Don't count as an unread message if we don't have a tile for it.
2016-01-26 14:19:45 +00:00
David Baker
f8cc6bdad6
Don't count as an unread message if we don't have a tile for it.
2016-01-25 17:13:07 +00:00
Matthew Hodgson
c1f28bb6b9
hide 'unknown screen' warning
2016-01-24 19:14:14 +00:00
Matthew Hodgson
6eea1f7f83
try for a simpler invite placeholder look & feel
2016-01-24 19:02:18 +00:00
Matthew Hodgson
872b9be17a
increase truncatelist size to match INITIAL_LOAD_NUM_MEMBERS
2016-01-24 18:24:26 +00:00
Matthew Hodgson
bc60435750
improve settings layout and fix FF bugs
2016-01-24 18:15:08 +00:00
Matthew Hodgson
bb0051f24f
fix another NPE; apparently some stylesheets don't have href attributes (wtf?)
2016-01-24 11:46:25 +00:00
Matthew Hodgson
3da76192a1
title attr
2016-01-24 02:01:45 +00:00
Matthew Hodgson
f15564074c
track whether we're scrolled to bottom or not and display UI for warning & jumping there if needed.
2016-01-24 01:51:01 +00:00
Matthew Hodgson
28fddef5f9
only try to tint our CSS, otherwise random extensions which have inserted CSS may cause untrappable XSS SecurityErrors to throw
2016-01-23 19:46:00 +00:00
Matthew Hodgson
001b9ad7cc
try to trap SecurityError exceptions for linux FFs who don't like you calling .contentDocument on an SVG (assuming that's where the error comes from)
2016-01-23 18:59:37 +00:00
Matthew Hodgson
add8ef3c59
trap for ss.cssRules mysteriously returning null
2016-01-22 19:59:41 +00:00
