mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 16:51:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
11415 commits 219 branches 562 tags 474 MiB
Commit graph

5529 commits

Author SHA1 Message Date
Matthew Hodgson
a5b932bfdd
Merge pull request #2066 from matrix-org/t3chguy/slate_cont2 
Slate fixes
 2018-07-16 21:29:20 +01:00
Michael Telatynski
3000099991
add additional checks for hiding autocomplete to prevent text calculation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 21:27:52 +01:00
Michael Telatynski
bdbc2cbd38
disable spellCheck when the placeholder is shown because "unencrypted" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 18:32:50 +01:00
Michael Telatynski
c7859fed1a
add heuristic to compare documents to prevent autocomplete flicker 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 18:27:06 +01:00
David Baker
a79caed0c9 Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms 2018-07-16 17:21:51 +01:00
David Baker
379d65bd6c
Merge pull request #2064 from matrix-org/t3chguy/slate_cont2 
simplify MessageComposerStore and improve its performance
 2018-07-16 17:20:48 +01:00
Michael Telatynski
2f1779751b
make the MessageComposerStore stateless for better performance 
and inter-tab composition (by simplifying it. WIN-WIN)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 16:56:08 +01:00
David Baker
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate 
Replace Draft with Slate
 2018-07-16 14:16:25 +01:00
David Baker
415eef5aec
Merge pull request #2055 from matrix-org/bwindels/stop-peeking-fix 
Fix not stopping to peek when navigating away from peeked room
 2018-07-16 13:33:13 +01:00
David Baker
4c6419a3c5 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-16 13:24:13 +01:00
David Baker
ff96537048 lint 2018-07-16 11:49:53 +01:00
Michael Telatynski
29d48e5dad
guests trying to join communities should fire the ILAG flow. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-15 22:48:25 +01:00
Michael Telatynski
ffe0b35504
while logging out ignore Session.logged_out as it is intentional 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-15 22:33:00 +01:00
Michael Telatynski
4850387ae0
add null-guard for stickerpickerWidget in StickerPicker 2018-07-13 14:24:29 +01:00
Bruno Windels
7bbb967ddd
Merge pull request #2053 from matrix-org/dbkr/jitsi_always_on_screen 
Implement always-on-screen capability for widgets
 2018-07-13 11:14:37 +01:00
David Baker
e56feea9ec Put always-on-screen widgets in top left 
always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.

Fixes https://github.com/vector-im/riot-web/issues/7007
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053
 2018-07-12 18:43:49 +01:00
David Baker
5a5e967262 Fix avatars vanishing on hover 
Turns out the z-index was to make the avatar appear above the
EventTile_line even though it comes before in the DOM (it's
absolutely positioned to overlap with it). Instead, just put
it afterwards in the DOM.
 2018-07-12 17:48:49 +01:00
Michael Telatynski
7405c5eff2
specify alternate history storage key to prevent conflicts with draft 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-12 16:35:42 +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
David Baker
8f10ee01c6 Implement always-on-screen capability for widgets 
As per https://github.com/matrix-org/matrix-doc/issues/1354

This is whitelisted to only jitsi widgets for now as per comment,
mostly because any widget that we may make always-on-screen we need
to preemptively put in a PersistedElement container, which is
unnecessary for any other widget.

Apologies that this does a bunch of refactoring which could have
been split out separately: I only discovered what needed to be
refactored in the process of doing this.

Fixes https://github.com/vector-im/riot-web/issues/6984
 2018-07-11 18:07:32 +01:00
Michael Telatynski
b4bc09c335
null-guard savedState since now we're accessing its props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 17:13:33 +01:00
Michael Telatynski
3e05bf19c5
hide autocomplete when moving caret to match existing behaviour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 16:30:45 +01:00
Michael Telatynski
95909de446
fix MessageComposer not marking translatable strings. run gen-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 11:39:55 +01:00
Michael Telatynski
c3aef6e3a0
workaround for tommoor/slate-md-serializer#14 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 10:29:14 +01:00
Michael Telatynski
fd4f9679df
convert md<->rt if the stored editorState was in a different state 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-11 09:43:39 +01:00
Bruno Windels
3e14cd2190
Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling 
fix nullguard on EventTile, getComponent never returns falsey, it throws
 2018-07-11 09:12:49 +01:00
