David Baker
7aab6fa6f1
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-18 09:35:57 +01:00
David Baker
4c6419a3c5
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-16 13:24:13 +01:00
Bruno Windels
b412b9e84d
Fix stopPeeking not being called at the right time
...
stopPeeking is currently not called when navigating to a joined room
after having peeked a room. This causes the /events endpoint for the
peeked room to be called until peeking another room, even when not
viewing the peeked room anymore.
The current code would only stop peeking if you joining were true (note the nesting),
e.g. when waiting for your join to be confirmed by /sync.
This change might make stopPeeking called also when not needed by there is a guard in
that method to do nothing if not currently peeking.
2018-07-12 15:19:25 +02:00
Matthew Hodgson
ffec1b5a95
fix lint
2018-07-09 20:11:17 +01:00
Luke Barnard
5af8ddcf10
Fix import
2018-07-06 11:00:39 +01:00
David Baker
b6f854abe4
Simplify event name as it's the only one
2018-07-05 20:00:42 +01:00
David Baker
eb552e5cef
Just pass the roomId into WidgetEchoStore
2018-07-05 18:43:20 +01:00
Luke Barnard
d53c836fd7
Implement aggregation by error type for tracked decryption failures
2018-07-05 13:54:44 +01:00
Michael Telatynski
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist
2018-07-04 11:21:16 +01:00
David Baker
8b64ddcbe8
Do some level of local echo for widgets
...
* Show a spinner while we wait for widgets to be deleted
* Hide widgets while they're pending deletion
* Don't put another jitsi widget into the room if there's already
one pending
2018-07-03 11:16:44 +01:00
Luke Barnard
0dd3a77432
Track an event name when tracking a decryption failure
...
Otherwise piwik will not agregate the failures correctly for all views.
2018-07-02 09:45:32 +01:00
Michael Telatynski
37a8e7f2e2
add setting to throw new RoomSubList hide behaviour behind an opt-in
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:07:28 +01:00
Michael Telatynski
ca83f1e8c8
allow RoomSubList to use old behaviour of not hiding even if empty
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-30 17:06:33 +01:00
David Baker
80a9bc3f2a
Merge pull request #2029 from matrix-org/luke/fix-connection-lost-message-layout
...
Fix layout bug introduced by #2025
2018-06-29 10:49:15 +01:00
Luke Barnard
ad5f1bf180
Fix layout bug introduced by #2025
...
Fixes https://github.com/vector-im/riot-web/issues/6958
(https://github.com/matrix-org/matrix-react-sdk/pull/2025 )
2018-06-29 09:46:01 +01:00
Luke Barnard
01dd387970
Track UISIs in bulk
...
Piwik supports sending an event value, which we can use to indicate
cardinality of UISIs to be tracked instead of tracking them individually.
This means we can track them at a lower frequency of (fairly arbitrary)
60s.
2018-06-28 15:07:27 +01:00
Luke Barnard
66002a4c00
Fix status bar element positioning
2018-06-27 15:19:27 +01:00
Luke Barnard
8be173cae3
Show nicer error when receiving a consent error after sending a message
2018-06-27 15:17:57 +01:00
David Baker
6fb57c0c66
Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click
...
on room sub list badge click goto first relevant room
2018-06-27 10:29:22 +01:00
Michael Telatynski
613e83edb4
on roomsublist invite badge click goto first room/group
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:49:58 +01:00
Michael Telatynski
b3341e6664
on click roomsublist notif badge, goto first room with notif
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:49:25 +01:00
David Baker
67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist
...
fix historical section
2018-06-26 18:26:29 +01:00
David Baker
9539a749e5
More refactoring
2018-06-26 16:03:58 +01:00
Michael Telatynski
abd37d141e
clear up if statement to make it more readable
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:54:38 +01:00
Michael Telatynski
f5519c21b9
Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/i18n/strings/en_EN.json
2018-06-26 07:51:16 +01:00
Michael Telatynski
9b50daa748
give Historical an emptyContent to make it look more consistent
...
and also to unbreak it since now !emptyContent get hidden
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:46:33 +01:00
Michael Telatynski
de316134a9
Merge branch 'develop' into t3chguy/login_local_error
2018-06-25 13:35:14 +01:00
David Baker
553111b6e2
Merge pull request #2001 from matrix-org/t3chguy/default_url_previews_off_e2ee
...
default to not showing url previews in e2ee rooms.
2018-06-25 11:50:14 +01:00
David Baker
e29e106efc
Merge pull request #1999 from matrix-org/t3chguy/chain_contextmenu
...
allow chaining right click contextmenus
2018-06-25 11:34:10 +01:00
Michael Telatynski
301b8b8c56
Merge pull request #1954 from matrix-org/t3chguy/hide_empty_sublist
...
hide empty roomsublists when filtering via search/tagpanel
2018-06-25 11:30:03 +01:00
Michael Telatynski
fabdf22aad
delint RoomSubList and generate eslintignore file
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-25 09:54:33 +01:00
Michael Telatynski
a174555452
hide RoomSubList if has 0 tiles and either searchFilter or emptyContent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-25 09:42:42 +01:00
Michael Telatynski
15e75ca7b3
generate local errors for blank fields during login
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-23 17:12:00 +01:00
Michael Telatynski
eb80022991
focus composer after interacting with e2ee statusbar/udd
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-23 16:40:27 +01:00
Michael Telatynski
b23f84e1f5
add XXX comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 19:23:39 +01:00
Michael Telatynski
b7396c8ef0
trigger urlPreviews state update on {,room}AccountData changes of settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 19:17:55 +01:00
Michael Telatynski
acbc84a69c
switch to another settings key for e2e url previews to protect on change
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:44:54 +01:00
Michael Telatynski
ed1f801254
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:36:07 +01:00
Michael Telatynski
a45dc837b4
add copyright
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:36:01 +01:00
Michael Telatynski
891070d001
update UrlPreview settings to be more privacy-aware in e2ee rooms
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 18:35:54 +01:00
Michael Telatynski
5b027c6410
Merge pull request #2003 from matrix-org/t3chguy/lang_select_register_view
...
factor out conditional LanguageSelector as functional component
2018-06-22 16:01:51 +01:00
Michael Telatynski
548a06cad2
use JSX and import via sdk rather than directly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 14:47:57 +01:00
Michael Telatynski
88ecaced82
Merge pull request #1992 from matrix-org/t3chguy/focus_rte_after_when_uploadingFile
...
Upload File confirmation modal steals focus, send it back to composer
2018-06-22 10:56:17 +01:00
Luke Barnard
f15b877a55
Merge pull request #1977 from matrix-org/t3chguy/ctrl-k_tab
...
allow using tab to navigate room list in a smarter way
2018-06-22 10:35:28 +01:00
Michael Telatynski
f32da97a3a
delint and run generate-eslint-error-ignore-file
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 14:04:08 +01:00
Michael Telatynski
58be44ad9e
factor out conditional LanguageSelector as functional component
...
and reuse in Login, ForgotPassword and Registration views
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-21 13:51:39 +01:00
Michael Telatynski
a0207fb7fd
Merge pull request #1982 from matrix-org/t3chguy/nvl/fix_set_password-email_flow
...
fix set password & email flow possible to get stuck and onBlur murdering your email
2018-06-21 11:42:53 +01:00
Michael Telatynski
4508da5666
only override contextmenu if closeMenu is provided
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-20 18:03:15 +01:00
Michael Telatynski
7cd8a5a2b2
allow chaining right click contextmenus
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-20 18:01:37 +01:00
Michael Telatynski
6200c147a6
Upload File confirmation modal steals focus, send it back to composer
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-19 08:41:24 +01:00