mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 20:55:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
4476 commits 208 branches 547 tags 609 MiB
Commit graph

2686 commits

Author SHA1 Message Date
Richard van der Hoff
e3dbf057fb Fix 'missing page_type' error 
LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one.
 2017-05-19 14:09:20 +01:00
Richard van der Hoff
c61294f71c Delintify some of MatrixChat (#907) 
... it annoyed me too much.
 2017-05-19 13:53:11 +01:00
Luke Barnard
2bec44a517 Remove suffix and prefix from login input username 
This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736
 2017-05-19 10:03:51 +01:00
Michael Telatynski
cc7edbf86d allow for sending arbitrary events, also override highlight with 
event currently being forwarded while forwardingEvent is set

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 01:29:11 +01:00
Michael Telatynski
475646a2a7 Change wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:34:35 +01:00
Michael Telatynski
a2ab36f598 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:33:36 +01:00
Michael Telatynski
bf0fe63759 don't know why I'm even tracking mounted state. Never refd 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:51 +01:00
Michael Telatynski
0e7e4d8595 replace weird sidebar snapping with better ui_opacity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:32 +01:00
David Baker
3e7a31ac75 Revert "fix scroll behaviour on macs with no gemini" 
This reverts commit 1347d9fa65.
 2017-05-18 19:03:51 +01:00
David Baker
726cd60127 Merge pull request #902 from matrix-org/dbkr/prevent_illegal_finddomnode 
Prevent an exception getting scroll node
 2017-05-18 17:56:29 +01:00
David Baker
8fe3fa9178 Remove debug logging 2017-05-18 17:35:22 +01:00
David Baker
01955146e9 Prevent an exception getting scroll node 
Don't try to findDOMNode before we're mounted as it makes react
angry.
 2017-05-18 17:33:32 +01:00
Luke Barnard
32818aff4f Simplify expression 2017-05-18 17:08:26 +01:00
Luke Barnard
ee64f4a8dd Add country prefix to country dd options 2017-05-18 17:02:19 +01:00
Luke Barnard
384f50609d Allow searching by partial prefix (/w or /wo '+') 2017-05-18 17:01:40 +01:00
Luke Barnard
a425909b76 Get rid of react key warning when no results 2017-05-18 17:01:01 +01:00
Luke Barnard
f99fa3ac1a Fixed pressing space or clicking dd input closes dd 2017-05-18 16:58:57 +01:00
Luke Barnard
2350277d29 Add left_aligned class to CountryDropdown 
This indiciates that the dd chevron should be on the left
 2017-05-18 14:03:02 +01:00
Luke Barnard
2ebd9b6290 Merge pull request #899 from matrix-org/luke/improve-country-dd-3 
Swap to new flag files (which are stored as GB.png)
 2017-05-18 13:37:28 +01:00
Luke Barnard
c991b52d2c Swap to new flag files (which are stored as GB.png) 
Requires https://github.com/vector-im/riot-web/pull/3953
 2017-05-18 11:45:23 +01:00
Luke Barnard
e38437e6ce Invite the welcome user after registration if configured 
This will shift focus to the welcome user DM.

We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
 2017-05-18 11:14:56 +01:00
Luke Barnard
c44d7b6c44 Improve phone number country dropdown for registration and login 
This implements https://github.com/vector-im/riot-web/issues/3895
 2017-05-17 13:09:32 +01:00
David Baker
8ce6da1b16 Merge branch 'new_release_process_stable' into develop 
This reverts all PRs currently marked notready, changing develop into
a branch that should be more stable.
 2017-05-17 10:38:09 +01:00
Richard van der Hoff
696234694c Merge pull request #892 from matrix-org/rav/pastefiles 
Support for pasting files into normal composer
 2017-05-17 09:59:23 +01:00
Richard van der Hoff
8695397abb Support for pasting files into normal composer 
We don't seem to be in any danger of getting a working RTE any time soon, so
implement file pasting in the normal composer too.
 2017-05-17 01:43:13 +01:00
David Baker
75eea89c08 Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings" 
This reverts commit a29d8c2af2, reversing
changes made to 1d836c7d02.
 2017-05-16 16:12:57 +01:00
David Baker
ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search" 
This reverts commit 0ad1d8caf3, reversing
changes made to 1189368aab.
 2017-05-16 16:11:01 +01:00
David Baker
67c6a8b81d Revert "unbreak stack overflow which fires on tests due to mocked timers" 
This reverts commit e69ea68133.
 2017-05-16 16:02:13 +01:00
David Baker
eddc2af92d Revert "HOW DID THIS EVER WORK?" 
This reverts commit 0d8d3c6710.
 2017-05-16 16:01:54 +01:00
David Baker
7a949b6a45 Revert "oops, actually refresh roomlist when its state changes!" 
This reverts commit 35a16edccc.
 2017-05-16 16:01:32 +01:00
David Baker
b063c605a8 Revert "fix stupid typos in RoomList's shouldComponentUpdate" 
This reverts commit b0288ebd89.
 2017-05-16 16:01:14 +01:00
David Baker
714cd6a10f Revert "recalculate roomlist when your invites change" 
This reverts commit ec6a1c4c75.
 2017-05-16 16:00:34 +01:00
David Baker
ff9c40472a Revert "Merge pull request #822 from t3chguy/BaseDialog_restore_focus" 
This reverts commit 0ac836919d, reversing
changes made to 7e07ffd55f.
 2017-05-16 14:50:29 +01:00
David Baker
19dcd83aeb Revert "Merge pull request #841 from matrix-org/luke/fix-double-dialogs" 
This reverts commit 1913a32fbd, reversing
changes made to 0c16298c45.
 2017-05-16 14:50:19 +01:00
David Baker
387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" 
This reverts commit 3366d3bbae, reversing
changes made to ceb71a4ef6.
 2017-05-16 14:49:55 +01:00
David Baker
d06bd3cf9d Revert "Fix Create Room button" 
This reverts commit 9cae667c06.
 2017-05-16 14:30:02 +01:00
David Baker
f8d1a6d240 Revert "Fix 'start chat' button" 
This reverts commit c841eb641b.
 2017-05-16 14:26:46 +01:00
David Baker
6bd7af2917 Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1" 
This reverts commit 3549ff2543, reversing
changes made to 1db677141e.
 2017-05-16 14:00:09 +01:00
Michael Telatynski
8715b5233c link to #/register 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-15 10:31:17 +01:00
Michael Telatynski
83cb1e6e29 tell guests they can't use filepanel until they register 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-15 10:15:35 +01:00
Matthew Hodgson
317e24852d explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531 2017-05-15 03:03:17 +01:00
Matthew Hodgson
486301cffb remove dodgy heuristics for hiding dates on RRs and use DateUtils instead. 
reverts 5d99d68a64
fixes https://github.com/vector-im/riot-web/issues/3523
 2017-05-15 02:55:07 +01:00
Matthew Hodgson
6879f7ee6f add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720 2017-05-15 02:43:23 +01:00
Matthew Hodgson
82092dc2d8 onClick MELS avatars = expand MELS; fixes https://github.com/vector-im/riot-web/issues/3899 2017-05-15 02:15:00 +01:00
Matthew Hodgson
7d8c104cb8 Merge pull request #884 from matrix-org/t3chguy/tiny_usersettings_fixes 
I broke UserSettings for webpack-dev-server
 2017-05-15 01:57:45 +01:00
Matthew Hodgson
7f78e737eb Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing 
various fixes to RoomHeader
 2017-05-15 01:52:42 +01:00
Matthew Hodgson
24d09d8f5b Merge pull request #885 from matrix-org/t3chguy/rte_emote_weirdness 
remove /me whether or not it has a space after it
 2017-05-15 01:50:53 +01:00
Matthew Hodgson
48864b0880 fix visibility of topbar close on dark theme, fixing https://github.com/vector-im/riot-web/issues/3783 2017-05-15 01:39:57 +01:00
Matthew Hodgson
c5f2b69e48 add alt attributes to e2e icons on msgs; fixes https://github.com/vector-im/riot-web/issues/3786 2017-05-15 01:37:24 +01:00
Matthew Hodgson
38cb123506 Merge pull request #883 from matrix-org/t3chguy/file_panel_fixes 
show error if we can't set a filter because no room
 2017-05-15 00:19:45 +01:00
Michael Telatynski
d7c88a9813 only removed /me , remove anyway to fix vector-im/riot-web#3733 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 15:20:31 +01:00
Michael Telatynski
6ec799a028 I broke UserSettings for webpack-dev-server 
where version file doesn't exist, version starts as null
then gets set to undefined by the promise
this wasn't handled and now undefined is understood to be unknown
rather than null

also picked up on a small casing error
threePids vs threepids, most things using the latter apart from the init

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 15:04:20 +01:00
Michael Telatynski
29568feb95 show error if we can't set a filter 
this way it still works for a room we've been in before

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 22:38:57 +01:00
Michael Telatynski
60b13d76a5 conform to Luke's other comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:20:56 +01:00
Michael Telatynski
822f2f10f2 conform to Luke's comment 
https://github.com/matrix-org/matrix-react-sdk/pull/880#discussion_r116257726

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:16:55 +01:00
Michael Telatynski
69d860e982 revert name overengineering, undefined onClick should be fine on div 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:06:36 +01:00
Michael Telatynski
5e4467adce hide settings/search appropriately 
pass inRoom prop to RoomHeader (defaults to false)
remove default onSettingsClick, handle if it is passed EVERYWHERE

if onSettingsClick is passes, show that button
show search button only if we are in the room, seems to fail otherwise
this seems to handle all cases I could throw at it. Give it your best

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:35:06 +01:00
Michael Telatynski
f55b27f432 looks like it is passed and accessed like a string 
so unless I'm going insane, it should be a string.

fixes
```
rageshake.js:61 Warning: Failed prop type: The prop `onClick` is marked as required in `AccessibleButton`, but its value is `undefined`.
    in AccessibleButton (created by RoomHeader)
    in RoomHeader (created by RoomView)
    in div (created by RoomView)
    in RoomView (created by LoggedInView)
    in main (created by LoggedInView)
    in div (created by LoggedInView)
    in div (created by LoggedInView)
    in LoggedInView (created by MatrixChat)
    in MatrixChat
```

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:32:23 +01:00
Luke Barnard
2437eb7910 Merge pull request #874 from matrix-org/luke/fix-rm-not-updating 
Fix RM not updating if RR event unpaginated
 2017-05-11 15:54:49 +01:00
Luke Barnard
852e1eb720 Rename some variables 
`ReadUpTo` -> `RR`
`ReadReceipt` -> `RR`
`ReadMarker` -> `RM`
 2017-05-11 09:31:59 +01:00
Luke Barnard
3815ad6cd0 Sent -> Event 2017-05-11 09:20:34 +01:00
Michael Telatynski
50092a0f1f fixes vector-im/riot-web#3881 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-10 15:16:49 +01:00
Luke Barnard
856ef58d46 fix commen 2017-05-10 14:55:58 +01:00
Luke Barnard
fe8ea4ffe7 Rename vars, linting 2017-05-10 14:51:47 +01:00
Luke Barnard
30e183a7f1 Only send RR if we should 2017-05-10 14:48:01 +01:00
Luke Barnard
7f766d89c3 Rename variables, more comments 2017-05-10 14:42:06 +01:00
Luke Barnard
ca79d9bb6e Separate predicates for RM/RR 
Instead of modifying the condition for updating the RR, separate the RM and RR conditions and use an OR to decide when to set both.

Make some logs only log when DEBUG.
 2017-05-09 17:36:19 +01:00
Luke Barnard
3549ff2543 Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1 
Fixes 2 issues with Dialog closing
 2017-05-09 11:36:35 +01:00
Michael Telatynski
f02e659fb7 Consume key{up,down,pressed} events 
so they don't trigger other things bubbling up
until Modal is closed
 2017-05-09 11:27:06 +01:00
Luke Barnard
ac25fd6d87 Remove log 2017-05-09 10:16:37 +01:00
Luke Barnard
488fa3745b Fix RM not updating if RR event unpaginated 
If the RR event has been unpaginated, the logic in `sendReadReceipt` will now fallback on the event ID of the RM which in theory is always =< RR event ID stream-wise.
 2017-05-09 10:03:40 +01:00
David Baker
e5b1e4ce6d Merge pull request #873 from matrix-org/dbkr/room_name_in_leave_confirm 
Put room name in 'leave room' confirmation dialog
 2017-05-08 17:02:53 +01:00
David Baker
85ed39b9d8 Put room name in 'leave room' confirmation dialog 
https://github.com/vector-im/riot-web/issues/3850
 2017-05-08 16:49:40 +01:00
David Baker
c01e8e85ac Merge pull request #872 from matrix-org/dbkr/fix_left_panel 
Fix this/self fail in LeftPanel
 2017-05-08 16:40:17 +01:00
David Baker
805354bd2c Revert unintentional change 2017-05-08 16:39:11 +01:00
David Baker
9cae667c06 Fix Create Room button 
Opened the DM dialog rather than the new room dialog
 2017-05-08 16:03:52 +01:00
David Baker
534f9277d4 Fix this/self fail in LeftPanel 2017-05-08 15:37:40 +01:00
Luke Barnard
39323647d1 Don't show null URL previews 
These are URLs that were spidered by the server without error but yielded an empty response from the server. There's nothing to display, so return an empty div.
 2017-05-08 14:01:44 +01:00
David Baker
cafbe14589 Fix keys for AddressSelector 
Was using a property which just did not exist.
 2017-05-08 11:59:06 +01:00
David Baker
c841eb641b Fix 'start chat' button 2017-05-08 11:26:25 +01:00
David Baker
3366d3bbae Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2 
Make left panel better for new users (mk II)
 2017-05-08 10:37:55 +01:00
Michael Telatynski
bd32df4ef6 comment wording 2017-05-07 20:58:30 +01:00
Michael Telatynski
360f1cd250 completely missed the ESC check 
I need sleep
 2017-05-07 20:57:54 +01:00
Michael Telatynski
78e7272344 Fixes 2 issues with Dialog closing 
+ Upload Confirmation dialog would just change focus on ESC and not close
+ Keywords Dialog in UserSettings would also close UserSettings because event bubbled up
 2017-05-07 20:43:42 +01:00
Matthew Hodgson
ceb71a4ef6 Merge pull request #866 from t3chguy/warn_on_unload 
Explicitly save composer content onUnload
 2017-05-07 20:07:09 +01:00
Michael Telatynski
a141350670 Explicitly save composer content onUnload 
small oversight, caught by Matthew

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-07 20:01:55 +01:00
Matthew Hodgson
5900c879ce Merge pull request #851 from t3chguy/warn_on_unload 
Warn on unload
 2017-05-07 18:17:18 +01:00
Michael Telatynski
2b2b43a7f3 Content in Composer is not lost on unload so it should be fine 
to scare the user thinking they have lost all of their content
even though when they come back they can cry with joy :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-07 18:16:10 +01:00
David Baker
1a0ea29995 Remove redundant role elements 2017-05-05 17:51:14 +01:00
David Baker
4fc4ae1e99 Size is a string, import react 
React gets put in by the JSX transpile
 2017-05-05 14:56:26 +01:00
David Baker
4a5821e199 Separate classes for the different buttons 
Also rename RoleButton to ActionButton because it's not being
given a Role any more.
 2017-05-05 14:25:18 +01:00
David Baker
e00605571b Fix the spinner to actually appear 
We started with clientSyncState being null, which it remained
until the SYNCING event was emitted. We need to set
clientSyncState's initial value correctly.
 2017-05-05 10:48:54 +01:00
David Baker
f86ca5bc97 Hide empty tips if collapsed 2017-05-04 18:08:04 +01:00
Luke Barnard
8e3851b380 Merge pull request #860 from t3chguy/patch-4 
Guests can't send RR so no point trying
 2017-05-04 17:53:59 +01:00
Michael Telatynski
f76b9b4489 remove link to issue 
not very useful
 2017-05-04 17:25:23 +01:00
Luke Barnard
7918ff2fc2 Merge pull request #857 from t3chguy/t3chguy/settings_versions_improvements 
T3chguy/settings versions improvements
 2017-05-04 16:56:45 +01:00
Michael Telatynski
da4c2f8b31 Guests can't send RR 
so they shouldn't try
lets not hit the HS quite as much
 2017-05-04 16:42:41 +01:00
Michael Telatynski
3c6e301f7f Improve regex to ignore trailing -dirty and for rc tags 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 16:22:39 +01:00
Michael Telatynski
2edfc3e598 remove commented out code as per review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 15:51:31 +01:00
Michael Telatynski
cb478f1194 no idea why those got in there... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 15:50:52 +01:00
David Baker
72df43d22b Year 2017-05-04 15:46:24 +01:00
David Baker
306ea58578 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 15:45:05 +01:00
David Baker
6a1d0fbab5 Make bottom left menu buttons use RoleButton too 2017-05-04 15:38:09 +01:00
David Baker
0998adb366 What year is it? Who's the president? 2017-05-04 15:02:21 +01:00
Luke Barnard
d5b49a11d7 Merge pull request #829 from matrix-org/luke/fix-people-section-disappearing 
Remove DM-guessing code
 2017-05-04 14:15:28 +01:00
David Baker
e1c99430cb Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 14:04:22 +01:00
David Baker
ce119a6364 Add buttons to room sub list headers 2017-05-04 13:55:52 +01:00
Luke Barnard
694fc26a55 Merge pull request #855 from matrix-org/luke/fix-jump-to-rm-in-mels 
Fix jumping to an unread event when in MELS
 2017-05-04 13:03:30 +01:00
Luke Barnard
6d9a1f047d Typo 2017-05-04 13:03:04 +01:00
Luke Barnard
bfa3123f9b Combine data-scroll-token and -contained-scroll-tokens 
- Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens
 2017-05-04 10:00:13 +01:00
Michael Telatynski
9d92f93fcb consolidate call onPageUnload handler into RoomView 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:39:19 +01:00
Michael Telatynski
356d29939c also warn when quitting mid-call 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:25:27 +01:00
Michael Telatynski
b6fd771b9a move implementation to MessageComposer to it applies to any future composers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:21:35 +01:00
Michael Telatynski
74b2c86f93 tidy up UserSettings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:17:12 +01:00
Michael Telatynski
76e98d4267 improve version hyperlinking 
removed redundant v prefix (key already says version)
links to most applicable version/tag
tag-commit -> commit
commit1-commit2-commit3 -> commit1
(v)x.y.z -> tag<x.y.z>
commit -> commit

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:12:58 +01:00
Luke Barnard
af137f8867 Validate phone number on login 
To prevent confusion when accidently inputting mxid or email. Fixes https://github.com/vector-im/riot-web/issues/3637
 2017-05-02 18:30:46 +01:00
Luke Barnard
4febc63aee Add comment to _scrollToToken 2017-05-02 17:41:09 +01:00
Luke Barnard
fe83a99ab7 Update ScrollPanel docs 2017-05-02 17:36:59 +01:00
Luke Barnard
3f25928380 Fix jumping to an unread event when in MELS 
This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child.

MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS).
 2017-05-02 16:34:39 +01:00