Michael Telatynski
abbb69dc36
fix fn call, fixes usage of SlashCommands 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 17:35:13 +01:00
David Baker
25e453badd Fix stickerpicker PersistedElement usage 
Earlier PR changed the prop to persistKey in PersistedElement but
containerId here, so this was ending up as 'undefined'.
 2018-07-10 17:32:17 +01:00
Matthew Hodgson
02c6f3d168 fix typo 2018-07-10 15:18:07 +01:00
Michael Telatynski
100ecfe7ce
remove trailing spaces to make linter happy (no-trailing-spaces) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 10:29:52 +01:00
Michael Telatynski
58301e5dd4
navigateHistory only when at edges of document, to prevent Firefox bug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 10:28:17 +01:00
Matthew Hodgson
51591a4d62 fix lint 2018-07-09 20:49:31 +01:00
Matthew Hodgson
ffec1b5a95 fix lint 2018-07-09 20:11:17 +01:00
Matthew Hodgson
0d0934add7
unbreak modifier+space (e.g. emoji insert on macOS) 
(cherry picked from commit c490f87)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:58:04 +01:00
Matthew Hodgson
021409aafe
apply review feedback from @lukebarnard1 
(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:54:57 +01:00
Michael Telatynski
5b74c615ae
add missing import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 47b6099)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:42:57 +01:00
Michael Telatynski
43204ea177
fix Control-Backspace after select-all 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0f32ec0)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:42:10 +01:00
Michael Telatynski
faf17f06c6
remove debugger statement 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b6f7940)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:36 +01:00
Michael Telatynski
483116fb03
add rule to slate-md-serializer: make underlined and removed work for CM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b521efd)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:29 +01:00
Michael Telatynski
372fa29ad3
take edge into consideration when moving focus region on arrow keys 
fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0982617)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:20 +01:00
Michael Telatynski
c6837af398
import-type Change from slate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 85ed499)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:00 +01:00
Matthew Hodgson
efdc5430d7 merge develop 2018-07-09 17:50:07 +01:00
David Baker
1646c3180c
Merge pull request #2041 from matrix-org/t3chguy/improve_devtools_perf 
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes
 2018-07-09 10:17:05 +01:00
Matthew Hodgson
aa9208d6b4
Merge pull request #2046 from Half-Shot/hs/show-server-bans 
Show m.room.server_acl
 2018-07-06 19:17:30 +01:00
Will Hunt
a6cff4a969 Show server bans in the timeline 2018-07-06 11:06:31 +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
dc6b3cb081
showing all is pretty slow, show an additional 50 instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-04 13:07:57 +01:00
Michael Telatynski
e5392e2c00
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-04 12:57:22 +01:00
Michael Telatynski
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist 2018-07-04 11:21:16 +01:00
Michael Telatynski
6c91952d26
Merge pull request #2039 from akihikodaki/sticker_upstream 
Import react as React in src/components/views/messages/MStickerBody.js
 2018-07-04 11:11:53 +01:00
Akihiko Odaki
f941c93322 Import react as React in src/components/views/messages/MStickerBody.js 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-07-04 18:28:56 +09:00
David Baker
ad35fbf208 Pull out z-index to the sticker picker 
As it's not a thing that's necessary for other PersistedElements,
only the sticker picker because it has to sit above the ContextMenu
it sits in.
 2018-07-03 18:25:33 +01:00
David Baker
74f2d0a360 Use inline class field for PropTypes 2018-07-03 14:54:43 +01:00
David Baker
3f88721bc1 Give PersistedElement a key 
So there can be more than one on a page
 2018-07-03 14:43:27 +01:00
David Baker
c665ab8a22 Add error dialog if widget remove fails 
Also up the timeout because matrix.org is that slow
 2018-07-03 11:55:41 +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
767e67dc70
Merge pull request #2033 from matrix-org/luke/track-uisis-piwik-specify-event-name 
Track an event name when tracking a decryption failure
 2018-07-02 10:26:34 +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
