Commit Graph

1513 Commits (825e6702ef565ce95567c9f86bb8c2daf530dacb)

Author SHA1 Message Date
Matthew Hodgson bae23c78de fix https://github.com/vector-im/vector-web/issues/1040 and https://github.com/vector-im/vector-web/issues/833 2016-03-15 22:42:22 +00:00
Matthew Hodgson 2bedece9a1 argh, remove debugging 2016-03-15 22:15:04 +00:00
Matthew Hodgson b7726d34d5 allow registration and login from guest to be cancellable 2016-03-15 21:04:11 +00:00
Matthew Hodgson f66dd69710 oops, revert - do this on the right branch... 2016-03-15 18:40:03 +00:00
Matthew Hodgson b23cad5613 let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161 2016-03-15 18:36:13 +00:00
Matthew Hodgson f70eec62d1 let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161 2016-03-15 18:35:09 +00:00
Matthew Hodgson 672a5cb89c Merge pull request #200 from matrix-org/matthew/loginfixes
Bring back lost functionality on login/register/password-reset screens
2016-03-15 15:21:32 +00:00
Matthew Hodgson 59866a2006 final PR feedback 2016-03-15 15:20:51 +00:00
David Baker 836f7ca80d Merge pull request #218 from matrix-org/session_logged_out
Handle the new Session.logged_out event.
2016-03-15 14:51:50 +00:00
Matthew Hodgson 438558da55 PR feedback 2016-03-15 13:48:46 +00:00
Matthew Hodgson 1a74b0c487 Merge pull request #216 from matrix-org/matthew/fix-join-by-room-alias
hopefully fix https://github.com/vector-im/vector-web/issues/819
2016-03-15 13:16:51 +00:00
David Baker a1b875bb25 Handle the new Session.logged_out event. Log the user out and display a message telling them they've been logged out.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/100 (but safe without)
Fixes https://github.com/vector-im/vector-web/issues/414
2016-03-15 10:48:16 +00:00
Richard van der Hoff 8ea75277e1 Merge pull request #215 from matrix-org/rav/fix_scroll_on_resize
Adjust the scroll position when the gemini panel is resized
2016-03-15 09:59:44 +00:00
Matthew Hodgson 8a905dec58 grey out roomsettings that you can't edit 2016-03-15 02:46:17 +00:00
Matthew Hodgson 7c598d90b1 give proper error message on failing to start chat 2016-03-15 02:19:27 +00:00
Matthew Hodgson 1abd7f45ce fix setting custom power levels 2016-03-15 01:34:49 +00:00
Matthew Hodgson 5e050c6276 hopefully fix https://github.com/vector-im/vector-web/issues/819 2016-03-15 00:49:44 +00:00
Matthew Hodgson 79eb54058f oops, backout WIP 2016-03-15 00:48:19 +00:00
Matthew Hodgson 005ebbd037 stop avatar mxids being copy-pastable (unless they contain an initial). should significantly improve https://github.com/vector-im/vector-web/issues/893 2016-03-15 00:21:05 +00:00
Richard van der Hoff ce150646e6 Merge branch 'develop' into rav/fix_scroll_on_resize 2016-03-14 22:32:54 +00:00
Richard van der Hoff 0598092f9d Bump to latest react-gemini-scrollbar
... which will hopefully fix the mystery of the disappearing member list.
2016-03-14 19:02:22 +00:00
Richard van der Hoff 6a0cd9e047 Bump to dev branch of js-sdk 2016-03-14 15:54:33 +00:00
Richard van der Hoff 3173898bc1 Bump the timeline limit to 500
... so that matthew can ctrl-f
2016-03-14 15:47:09 +00:00
Richard van der Hoff 61cd66304e Adjust the scroll position when the gemini panel is resized
Make sure we restore the scroll state of the message panel when it is resized
2016-03-14 15:29:29 +00:00
Richard van der Hoff 8a4a810d1f Merge pull request #214 from matrix-org/rav/gemini-resize
Use our fork of react-gemini-scrollbar to fix resize issues
2016-03-14 13:59:11 +00:00
Richard van der Hoff 74bbb81532 Merge pull request #212 from matrix-org/rav/fix_search_position
Put direct-linked events and search clickthroughs in the middle
2016-03-14 12:49:21 +00:00
Richard van der Hoff 88b3f2ed8c Use our fork of react-gemini-scrollbar to fix resize issues
Rather than telling react-gemini-scrollbar to update every time something that
changes its size happens, try out our fork of it which uses some hackery to
listen for resizes.
2016-03-14 12:46:13 +00:00
Matthew Hodgson 22bd0f9aa0 Merge pull request #198 from matrix-org/matthew/confjoinparts
prettyprint conference joins and parts properly
2016-03-13 23:30:31 +00:00
Matthew Hodgson 893e338917 incorporate keganfeedback 2016-03-12 19:49:54 +00:00
David Baker e0c416ee01 Merge pull request #213 from matrix-org/dbkr/redacted_3pid_invite_crash
Don't crash on redacted (or otherwise invalid) 3pid invites
2016-03-11 14:39:43 +00:00
David Baker 1131b82414 Don't crash on redacted (or otherwise invalid) 3pid invites 2016-03-11 14:18:30 +00:00
Richard van der Hoff fc062072b0 Bump to 0.2.0 2016-03-11 12:52:21 +00:00
Richard van der Hoff eeab97114f Prepare v0.2.0 2016-03-11 12:48:26 +00:00
Richard van der Hoff 02510003dd prep v0.1.1 2016-03-11 12:24:44 +00:00
David Baker 1516f17af4 Merge pull request #210 from matrix-org/dbkr/invite_display_when_peekable
Show the invite preview bar when we have a 3pid invite
2016-03-11 10:21:04 +00:00
David Baker 15170f8718 Comment how we're not rejecting 3pid invites 2016-03-11 10:20:52 +00:00
David Baker 73781f5619 doc inviterName 2016-03-10 17:43:20 +00:00
Richard van der Hoff 5e7eb3ee92 Stop video tags autoplaying.
Properly, this time