Michael Telatynski
daae3bd1ec warn on unload when uploading file(s) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-29 06:27:06 +01:00
Michael Telatynski
6685cbcb25 make MessageComposerInput (new and old) warn on unload 
new needs binding due to class this ref being softer
couldn't do this nicely in MessageComposer/Input as
isTyping wasn't propagated.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-29 06:26:59 +01:00
David Baker
083d5bf463 Other empty sections no longer need to be greyed 2017-04-28 11:20:29 +01:00
David Baker
f5f35e3294 Make the left panel more friendly to new users 
https://github.com/vector-im/riot-web/issues/3609
 2017-04-28 11:10:21 +01:00
David Baker
b91f53652d Merge pull request #848 from matrix-org/luke/room-directory-improve 
Improve RoomDirectory Look & Feel
 2017-04-27 18:28:28 +01:00
Luke Barnard
88abe54ffe Give the SRH its prop back 2017-04-27 17:58:02 +01:00
Luke Barnard
791f7f7f6b Merge branch 'luke/room-directory-remove-rhs' into luke/room-directory-improve 2017-04-27 17:57:19 +01:00
Luke Barnard
0b06e979cb Add optional tintable SVG icon for SimpleRoomHeader 2017-04-27 17:57:13 +01:00
Luke Barnard
9d57e8b959 Merge pull request #845 from matrix-org/luke/rm-fix 
Only show jumpToReadMarker bar when RM !== RR
 2017-04-27 17:01:39 +01:00