Michael Telatynski
ea6e1b6f72
Merge branch 'develop' into t3chguy/warn_self_mute 2018-06-29 19:17:43 +01:00
Michael Telatynski
85a0736c78
update wording as per D4ve's feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 19:16:56 +01:00
Michael Telatynski
322b77b57f
don't throw, console.warn + dummy render instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-29 12:54:36 +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
David Baker
b07a2cb09a
Merge pull request #2028 from matrix-org/luke/fix-room-settings-editable-text-resets 
Fix room topics/names resetting when UserSetting re-renders
 2018-06-29 10:46:48 +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
016e9176f6 Fix room topics/names reseting when UserSetting re-renders 
This reverts a fix to EditableText introduced in
    https://github.com/matrix-org/matrix-react-sdk/pull/1445
which introduced a bug that causes room name and topic to
reset when UserSettings is rerendered because
    `initialValue != this.value`

This also fixes the same bug originally fixed by #1445:
 >fix entering the same thing twice (which had the bug of not
 >emptying the "new" field)

which, in other words meant that clicking "+" when adding a room
alias would not reset the contents of the bottom-most alias in the
list.

The fix is to increment the `key` of the element, causing a new
instance to be mounted instead of passing new props to the existing
one.
 2018-06-28 18:11:52 +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
Michael Telatynski
55f4f1723d
fix nullguard on EventTile, getComponent never returns falsey, it throws 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-27 11:44:11 +01:00
Luke Barnard
6345fcb8f2 Fix incorrectly positioned copy button on <pre> blocks 2018-06-27 11:31:55 +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
a6ab51cd73
change GroupInviteTile from RoomSubList css so new :hover won't apply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-27 09:50:32 +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
fddb576c3a
Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize 
Fix RoomSubList headers by re-commiting 1faecfd
 2018-06-26 18:23:38 +01:00
Michael Telatynski
f40802e9d8
Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop 
don't fire share dialog when clicking timestamp of event,
 2018-06-26 17:46:52 +01:00
Michael Telatynski
67f803bc5f
don't fire share dialog when clicking timestamp of event, 
it was tripping people up and broke search permalinks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 16:59:49 +01:00
David Baker
0ee8d18f5a More code de-duping 2018-06-26 16:41:44 +01:00
David Baker
c780cd05a8 Change argument order of setRoomWidget 
So when deleting a widget we can just omit the ones we don't need
 2018-06-26 16:33:28 +01:00
David Baker
a88297d7a6 More code reuse 2018-06-26 16:27:17 +01:00
David Baker
9539a749e5 More refactoring 2018-06-26 16:03:58 +01:00
David Baker
6cf11a15e6 Move WidgetUtils to utils dir 2018-06-26 11:59:16 +01:00
David Baker
0f2c47937c Merge the two different widget utils files 2018-06-26 11:52:21 +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
Luke Barnard
e292ee942f Fix RoomSubList headers by re-commiting 1faecfd 
The original got reverted in ebfafb36 somehow.
 2018-06-25 16:37:45 +01:00
Michael Telatynski
de316134a9
Merge branch 'develop' into t3chguy/login_local_error 2018-06-25 13:35:14 +01:00
David Baker
317c38ccdf
Merge pull request #2010 from matrix-org/t3chguy/message_context_menu 
use enum constants for EventStatus and correct isSent check
 2018-06-25 13:23:02 +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
Luke Barnard
a24cb8e678
Merge pull request #2008 from matrix-org/t3chguy/focus_composer 
fix instances of composer not getting/regaining focus
 2018-06-25 10:22:29 +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
Luke Barnard
383dccebb4
Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes 
notif panel fixes
 2018-06-25 09:53:24 +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
