Commit graph

2301 commits

Author SHA1 Message Date
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
Michael Telatynski
015d433235
fix a way to get stuck in set password/email flow
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-18 18:14:48 +01:00
Michael Telatynski
6301c04590
Merge branch 'develop' into t3chguy/ctrl-k_tab 2018-06-18 18:01:41 +01:00
David Baker
0d05250914
Merge pull request #1983 from matrix-org/t3chguy/fix_filepanel_showing_roomavatar
only show m.room.message in FilePanel
2018-06-18 13:48:39 +01:00
David Baker
a32ffa83ef
Merge pull request #1979 from matrix-org/t3chguy/max_continuation_interval
split continuation if there is a gap in conversation
2018-06-18 11:22:51 +01:00
David Baker
a918d73c29
Merge pull request #1973 from matrix-org/t3chguy/fix_react_proptypes_warnings
fix a bunch of instances of react console spam
2018-06-18 10:47:20 +01:00
David Baker
210d920a92
Merge pull request #1949 from matrix-org/luke/track-uisis-piwik
Track decryption success/failure rate with piwik
2018-06-18 10:12:26 +01:00
Michael Telatynski
eb32dda260
given we also want to hide widget events, hide all except m.room.message
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 19:52:15 +01:00
Michael Telatynski
b87824ba92
hide m.room.avatar from FilePanel via sync filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 19:50:51 +01:00
Michael Telatynski
7d19841e68
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 09:48:57 +01:00
Michael Telatynski
61e09395d0
split continuations if longer than N
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 09:45:06 +01:00
Michael Telatynski
423b8939e7
simplify handled logic by inverting it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:52:14 +01:00
Michael Telatynski
ff33ef4b51
allow using tab to navigate room list smarter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:50:53 +01:00
Michael Telatynski
1afdb0e3c0
add null-guard
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:44:57 +01:00
Michael Telatynski
8971211639
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:42:40 +01:00
Michael Telatynski
efaccf7344
implement hitting enter after Ctrl-K should switch to the first result
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-16 08:42:28 +01:00
Michael Telatynski
43681026b8
s/onClick/onChange because react cries about it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 19:01:12 +01:00