Luke Barnard
6313193aa8 Null check readMarkerEventId, update comment 2017-04-27 16:52:40 +01:00
Luke Barnard
50831796bb Remove RHS when viewing RoomDirectory 2017-04-27 16:49:23 +01:00
Richard van der Hoff
786fa6b6e7 Merge pull request #846 from matrix-org/luke/fix-rm-stuck-in-mels 
Allow MELS to have its own RM
 2017-04-27 15:22:24 +01:00
Luke Barnard
2012513c0e Allow MELS to have its own RM 
This inserts a RM if any of the events in a MELS if the RM is tracking an event within it.

Fixes https://github.com/vector-im/riot-web/issues/3749
 2017-04-27 14:16:50 +01:00
Luke Barnard
8f7359fce1 Only show jumpToReadMarker bar when RM !== RR 
If RM !== RR, use the pos. of the RM to determine whether it is visible, as before.
 2017-04-27 14:03:54 +01:00
Matthew Hodgson
fc774e8508 Merge pull request #808 from matrix-org/rob/shiny-avatars 
(Room)?Avatar: Request 96x96 avatars on high DPI screens
 2017-04-27 12:02:52 +01:00
Robert Swain
39de37b547 *Avatar: Calculate thumbnail dimensions based on devicePixelRatio 
Multiply the dimension by the device pixel ratio and then round it to
get the width/height of the thumbnail to use in the request.
 2017-04-27 12:38:03 +02:00