6e0db5bfb6
use enum constants for EventStatus and correct isSent check 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:41:50 +01:00
Michael Telatynski
61def4a973
highlight top field if blank otherwise the password field. 
remove unused refs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:26:16 +01:00
Michael Telatynski
4a5fbf2c84
clear error on login type change 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:13:40 +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
e1ba6949d0
expand composer input focus region and apply cursor:text to it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 16:40:53 +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
f7a0ad3aa0
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:29:38 +01:00
Michael Telatynski
807d72f2d9
nullguard SenderProfile,broke when NotifPanel had evs from forgotten rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:22:38 +01:00
Michael Telatynski
aff2cc9065
EventTile:notif apply EmojiText to room name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:21:42 +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
ed4b82f8fc
update wording and style it like text (text cursor) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:36:19 +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
32ab997230
properly style Group Pill 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 14:38:06 +01:00
Michael Telatynski
d92d95c37d
don't fall back to getGroups as it gets it no additional data 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 12:11:16 +01:00
Michael Telatynski
561b9699fc
Merge branch 'develop' into t3chguy/community_autocomplete 2018-06-22 12:00:34 +01:00
David Baker
771eac0075
Merge pull request #1971 from matrix-org/dbkr/jitsi_makewidget 
Very basic Jitsi integration
 2018-06-22 11:45:18 +01:00
Luke Barnard
3aee0b56ae
Merge pull request #1994 from matrix-org/t3chguy/fix_group_tile_overflow 
add additional classes which protect the text from overflowing
 2018-06-22 11:41:13 +01:00
David Baker
6252f5b818 Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget 2018-06-22 11:31:54 +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
5b8e453484
Merge pull request #1991 from matrix-org/t3chguy/delint_MImageBody 
delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry
 2018-06-22 10:38:56 +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
Luke Barnard
9265f0d032
Merge pull request #1990 from matrix-org/t3chguy/no_displayname 
fix no displayname usersettings
 2018-06-22 10:34:04 +01:00
Luke Barnard
8b257f2f50
Merge pull request #1989 from matrix-org/t3chguy/right_click_tagpanel_contextmenu 
trigger TagTile context menu on right click
 2018-06-22 10:23:58 +01:00
Michael Telatynski
26aec4364d
Merge pull request #2000 from matrix-org/t3chguy/deduplicate_address_picker 
hide already chosen results from AddressPickerDialog
 2018-06-21 14:07:52 +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
be612998bd
invert boolean operation for readability and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 12:14:16 +01:00
Michael Telatynski
0737965079
s/userList/selectedList/ & s/queryList/suggestedList/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 12:13:27 +01:00
Luke Barnard
e148eb1a93
Merge pull request #2002 from matrix-org/t3chguy/fix_ChatCreateOrReuseDialog_onCancel 
delint ChatCreateOrReuseDialog
 2018-06-21 12:00:15 +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
2428eb12af
delint ChatCreateOrReuseDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 11:37:37 +01:00
Michael Telatynski
fd252ded60
take into account the addressType also 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 00:47:21 +01:00
Michael Telatynski
4040e3f5cf
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 00:37:37 +01:00
Michael Telatynski
bce87829b6
hide already chosen results from AddressPickerDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 00:33:24 +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
David Baker
a6d9c25b70
Merge pull request #1988 from matrix-org/t3chguy/refactor_slashcommands 
refactor, consolidate and improve SlashCommands
 2018-06-20 13:56:29 +01:00