Fixes https://github.com/vector-im/vector-web/issues/995
2016-03-10 17:38:52 +00:00
Richard van der Hoff 3fd066c2d4 Put direct-linked events and search clickthroughs in the middle
We need two modes of operation for ScrollPanel.scrollToToken:

For jump-to-read-marker, we want it 1/3 of the way down the screen.
For search clickthrough, and hyperlinked events, we want put the event in the
*middle* of the screen.

Fixes https://github.com/vector-im/vector-web/issues/1032
2016-03-10 17:27:46 +00:00
Richard van der Hoff f985232d29 Merge pull request #211 from matrix-org/rav/update_scrollpanel_on_topbar
Update the gemini panel when we show/hide the TopUnreadMessagesBar
2016-03-10 16:56:31 +00:00
David Baker 2875fa3eb1 Show the invite preview bar when we have a 3pid invite, and make the reject button work. 2016-03-10 15:56:58 +00:00
Richard van der Hoff f9e753f57a Update the gemini panel when we show/hide the TopUnreadMessagesBar
Showing/hiding the TopUnreadMessagesBar resizes the scrollpanel. Make sure that
we update the gemini panel when this happens.

(Fixes an intermittent bug wherein we could get stuck with a 'scroll to bottom'
indicator after jumping to the bottom, with unread messages in the view)
2016-03-10 15:55:03 +00:00
Richard van der Hoff 7660276b54 Merge pull request #209 from matrix-org/rav/local_echoes_are_today
Use 'today' for the date separator for unsent messages
2016-03-10 14:34:18 +00:00
Richard van der Hoff a841991952 Merge pull request #208 from matrix-org/rav/missing_date_separator
Fix the missing date separator at the start of rooms
2016-03-10 14:19:52 +00:00
Richard van der Hoff bb4fdfe8ea Merge pull request #207 from matrix-org/rav/mute_desktop_notifs
Factor out audio bings to a separate setting
2016-03-10 14:18:54 +00:00
Richard van der Hoff 928b2bb9a7 Use 'today' for the date separator for unsent messages
Fixes https://github.com/vector-im/vector-web/issues/1087, though we'll still
have problems if the unsent messages get out of order.
2016-03-10 14:16:31 +00:00
Richard van der Hoff 3bd33d0985 Fix the missing date separator at the start of rooms
When we first hit the start of the room, we still have a pagination token, so
we hide the date separator. When we try to backpaginate again, we get an empty
result, and the pagination token is cleared.

Make sure that we update state. canBackPaginate even when there are no new
results, to handle this case.

Fixes https://github.com/vector-im/vector-web/issues/1014
2016-03-10 13:42:46 +00:00
Richard van der Hoff c5e03913d9 Factor out audio bings to a separate setting
Some people are sad about bings on the desktop app. Make it turn-off-able.
2016-03-10 10:59:40 +00:00
David Baker 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
David Baker 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