Luke Barnard
63224ff164 Add mx_EventTile_emote class 2017-04-26 18:00:25 +01:00
David Baker
1913a32fbd Merge pull request #841 from matrix-org/luke/fix-double-dialogs 
Fix dialog reappearing after hitting Enter
 2017-04-26 17:47:53 +01:00
Luke Barnard
5f0ecc588f Fix dialog reappearing after hitting Enter 
Fixes https://github.com/vector-im/riot-web/issues/3714

https://github.com/vector-im/riot-web/issues/3714#issuecomment-297460620 :
> It's as if there are two dialogs and as one closes, the other one appears. For some reason matrix-org/matrix-react-sdk#822 is causing this.
> I've realised it's because the `priorActiveElement` is probably the button that opened the dialog. If this is focused and the enter key is released, this triggers a keyPress which fires once the dialog has closed and the button has been focused 😬 the BaseDialog only calls stopPropagation _onKeyDown.

The soln. was to submit the dialog as finished `onKeyUp`. This means the `priorActiveElement` is focussed after any key events that should be associated with the dialog.
 2017-04-26 17:37:52 +01:00
David Baker
4910a225d1 Fix spinner that shows until the first sync 
Listen for the sync event and update when it changes
 2017-04-26 17:26:53 +01:00
Luke Barnard
9ac06d4c79 Merge pull request #839 from matrix-org/dbkr/spinner_until_sync 
Show spinner until first sync has completed
 2017-04-26 14:34:08 +01:00