David Baker
e67dae704a Take replies out of labs! 2018-06-20 09:57:11 +01:00
Michael Telatynski
5cc15b2e03
add additional classes which protect the text from overflowing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 19:11:22 +01:00
Michael Telatynski
c1e608f1a8
show permalinks to communities as Pills 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 11:53:17 +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
fffb8379d8
delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 08:37:11 +01:00
Michael Telatynski
9fa7cb8635
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 07:57:28 +01:00
Michael Telatynski
baf0d37983
un-break having no displayname user settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 07:56:04 +01:00
Michael Telatynski
29ea4025d4
trigger TagTile context menu on right click 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 22:13:20 +01:00
Michael Telatynski
85ddc0651b
consolidate the two locations commands are defined, as it was a MESS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 19:34:40 +01:00
Michael Telatynski
f2e4e515c1
delint EditableText 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 18:21:16 +01:00
Michael Telatynski
3449a60d32
fix onBlur breaking the SetEmail field (setting it back empty :() 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 18:21:04 +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
Luke Barnard
bea52eccf8 Remove unused import, constant 2018-06-18 17:40:48 +01:00
David Baker
276c7a9c4d Fix blank sticker picker 
Let the battle of z-indexes commence

https://github.com/matrix-org/matrix-react-sdk/pull/1948/files#diff-8bc8827809a72c7548846c443d19f00aR29
 2018-06-18 15:24:34 +01:00
David Baker
499bb5cfb4
Merge pull request #1972 from matrix-org/t3chguy/media_fixes 
fix e2ee file/media stuff
 2018-06-18 13:56:00 +01:00
David Baker
e7aa2ae009
Merge pull request #1978 from matrix-org/t3chguy/right_click_contextmenu 
right click for room tile context menu
 2018-06-18 13:53:20 +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
Michael Telatynski
f88a2fd8fc
make GroupInviteTile context menu appear where you right clicked instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 12:16:33 +01:00
Michael Telatynski
e0d36b18c9
make RoomTile context menu appear where you right clicked instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 12:08:47 +01:00
Michael Telatynski
1a236499b1
fix import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 11:54:06 +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
Luke Barnard
2379d42162
Merge pull request #1975 from matrix-org/t3chguy/route_matrixto_group_links 
route matrix.to/#/+... links internally (not just group ids)
 2018-06-18 09:35:46 +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
fd90992294
s/onClick/onChange on checkbox to make React happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 15:58:16 +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
4fdb64a049
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 09:10:13 +01:00
Michael Telatynski
8fa96e19d5
allow rightclicking for exposing room tile context menus 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 09:07:16 +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
3ebec92ac5
replace hardcoded matrix.to with reference to const in matrix-to 
for easier changing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 08:27:47 +01:00
Michael Telatynski
df15841483
split too long line 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 19:28:23 +01:00
Michael Telatynski
b97aa77aca
factor out warn self demote and apply to muting yourself 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 19:27:23 +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
Michael Telatynski
a899871d52
specify unique key to make react happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 18:55:37 +01:00
Michael Telatynski
a7f5059aca
add nop to fix onClick being required warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 18:55:21 +01:00
Michael Telatynski
a2219472f6
inline redundant bodyNodes, fixes react no unique key warning too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 18:47:15 +01:00
Michael Telatynski
5fbadbc44f
comment out visibility:hidden div as it seems unfinished 
and refers to undefined method `this._onJoinGroupClick`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 18:42:51 +01:00
Michael Telatynski
856d1ee5f9
fix: Invalid prop focus of type string supplied to DialogButtons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-15 18:39:12 +01:00
Luke Barnard
b0a2772889 Use more consistent start/stop pattern 2018-06-15 17:58:43 +01:00
Luke Barnard
488cc416cf For now, shelve persistance across sessions 2018-06-15 17:08:11 +01:00
Luke Barnard
7489d7d531 Fix incorrect call to DFT 2018-06-15 16:50:52 +01:00
Luke Barnard
f08274585e Persist tracked event ID hash using localStorage 2018-06-15 15:30:54 +01:00
Luke Barnard
cfe52a2888 Instead of passing dft.eventDecrypted, call it instead 
So that `this` has the correct reference.
 2018-06-15 15:15:05 +01:00
David Baker
8cf17a66e5 Very basic Jitsi integration 
Replaces the conference calling by adding a Jitsi widget. No support
for continuing the call on room change currently, so hidden behind
a feature flag. Existing behaviour is preserved by default.
 2018-06-15 15:12:32 +01:00
Luke Barnard
62601d657d Implement DecryptionFailureTracker for less agressive tracking 
Instead of pinging Analytics once per failed decryption, add the failure
to a list of failures and after a grace period, add it to a FIFO for
tracking. On an interval, track a single failure from the FIFO.
 2018-06-15 13:42:18 +01:00
David Baker
73b49d6d5e
Merge pull request #1968 from matrix-org/t3chguy/fix_QuestionDialog 
QuestionDialog pass hasCancelButton to DialogButtons
 2018-06-15 10:58:54 +01:00
David Baker
88a807d89b
Merge pull request #1965 from matrix-org/t3chguy/show_redacted_sticker 
check type before msgtype in the case of `m.sticker` with msgtype
 2018-06-15 10:56:33 +01:00