David Baker
df283dae47 Show spinner until first sync has completed 
Shows the 'forward paginating' spinner until the first sync has
completed.

Fixes https://github.com/vector-im/riot-web/issues/3318
 2017-04-26 14:05:09 +01:00
David Baker
04f44e9201 Style fixes for LoggedInView 
PRing this becaise I was going to change LoggedInView, so did
some code style updates, but then decided the do the change
elsewhere.
 2017-04-26 13:48:03 +01:00
Luke Barnard
5cbf77b53e Merge pull request #834 from matrix-org/dbkr/fix_registration_custom_server 
Fix specifying custom server for registration
 2017-04-26 10:41:29 +01:00
Luke Barnard
4207bf31f2 Merge pull request #833 from matrix-org/luke/improve-country-dd 
Improve country dropdown UX and expose +prefix
 2017-04-26 10:25:10 +01:00
David Baker
78b452818c Merge pull request #836 from t3chguy/fix_UserSettingsStore 
Fix user settings store
 2017-04-26 10:11:32 +01:00
Michael Telatynski
6cbd04045d change the now working defaults 
to what they effectively were when defaultValue was broken
(hopefully tests now pass)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-25 22:17:25 +01:00
David Baker
fa9c2d1373 Fix specifying custom server for registration 
Broken by 9cd7914ea5
(ServerConfig interface changed but Registration not updated)
 2017-04-25 19:21:09 +01:00
David Baker
c1336f09fe Merge remote-tracking branch 'origin/develop' into luke/improve-country-dd 2017-04-25 18:06:04 +01:00
Luke Barnard
96e7479d8b Show "jump to message" when message is not paginated 2017-04-25 17:19:36 +01:00
Luke Barnard
71a119376c Guard against no children 2017-04-25 17:05:54 +01:00