Commit graph

5921 commits

Author SHA1 Message Date
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
David Baker
349f95d5ab
Merge pull request #1957 from matrix-org/t3chguy/roomsublist_search_aliases
apply roomlist searchFilter to aliases if it begins with a `#`
2018-06-15 10:55:32 +01:00
David Baker
6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
Share Dialog
2018-06-15 10:52:27 +01:00
Michael Telatynski
826df5765c
add rel noopener to cross origin loader (currently rel="undefined")
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 10:27:21 +01:00
Michael Telatynski
7adbff69dc
QuestionDialog pass hasCancelButton to DialogButtons
otherwise E2E Q Dialog has OK and Cancel which makes 0 sense
as its just an info dialog

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 18:58:38 +01:00
Michael Telatynski
7de7275c6d
remove subheadings in ShareDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 18:56:46 +01:00
Luke Barnard
e81edd958b
Merge pull request #1950 from matrix-org/t3chguy/group_invite_contextmenu
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
2018-06-14 17:32:24 +01:00
Luke Barnard
5077e9e89b
Merge pull request #1958 from matrix-org/dbkr/widget_waiting
Fix widgets re-appearing after being deleted
2018-06-14 17:31:23 +01:00
Michael Telatynski
3b141d7a84
change variable names for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 16:48:00 +01:00
Luke Barnard
2eb23ed234 Add loadedImageDimensions to initial state 2018-06-14 15:53:49 +01:00
Luke Barnard
2d14d51ecb Handle images without width/height info correctly
Prior to #1912, height fix up of image events without an `info` in their
content would fail, setting `style.height = null + "px"`.

Now that all thumbnail sizing is done through one path, we can fix the
same problem for all cases (images, stickers, e2e/non-e2e) by handling
images without `info` correctly.

At the bare minimum, we use a null-guard that will make sure an image
without an `info` does not appear in the timeline (as a spinner or
otherwise until loaded). When loaded, we size it like any other image
by using the natural dimensions of the loaded image in place of `info`.

Note that we do not apply the same logic to images that *do* specify an
`info` with `w` and `h` keys. If the aspect ratio of the image does not
match that of the event, we use the one in `info` even when the image
has loaded.
2018-06-14 15:44:55 +01:00
Luke Barnard
c8d233c0a6 If unspecified, don't crash if missing thumbnail info
applies to stickers/images.

We might want to consider to do that is better than assuming a aspect
ratio of 600 x 800 (4:3).
2018-06-14 14:19:30 +01:00
Michael Telatynski
1346f47a12
allow filtering Group Invite Tiles with the same search filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 14:18:39 +01:00
Michael Telatynski
4e216714b5
remove commented code and move modal.close into a finally block
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:53:02 +01:00
Michael Telatynski
33a3cfead6
controlled checkboxes use checked not value
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:47:33 +01:00
Michael Telatynski
ef178b282c
use getters on MatrixEvent for roomId and eventId
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:44:05 +01:00
Michael Telatynski
bef435e15a
allow ShareEvent to devolve into ShareRoom using checkbox + i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:41:12 +01:00
Michael Telatynski
7d7a6f3d9c
ShareDialog share Message, link to timestamp and permalink in ctx menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:35:35 +01:00
Michael Telatynski
aa7d62b740
fix naming of methods and fields
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 13:20:16 +01:00
Michael Telatynski
9a225840ce
check type before msgtype in the case of m.sticker with msgtype (undef)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 12:00:53 +01:00
David Baker
5523c1e50a
Merge pull request #1964 from matrix-org/t3chguy/tag_panel_a11y
fix styling of clearButton when its not there
2018-06-14 11:47:44 +01:00
Michael Telatynski
3b501137a5
change cursor:pointer iff clicking TagPanel background does something
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:42:21 +01:00
Michael Telatynski
c811c30c0d
fix styling of clearButton when its not there
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:36:04 +01:00
Luke Barnard
7029e9ac74
Merge pull request #1912 from matrix-org/luke/kill-mimage-fixupheight
Implement slightly magical CSS soln. to thumbnail sizing
2018-06-14 11:17:15 +01:00
Michael Telatynski
384c974589
tidy up if statements and fix up comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 11:16:57 +01:00
Michael Telatynski
2454540bc0
Merge branch 'develop' into t3chguy/audio_output 2018-06-14 11:03:59 +01:00
David Baker
84a9c6a824
Merge pull request #1960 from matrix-org/t3chguy/tag_panel_a11y
improve tag panel accessibility and remove a no-op dispatch
2018-06-14 10:56:03 +01:00
David Baker
666d469222
Revert "Fix exception when opening dev tools" 2018-06-14 10:52:39 +01:00
David Baker
5804040a9b
Merge pull request #1959 from matrix-org/t3chguy/faded_encrypting_padlock
fix message appears unencrypted while encrypting and not_sent
2018-06-14 10:49:14 +01:00
David Baker
bb99950216
Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception
Fix exception when opening dev tools
2018-06-14 09:45:19 +01:00
Michael Telatynski
d4578783ef
apply pr review feedback
fix copyright headers
fix user settings link accessibility
fix typo and add noopener

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 18:46:02 +01:00
David Baker
038b43aabd
Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker
show redacted stickers like other redacted messages
2018-06-13 17:28:22 +01:00
David Baker
b81e12e4cc Fix exception when opening dev tools
Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.

This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.

Fixes https://github.com/vector-im/riot-web/issues/6436
2018-06-13 16:55:16 +01:00
Michael Telatynski
75abb415d4
improve tag panel accessibility and remove a no-op dispatch
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 16:17:26 +01:00
Michael Telatynski
5cc2361737
change not_sent e2e lock to match colour of text
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 15:52:50 +01:00
David Baker
94125fb566 Fix widgets re-appearing after being deleted
Widgets would sometimes briefly re-appear after having been deleted.
This was because of the following race:
 * User presses delete, send POST req, we set `deleting`. Widget hides.
 * POST request completes, we unset `deleting` so widget unhides.
 * State event comes down sync so widget hides again.

This fixes this by introducing `waitForRoomWidget` and using it to
wait until the state event comes down the sync until clearing the
`deleting` flag.

Since we now have `waitForRoomWidget`, this also uses it when adding
a widget so the 'widget saved' appears at the same time the widget
does.
2018-06-13 15:50:19 +01:00
Michael Telatynski
d4b2f06a63
fix message appears unencrypted while in flight
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 13:51:04 +01:00
Luke Barnard
3cadbd3974 Include decryption error in decryption failure metrics 2018-06-13 11:21:26 +01:00
Luke Barnard
bfb535d05c
Merge pull request #1951 from matrix-org/t3chguy/theme_memberinfo_close_btn
add mx_filterFlipColor to mx_MemberInfo_cancel img
2018-06-13 10:04:23 +01:00
Luke Barnard
5a275fcfef
Merge pull request #1953 from matrix-org/t3chguy/skip_set_displayname
don't set the displayname on registration as Synapse now does it
2018-06-13 10:03:35 +01:00
Michael Telatynski
41be46a712
apply roomlist searchFilter to aliases if it begins with a #
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:51:35 +01:00
Luke Barnard
791784399a
Merge pull request #1955 from matrix-org/t3chguy/create_room_dialog_scaling
allow CreateRoom to scale properly horizontally
2018-06-13 09:45:29 +01:00
Luke Barnard
230de44071 Adjust comment 2018-06-13 09:38:57 +01:00
Luke Barnard
64b86108d0 Only track decryption failures 2018-06-13 09:38:23 +01:00
Michael Telatynski
20caea47f8
make more generic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:32:21 +01:00
Michael Telatynski
846c14062a
show redacted stickers like other redacted messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:28:35 +01:00
Michael Telatynski
22bec0d67d
allow CreateRoom to scale properly horizontally
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:13:32 +01:00
Michael Telatynski
175f1aa15c
don't set the displayname on registration as Synapse now does it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 16:43:54 +01:00
Luke Barnard
b18a8c483e
Merge pull request #1952 from matrix-org/luke/context-menus-downwards-keep-vertically-on-screen
Keep context menus that extend downwards vertically on screen
2018-06-12 16:27:57 +01:00
Luke Barnard
ffcba9498e Keep context menus that extend downwards vertically on screen
This fixes https://github.com/vector-im/riot-web/issues/3429 in the case
of RoomList context menus *and* EventTile context menus.

This was mostly stolen from #1903 and it would be good to factor things
out at a later date such that #1903 is replaced with similar logic
within ContextualMenu.
2018-06-12 16:14:24 +01:00
Michael Telatynski
ed779cabc4
add mx_filterFlipColor to mx_MemberInfo_cancel img
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:35:06 +01:00
Michael Telatynski
9dd2184b33
remove unused imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:29:05 +01:00
Michael Telatynski
c820836bcc
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:23:11 +01:00
David Baker
e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker
13d52065f5 Merge branch 'release-v0.12.7' 2018-06-12 14:23:48 +01:00
Luke Barnard
0934006817 Track decryption success/failure rate with piwik
Emit a piwik event when a decryption occurs in the category "E2E" with
the action "Decryption result" and the name either "failure" or
"success".

NB: This will cause Riot to a lot of networking when decrypting many
events. One HTTP request per decrypted event should be expected.
2018-06-12 14:13:09 +01:00
Michael Telatynski
18546dbe06
QR Code align [m] logo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:33:38 +01:00
Michael Telatynski
d8a1feb501
fix Modal typo and refactor BaseDialog to fix " undefined" className
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:02 +01:00
Michael Telatynski
7f1ce52dd3
link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
Michael Telatynski
64bcf6fd7e
allow ContextualMenu to run without background, for tooltips & fix copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
Michael Telatynski
074051297a
add a ShareDialog for sharing users,groups and rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:21:55 +01:00
Luke Barnard
2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-06-11 14:24:40 +01:00
David Baker
50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone
re-run checkIfAlone if a member change occurred in the active room
2018-06-08 17:36:42 +01:00
David Baker
06321deea9
Merge pull request #1935 from turt2live/travis/persist-pinned-open
Persist pinned message open-ness between room switches
2018-06-08 16:48:40 +01:00
David Baker
8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics
Pinned message cosmetic improvements
2018-06-08 16:46:33 +01:00
Michael Telatynski
0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-07 22:01:27 +01:00
Travis Ralston
83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open 2018-06-06 09:17:08 -06:00
Michael Telatynski
ffec32c7d9
Merge pull request #1943 from akihikodaki/react
Import react as React in src/components/views/elements/DNDTagTile.js
2018-06-06 10:08:52 +01:00
Akihiko Odaki
bf0d03bce3 Import react as React in src/components/views/elements/DNDTagTile.js
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-06-06 17:59:50 +09:00
David Baker
bea99e07b3
Merge pull request #1940 from matrix-org/luke/exit_settings
Fix click on faded left/right/middle panel -> close settings
2018-06-05 10:36:58 +01:00
Luke Barnard
6a317569d7 Add null-guard to support browsers that don't support performance
Like Tor.

Fixes https://github.com/vector-im/riot-web/issues/6781
2018-06-04 09:38:21 +01:00
Luke Barnard
d30bc2dc6b
Merge pull request #1937 from turt2live/travis/no-guest
Replace "Login as guest" with "Try the app first" on login page
2018-06-01 11:58:26 +01:00
Luke Barnard
404c071f2a Remove lie from docs 2018-05-29 13:19:56 +01:00
Luke Barnard
da9fe9917b Fix click on faded left/right/middle panel -> close settings
- implement generic dispatch to close user/room/group settings
 - use dispatch to allow clicks on disabled left/right/middle panel to
   close settings

A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
2018-05-29 13:16:39 +01:00
Michael Telatynski
05357b9f8c
improve comment 2018-05-29 12:07:56 +01:00
Travis Ralston
254e8c358a Remove unused imports
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-28 11:38:09 -06:00
Matthew Hodgson
25216d4660 Merge branch 'develop' into matthew/e2e_backups 2018-05-28 00:46:05 +01:00
Travis Ralston
98613748b6 Move Scalar Widget URL check to WidgetUtils
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 11:12:55 -06:00
Travis Ralston
23162c8625 Support third party integration managers in AppPermission
Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL).

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 10:56:50 -06:00
Michael Telatynski
96ec3ab78a
Merge pull request #1934 from turt2live/travis/realtime-pins
Update pinned messages in real time
2018-05-27 17:50:23 +01:00
Travis Ralston
929da30df8 onEvent -> onStateEvent
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 10:28:47 -06:00
Travis Ralston
ec53b5f5ab Expose at-room power level setting
Fixes https://github.com/vector-im/riot-web/issues/5835

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 21:22:42 -06:00
Travis Ralston
e690bcb6ef Replace "Login as guest" with "Try the app first" on login page
Fixes vector-im/riot-web#5875

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 20:54:19 -06:00
Travis Ralston
52cdf60954 Add options to pin unread/mentioned rooms to the top of the room list
Fixes https://github.com/vector-im/riot-web/issues/6604
Fixes https://github.com/vector-im/riot-web/issues/732
Fixes https://github.com/vector-im/riot-web/issues/1104

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 20:29:35 -06:00
Travis Ralston
752605429c Persist pinned message open-ness between room switches
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 19:58:12 -06:00
Travis Ralston
53396ff38d Show timestamp of pinned messages on hover
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 19:46:11 -06:00
Travis Ralston
085271a864 Update pinned messages in real time
Fixes https://github.com/vector-im/riot-web/issues/5358

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 19:18:35 -06:00
Travis Ralston
033c41a2a8 Align pinned message contents and reduce image size
Fixes https://github.com/vector-im/riot-web/issues/5421

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 18:40:48 -06:00
Travis Ralston
62f4cfe734 Don't affect avatars in pinned message contents
This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 18:21:24 -06:00
Michael Telatynski
6636fa32f6
Allow selecting audio output for WebRTC Audio/Video calls
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 17:22:23 +01:00
Michael Telatynski
5147246c17
kill stream when using gUM for permission to device labels to kill camera
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-26 15:41:25 +01:00
Matthew Hodgson
6299e188a4 unbreak keyboard shortcuts & ctrl-backspace 2018-05-26 02:11:20 +01:00
Matthew Hodgson
ab41212258 fix double-nested code blocks & bump md-serializer 2018-05-26 00:37:21 +01:00
Matthew Hodgson
7fe2bfc212 remove numbers 2018-05-25 16:30:38 +01:00
Matthew Hodgson
3bf28a08ec experiments in dharma 2018-05-25 03:17:29 +01:00
Richard Lewis
b2c26e6984
Merge pull request #1920 from matrix-org/rxl881/refreshWidget
Add a "reload widget" button.
2018-05-24 18:11:22 +01:00
Richard Lewis
6288e9bc08
Merge pull request #1923 from matrix-org/rxl881/devTools
Make devTools styling more consistent and easier to edit event data.
2018-05-24 18:10:59 +01:00
Luke Barnard
033b110f5f
Merge pull request #1929 from matrix-org/luke/cookie-bar-update
Cookie bar update
2018-05-24 17:19:05 +01:00
Luke Barnard
023c4e2a43
Merge pull request #1928 from matrix-org/dbkr/leave_server_notices_room_message
Message for leaving server notices room
2018-05-24 17:06:41 +01:00
David Baker
168b956b3c homeserver 2018-05-24 17:01:00 +01:00
Luke Barnard
fd8d501732 Update cookie bar wording 2018-05-24 16:58:14 +01:00
David Baker
9d2f223773 Message for leaving server notices room 2018-05-24 16:54:48 +01:00
Luke Barnard
24aeda2e05 Fix bug where usage data link not visible when no cookie policy url 2018-05-24 16:52:04 +01:00
Richard Lewis
9753ee8d82 Better check of jitsi widget message origin. 2018-05-24 16:14:18 +01:00
Richard Lewis
a13d58f6c2 More thorough check of IM URL validity. 2018-05-24 14:58:59 +01:00
Luke Barnard
aae89efa01 Add usage data link to cookie bar
this opens the analytics modal
2018-05-24 12:47:27 +01:00
Luke Barnard
03c97140a6
Merge pull request #1925 from matrix-org/luke/deactivate-account-reword
Change wording and appearance of Deactivate Account dialog
2018-05-24 12:02:10 +01:00
Luke Barnard
dca1217a45 Change wording and appearance of Deactivate Account dialog 2018-05-24 11:50:45 +01:00
Matthew Hodgson
3bee23e733
Merge pull request #1924 from matrix-org/matthew/fix-memberlist-ordering
fix membership list ordering when presence is disabled.
2018-05-24 11:29:29 +01:00
Matthew Hodgson
cc79384839 fix https://github.com/vector-im/riot-web/issues/6643 2018-05-24 01:57:22 +01:00
Matthew Hodgson
864a33f978 switch to using 'code' for both blocks & marks to match md-serializer 2018-05-23 20:12:13 +01:00
Richard Lewis
2a9859c7b6 Styling for consistency. 2018-05-23 17:40:15 +01:00
Richard Lewis
9f9cde12ce Make devTools styling more consistent and easier to edit event data. 2018-05-23 17:18:33 +01:00
Luke Barnard
b124989968 Implement erasure option upon deactivation 2018-05-23 16:33:32 +01:00
Matthew Hodgson
b0ff61f7ef switch code schema to match slate-md-serializer 2018-05-23 14:12:08 +01:00
Luke Barnard
ba3dd0c87a Refactor onOk to async function 2018-05-23 13:35:42 +01:00
Luke Barnard
ef686a966d Add cookie warning to widget warning (AppPermission) 2018-05-23 10:46:32 +01:00
Luke Barnard
c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog
Terms and Conditions dialog
2018-05-23 10:17:14 +01:00
Matthew Hodgson
fc1c4996fc slate-md-serializer 3.1.0 now escapes correctly 2018-05-23 02:15:34 +01:00
Matthew Hodgson
6fba8311f9 escape blockquotes correctly
and fix NPE
2018-05-23 02:09:37 +01:00
Matthew Hodgson
794a60b9f8 refocus editor immediately after executing commands
and persist selections correctly across blur/focus
2018-05-23 01:36:21 +01:00
Matthew Hodgson
e7a4ffaf45 fix emojioneifying autoconverted emoji 2018-05-23 00:52:00 +01:00
Matthew Hodgson
cace5e8bfc fix bug where selection breaks after inserting emoji 2018-05-23 00:41:46 +01:00
Richard Lewis
6df3371c6c Add a "reload widget" button. 2018-05-22 19:14:54 +01:00
Luke Barnard
658e88c30f Implement consent/terms and conditions dialog for /_matrix/consent flow 2018-05-22 18:03:56 +01:00
Luke Barnard
538979a4ee Fix MVideoBody spinner 2018-05-22 17:13:45 +01:00
Luke Barnard
c249bee9b5 Grammar 2018-05-22 16:09:54 +01:00
Luke Barnard
c47c7b8d98
Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users
improve privileged section users in room settings
2018-05-22 16:07:01 +01:00
Luke Barnard
31dcd85c08 Add customisable cancel button to QuestionDialog 2018-05-22 15:45:58 +01:00
Luke Barnard
fb5dd4a410 Remove spurious fixupHeight 2018-05-22 10:46:10 +01:00
Luke Barnard
e4f8c09c32 Only include placeholder in DOM when necessary 2018-05-22 10:43:16 +01:00
David Baker
ae10491f95 Space between sentences in 'leave room' warning 2018-05-22 09:28:41 +01:00
Luke Barnard
e9ae3de00f Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-05-21 17:15:54 +01:00
Luke Barnard
836dc8b0ef Factor out all shared logic between MStickerBody and MImageBody
The benefits of this:
 - One code path for determining spinner/placeholder and it's position
   for loading images/stickers. This includes spinner used in e2e
   decryption of images.
 - Very small definition for MStickerBody, only overriding the minimal
   differences is has from MImageBody.

The disadvantages:
 - Slightly more complicated MImageBody, but hopefully not less
   readable.
2018-05-21 16:59:13 +01:00
Matthew Hodgson
11cea61661 refocus editor after clicking on autocompletes 2018-05-21 12:28:08 +01:00
Matthew Hodgson
7de45f8b7b make quoting work 2018-05-21 03:48:59 +01:00
Matthew Hodgson
b616fd025e comment out all the tests for now 2018-05-20 23:34:06 +01:00
Matthew Hodgson
e460cf35e0 hide formatting bar for MD editor 2018-05-20 22:48:40 +01:00
Matthew Hodgson
f981d7b729 unify buttons on the node type names, and make them work 2018-05-20 22:39:40 +01:00
Matthew Hodgson
d799b7e424 refactor roundtripping into a single place
and fix isRichTextEnabled to be correctly camelCased everywhere...
2018-05-20 16:30:39 +01:00
Matthew Hodgson
aac6866779 switch back to using commonmark for serialising MD when roundtripping
and escape MD correctly when serialising via slate-md-serializer
2018-05-20 14:33:14 +01:00
Matthew Hodgson
e9cabf0e85 add pill and emoji serialisation to Md 2018-05-20 03:17:51 +01:00
Matthew Hodgson
a0d88a829d support sending inlines from the RTE.
includes a horrific hack for sending emoji until
https://github.com/ianstormtaylor/slate/pull/1854 is merged
or otherwise solved
2018-05-20 02:53:32 +01:00
Matthew Hodgson
d76a2aba9b use <p/> as our root node everywhere and fix blank roundtrip bug 2018-05-20 01:07:25 +01:00
Matthew Hodgson
c3a6a41e5d support links in RTE 2018-05-20 00:49:29 +01:00
Matthew Hodgson
f2116943c8 switch schema to match the MD serializer 2018-05-20 00:17:11 +01:00
Matthew Hodgson
65f0b05719 fix typo 2018-05-19 23:40:22 +01:00
Matthew Hodgson
572a31334f add h4, h5 and h6 2018-05-19 23:34:30 +01:00
Matthew Hodgson
1f05aea884 make HTML pasting work 2018-05-19 23:33:07 +01:00
Matthew Hodgson
1536ab433a make file pasting work again 2018-05-19 22:05:31 +01:00
Matthew Hodgson
d426c3474f fix strikethough & code, improve shift-return & backspace 2018-05-19 21:36:22 +01:00
Matthew Hodgson
58670cc3e5 exit list more sanely on backspace 2018-05-19 21:14:39 +01:00
Matthew Hodgson
a4d9338cf0 let backspace delete list nodes in RTE 2018-05-19 20:38:07 +01:00
Matthew Hodgson
167742d900 make RTE sending work 2018-05-19 20:28:38 +01:00
Matthew Hodgson
4972a234c4 Merge branch 'develop' into matthew/slate 2018-05-19 12:58:43 +01:00
Matthew Hodgson
089ac337f4 remove unused html serializer 2018-05-18 15:22:24 +01:00
Luke Barnard
015093b371 Move inline style to stylesheet 2018-05-18 11:34:41 +01:00
David Baker
5952de772b
Merge pull request #1906 from matrix-org/luke/opt-in-analytics
Implement opt-in analytics with cookie bar
2018-05-18 10:44:53 +01:00
Luke Barnard
7e7e2a7473 Add more comments to explain thumbnail sizing 2018-05-18 10:27:22 +01:00
Luke Barnard
d11442de04 Adjust comment 2018-05-18 10:15:59 +01:00
Luke Barnard
b41b9aa4fa Remove fixupHeight call from MStickerBody 2018-05-18 09:58:52 +01:00
Luke Barnard
bbcf2fea53 Fix e2e image thumbnail spinner containing box correct size 2018-05-18 09:47:49 +01:00
Luke Barnard
b28ed6075b Implement slightly hacky CSS soln. to thumbnail sizing
As the slightly nicer alternative to fixupHeight being applied once
we actually have a timelineWidth.

The niceness comes from not needing timelineWidth, which means we can
implement at render time with CSS. (Despite still calculating aspect
ratios when we render.)
2018-05-17 18:15:34 +01:00
David Baker
a7006307bf Call afterComponentDidMount() after componentDidMount 2018-05-17 16:50:16 +01:00
David Baker
e53497421e Fix image size jumping regression
Fixes https://github.com/vector-im/riot-web/issues/6654
2018-05-17 16:47:17 +01:00
Matthew Hodgson
e51554c626 actually hook up RTE 2018-05-17 02:13:17 +01:00
Matthew Hodgson
ae208da805 nudge towards supporting formatting buttons in MD 2018-05-17 00:01:23 +01:00
Luke Barnard
0bda607bb2 Only show cookie bar if analytics configured 2018-05-16 15:53:43 +01:00
Luke Barnard
d15051a635 Add policyLink configuration to piwik
Also:
 - Make CookieBar ES6 class
 - Alter phrasing on CookieBar
 - Conditionaly display longer "...(See our ++cookie and privacy
   policies++)." if policy link is configured.
2018-05-16 15:49:23 +01:00
Luke Barnard
4e6594d64b Allow arbitrary hrefs for cookie/privacy links 2018-05-16 15:20:38 +01:00
Luke Barnard
d01e738839 Fix UserSettings for new analyticsOptIn 2018-05-16 15:20:38 +01:00
Luke Barnard
ac1cd384e7 Implement opt-in analytics with cookie bar 2018-05-16 15:20:38 +01:00
Matthew Hodgson
4eb6942211 let onChange set originalEditorState 2018-05-15 01:16:06 +01:00
Matthew Hodgson
b60ccad29b Merge branch 'develop' into matthew/slate 2018-05-15 01:00:07 +01:00
Matthew Hodgson
12a56e8b8e remove spurious comment 2018-05-15 00:59:55 +01:00
Luke Barnard
e596924074 Merge branch 'develop' into release-v0.12.4 2018-05-14 17:43:40 +01:00
Luke Barnard
ff0254d346 Fix ContextualMenu imports for TagTile and code block copy button 2018-05-14 17:36:57 +01:00
David Baker
7588d4380c Merge branch 'release-v0.12.4' into develop 2018-05-14 17:27:01 +01:00
Luke Barnard
e0236c3d3e Fix issue with sticker picker rendering off-screen
when the RightPanel is collapsed on a small monitor
and the sticker picker is opened.
2018-05-14 17:12:45 +01:00
Luke Barnard
3761cd4054 When panels are shown/hidden, hide sticker picker 2018-05-14 16:35:12 +01:00
Michael Telatynski
a88cbef331
tidy and switch to lexicographic sorting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-14 16:22:28 +01:00
Michael Telatynski
5ef0eece9a
refactor and sort
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-14 16:09:22 +01:00
Luke Barnard
49a3770e92 Merge branch 'release-v0.12.4' into develop 2018-05-14 14:31:18 +01:00
Richard Lewis
dddd1c43cc Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 14:23:26 +01:00
Richard Lewis
986fb3237d Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 13:56:39 +01:00
David Baker
b6e317647a Fix stickers briefly being 2x the size
fixupHeight was the only thing actually fixing the size of the
sticker image to be the size we want it rather than the pixel size
of the image, and this was only getting run after the image loaded,
causing a flash of 2x image.
2018-05-14 13:41:41 +01:00
Luke Barnard
cf8077e605 Set loading: false when iFrame finishes loading 2018-05-14 11:42:38 +01:00
Luke Barnard
6345e474f5 Remove unused conditional 2018-05-14 11:38:17 +01:00
Luke Barnard
98c06315cf Update widget state when account data changes 2018-05-14 11:14:49 +01:00
Matthew Hodgson
c1000a7cd5 emojioneify the composer
and also fix up the selectedness CSS for pills and emoji
2018-05-14 03:02:12 +01:00
Matthew Hodgson
7ecb4e3b18 remove dead removeMDLinks code 2018-05-13 23:35:39 +01:00
Matthew Hodgson
7405b49b44 unify setState() and onChange()
also make emoji autocomplete work again
also remove the onInputContentChanged prop
also slateify the onInputStateChanged prop
2018-05-13 23:34:00 +01:00
Matthew Hodgson
a247ea2f77 delete duplicate propTypes(!!!) 2018-05-13 22:43:20 +01:00
Matthew Hodgson
ddfe0691c4 fix insert_mention 2018-05-13 22:41:39 +01:00
Matthew Hodgson
dd0726f068 fix navigating history downwards on tall messages; remove obsolete code 2018-05-13 21:17:43 +01:00
Matthew Hodgson
721410b710 Merge branch 'develop' into matthew/slate 2018-05-13 19:50:55 +01:00
Matthew Hodgson
79f7c5d6ab remove // support, as it never worked
if you want to escape a /, do it with \/ or just precede with a space
2018-05-13 03:29:56 +01:00
Matthew Hodgson
4c3588d260 don't lose focus after a / command 2018-05-13 03:26:22 +01:00
Matthew Hodgson
5605439e76 autocomplete polishing
* suppress autocomplete when navigating through history
* only search for slashcommands if in the first block of the editor
* handle suffix returns from providers correctly
* fix bugs when pressing ctrl-a, typing and then tab to complete a replacement by collapsing selection to anchor when inserting a completion in the editor
2018-05-13 03:17:14 +01:00
Matthew Hodgson
877a6195ae unbreak history scrolling for pills & emoji 2018-05-13 00:54:01 +01:00
Matthew Hodgson
33eaa84bdf fix NPEs when deleting mentions 2018-05-13 00:48:52 +01:00
Matthew Hodgson
c91dcffe82 fix cursor behaviour around pills 2018-05-13 00:40:54 +01:00
Travis Ralston
9e11720191 Add setting to enable widget screenshots (if widgets declare support)
Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-12 14:30:59 -06:00
Matthew Hodgson
f8fd90c559
Merge pull request #1889 from matrix-org/t3chguy/replies-html-tag
T3chguy/replies html tag
2018-05-12 20:22:54 +01:00
Matthew Hodgson
9c0c806af4 correctly send pills in messages 2018-05-12 20:04:58 +01:00
Matthew Hodgson
d7c2c8ba7b include the plaintext representation of a pill within it 2018-05-12 16:21:36 +01:00
Michael Telatynski
dbbcabfed8
switch from asymmetrical fallback form to a cleaner one mx-reply
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-12 15:58:25 +01:00
Matthew Hodgson
410a1683fe make autocomplete selection work 2018-05-12 01:10:38 +01:00
Luke Barnard
9c5c5e282b Send visibility only when changed, and messaging is available 2018-05-11 18:20:23 +01:00
Luke Barnard
a419056040 Delinting 2018-05-11 18:20:14 +01:00
Luke Barnard
06919e22d6 When stickerpicker made visible, send visibility over postMessage 2018-05-11 18:20:00 +01:00
Luke Barnard
bd0301c666 Add API to send visibiliy actions to widgets 2018-05-11 18:17:55 +01:00
Luke Barnard
42c59b5923 Make AppTile in Stickerpicker persistent using PersistedElement 2018-05-11 18:17:48 +01:00
Luke Barnard
2d2b529f80 Use new ContextualMenu component in Stickerpicker 2018-05-11 18:17:35 +01:00
Luke Barnard
9ec2570eab Export ContextualMenu component, with added hasBackground property
, which is only enabled when `createMenu` is used.
2018-05-11 18:17:27 +01:00
Luke Barnard
d503c86576 Factor out ContextualMenu component 2018-05-11 18:17:19 +01:00
Luke Barnard
06898394eb Send visibility only when changed, and messaging is available 2018-05-11 18:06:58 +01:00
Luke Barnard
1f2f3474ed Delinting 2018-05-11 17:28:12 +01:00
Luke Barnard
8b049b2182 When stickerpicker made visible, send visibility over postMessage 2018-05-11 16:51:03 +01:00
Luke Barnard
4b6378a80d Add API to send visibiliy actions to widgets 2018-05-11 16:22:54 +01:00
Luke Barnard
746eeee33c Make AppTile in Stickerpicker persistent using PersistedElement 2018-05-11 15:07:51 +01:00
Luke Barnard
2dc51c516c Use new ContextualMenu component in Stickerpicker 2018-05-11 14:47:57 +01:00
Luke Barnard
2c2eda1f00 Export ContextualMenu component, with added hasBackground property
, which is only enabled when `createMenu` is used.
2018-05-10 17:51:49 +01:00
Luke Barnard
9046769132 Factor out ContextualMenu component 2018-05-10 16:02:25 +01:00
Luke Barnard
770e2d400e Improve appearance of short-lived app loading spinner
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
2018-05-09 17:28:41 +01:00
Luke Barnard
0a326dc6a0 Take feature_sticker_messagse out of labs 2018-05-09 17:28:29 +01:00
Luke Barnard
97b9316ec7 Fix issue incorrect positioning with widget loading indicator
by making sure to apply the correct CSS class to the parent
2018-05-09 17:28:18 +01:00
Luke Barnard
0c1846630c Improve appearance of short-lived app loading spinner
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
2018-05-09 16:54:01 +01:00
Luke Barnard
7d0406b430
Merge pull request #1883 from matrix-org/luke/cement-sticker-messages
Take feature_sticker_messagse out of labs
2018-05-09 16:52:20 +01:00
Luke Barnard
bcf003757c
Merge pull request #1884 from matrix-org/luke/fix-glitchy-widget-spinner
Fix issue incorrect positioning with widget loading indicator
2018-05-09 16:52:11 +01:00
Luke Barnard
59cbaf67bb Fix issue incorrect positioning with widget loading indicator
by making sure to apply the correct CSS class to the parent
2018-05-09 15:48:53 +01:00
Luke Barnard
e10e659457 Take feature_sticker_messagse out of labs 2018-05-09 14:59:35 +01:00
Richard Lewis
8e1ba6d139 Always allow users to edit their user widgets. 2018-05-08 22:44:49 +01:00
Richard Lewis
b5320444a9 Fix current user and creator user ID properties. 2018-05-08 22:05:53 +01:00
Luke Barnard
337af1643f
Merge pull request #1878 from matrix-org/t3chguy/m.relates_to
Replies: un-break click-to-mention on SenderProfile for reply&preview
2018-05-08 14:15:59 +01:00
Matthew Hodgson
afb9e1f5f4 blind fix to the overlapping sticker bug 2018-05-08 09:50:06 +01:00
Matthew Hodgson
984961a3ed blind fix to the overlapping sticker bug 2018-05-08 09:49:53 +01:00
Matthew Hodgson
8b2eb2c400 make history work again 2018-05-08 01:54:06 +01:00
Matthew Hodgson
ff42ef4a58 make it work for MD mode (modulo history) 2018-05-06 22:08:36 +01:00
Michael Telatynski
f0b7fd58b9
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-06 19:28:18 +01:00
Michael Telatynski
f68036a4fb
Replies: un-break click-to-mention on SenderProfile for reply&preview
Fixes #6670

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-06 19:18:41 +01:00
Matthew Hodgson
190f6d9483 make slate actually work as a textarea 2018-05-06 15:27:27 +01:00
Matthew Hodgson
a2233a48c2 stub out yet more 2018-05-06 01:18:26 +01:00
Matthew Hodgson
8a1bd8da69 tell eslint to ignore viewAvatarOnClick being unused 2018-05-06 00:22:14 +01:00
Matthew Hodgson
05eba3fa32 stub out more until it loads... 2018-05-06 00:18:11 +01:00
Matthew Hodgson
f4ed820b6f fix stubbing 2018-05-05 23:38:14 +01:00
Matthew Hodgson
500f58a963 fix deeply irritating react warning about viewAvatarOnClick on BaseAvatar 2018-05-05 23:25:50 +01:00
Matthew Hodgson
e62e43def6 comment out more draft stuff 2018-05-05 23:25:04 +01:00
Matthew Hodgson
02947063d3 Merge branch 'develop' into matthew/slate 2018-05-05 22:45:44 +01:00
Matthew Hodgson
af5be5c36c appease the fascist linter 2018-05-05 22:28:09 +01:00
Matthew Hodgson
14bcfdd5c6 fix NPE 2018-05-05 22:08:37 +01:00
Luke Barnard
b08abd3d8b
Merge pull request #1874 from matrix-org/luke/fix-analytics-crash
Fix crash when browser doesn't report page change measurement
2018-05-03 18:46:20 +01:00
Michael Telatynski
97d344483e
fix thinko when changing from ClientPeg to context in static method (DUH
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 14:32:13 +01:00
Luke Barnard
22f2d6f292 Fix crash when browser doesn't report page change measurement 2018-05-03 14:08:10 +01:00
Michael Telatynski
4892694e77
use more explicit reply fallback closing tag construct to fix 6657
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:24:10 +01:00
Michael Telatynski
71a12b6bbb
fix getDefaultProps mixup
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:23:41 +01:00
Michael Telatynski
4c3f811050
switch RoomView:uploadFile to async to clean up then/catch handling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-02 13:14:47 +01:00
Michael Telatynski
f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-05-02 13:08:38 +01:00
Michael Telatynski
ec4ec4717d
clean up EventTile:onWidgetLoad optional/required mess
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:15:12 +01:00
Michael Telatynski
db55f87699
avoid .done and .then anti-pattern
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:14:35 +01:00
Michael Telatynski
11ae0805b0
re-order ReplyThread methods for readability
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 17:42:58 +01:00
Luke Barnard
56ec7713bb Refresh group rooms and members when selecting a tag 2018-05-01 16:54:14 +01:00
Luke Barnard
4d8394954c Only create one group store listener in RoomList
Instead of creating several and destroying the reference to the one
created before.
2018-05-01 14:24:58 +01:00
Luke Barnard
6ec9e5f670
Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor
Refactor GroupStores into one global GroupStore
2018-05-01 12:33:06 +01:00
Luke Barnard
25690336c3 Prevent user getting trapped in group settings when an error occurs 2018-05-01 11:52:02 +01:00
Luke Barnard
38d7a5d394 Remove GroupStore listener when unmounting GroupPublicityToggle 2018-05-01 11:50:14 +01:00
Luke Barnard
28e8ce967f Correctly unregister group store listener when unmounting RoomList 2018-05-01 11:38:57 +01:00
Luke Barnard
023daef4b7 Refactor GroupStores into one global GroupStore
Take a step closer to a flux-like architecture for group data, for
the purposes of providing features that require it.

Now the app has a single GroupStore that can be poked to fetch
updates for a particular group.
2018-05-01 11:24:17 +01:00
Michael Telatynski
bbce6eea5b
update comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-30 23:28:55 +01:00
Matthew Hodgson
5749fbcff9
Merge pull request #1864 from matrix-org/matthew/blob_urls
Switch back to using blob URLs for rendering e2e attachments
2018-04-30 19:01:58 +01:00
Luke Barnard
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons
Hide inline encryption icons except when hovering over a message
2018-04-30 17:57:22 +01:00
Luke Barnard
80c67ba35d
Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog
Fix UX issues with bug report dialog
2018-04-30 17:56:19 +01:00
Eric Newport
e037cf0063 namespace CSS better and fix bug 2018-04-30 12:22:16 -04:00
David Baker
5bacf50001
Merge pull request #1865 from matrix-org/matthew/image_errors
fix ugly img errors and correctly render SVG thumbnails
2018-04-30 17:12:40 +01:00
David Baker
025bffb4e9 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog 2018-04-30 16:20:12 +01:00
David Baker
e28a927da9 lint 2018-04-30 14:34:14 +01:00
David Baker
c3420c37fd Indentation 2018-04-30 14:25:42 +01:00
David Baker
54cccab0c7 Factor out clearStorageButton 2018-04-30 14:22:18 +01:00
David Baker
5d46efc3e8 Get docs right on hasCancel 2018-04-30 14:17:21 +01:00
David Baker
dcaacfd204 Merge remote-tracking branch 'origin/develop' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-30 14:06:32 +01:00
David Baker
a9b6db3f2e Lint 2018-04-30 13:41:04 +01:00
David Baker
37cb8abf13 Fix UX issues with bug report dialog
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
   escape to cancel works)
 * Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
   about submitting logs.
 * Continued campaign against 'Click here' links.

Fixes https://github.com/vector-im/riot-web/issues/6622
2018-04-30 13:39:46 +01:00
David Baker
fc136607f1 UI fixes in SessionRestoreErrorDialog
* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data).
2018-04-30 13:39:46 +01:00
Michael Telatynski
41af9f7a96
fix changed method name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 08:23:35 +01:00
Matthew Hodgson
db5fc53853 final comment 2018-04-29 04:53:32 +01:00
Matthew Hodgson
8538cc1666 fix regressions introduced by 00b7cc512b 2018-04-29 04:41:30 +01:00
Matthew Hodgson
be523b3edc lint 2018-04-29 04:31:30 +01:00
Matthew Hodgson
551d3ebda0 correctly fix up thumbnail height onload.
fixes https://github.com/vector-im/riot-web/issues/6492, although popping is inevitable in
the current implementation as it only fixes up the thumbnail size once the image has loaded.
2018-04-29 04:28:15 +01:00
Matthew Hodgson
731f1fa7d3 clarify another scrolljump bug 2018-04-29 04:00:02 +01:00
Matthew Hodgson
c254d043c5 fix ugly img errors and correctly render SVG thumbnails
Fixes https://github.com/vector-im/riot-web/issues/6271
Fixes https://github.com/vector-im/riot-web/issues/1341
2018-04-29 03:58:17 +01:00
Matthew Hodgson
9c5407c21f revokeObjectURLs 2018-04-29 03:17:55 +01:00
Matthew Hodgson
9701fd32b7 switch back to blob urls for rendering e2e attachments
Based on @walle303's work at https://github.com/matrix-org/matrix-react-sdk/pull/1820
Deliberately reverts 8f778f54fd
Mitigates XSS by whitelisting the mime-types of the attachments so that malicious ones
should not be recognised and executed by the browser.
2018-04-29 03:07:31 +01:00
Michael Telatynski
4021fc049c
re-arrange method order to group statics before instance methods
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:54:54 +01:00
Michael Telatynski
c00c52e537
added another comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:53:35 +01:00
Michael Telatynski
407be88c92
add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:51:39 +01:00
Michael Telatynski
5bb15b1002
simplify logic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:48:44 +01:00
Michael Telatynski
bbf4d3e39f
add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:34:27 +01:00
Eric Newport
55566b35a2 convert attribute to class 2018-04-28 12:39:25 -04:00
David Baker
873993a7ca Clarify, hopefully 2018-04-27 17:56:33 +01:00
David Baker
d3c368e19f typo 2018-04-27 17:53:11 +01:00
David Baker
0c309c88ad Bluebird has no need for your .done() 2018-04-27 17:52:25 +01:00
David Baker
27b18c457e Lint 2018-04-27 15:56:28 +01:00
David Baker
6d9e07580b UI fixes in SessionRestoreErrorDialog
* Make the 'delete my data' button not the default
 * Make it red
 * Give it a confirmation dialog
 * Remove the 'cancel' button: what does it mean to cancel an error?
   In this case, it tried again and almost certainly got the same error.
 * Remove the top-right 'x' and don't cancel on esc for the same reason.
 * Move 'send bug report' to a button rather than a 'click here' link
 * Add a 'refresh' button which, even if it's no more likely to work,
   will at least look like it's doing something (it's mostly so if you
   don't have a bug report endpoint, there's still a button other
   than the one that deletes all your data).
2018-04-27 12:38:49 +01:00
Michael Telatynski
2e29a0857b
improve stripPlainReply comment and fix leading NewLine
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 12:12:01 +01:00
Michael Telatynski
68dd57f56e
rename two methods
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:47:18 +01:00
Michael Telatynski
3050553fc2
rename and change getInReplyTo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:44:14 +01:00
Michael Telatynski
ca766df598
call onWidgetLoad on componentDidUpdate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:32:04 +01:00
Michael Telatynski
fdf63fd440
replace concat on comment from review
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:31:04 +01:00
Michael Telatynski
3ba9f560d4
get MatrixClient from context
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:30:47 +01:00
Michael Telatynski
88f48914b4
improve comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:28:17 +01:00
Michael Telatynski
97fecaedc2
improve wording
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:26:42 +01:00
David Baker
0323f8ed0c Wrap exception handling around all of loadSession
The user might (probably does) have a session even if we haven't actually tried
to load it yet, so wrap the whole loadSession code in the error handler we were
using for restoring sessions so we gracefully handle exceptions that happen
before trying to restore sessions too.

Remove the catch in MatrixChat that sent you to the login screen.  This is
never the right way to handle an error condition: we should only display the
login screen if we successfully determined that the user has no session, or
they explicitly chose to blow their sessions away.
2018-04-27 11:25:13 +01:00
David Baker
db1401f484 Pass false to onFinished from BaseDialog
Everywhere else, onFinished takes a boolean indicating whether the
dialog was confirmed on cancelled, and had function that were
expecting this variable and getting undefined.
2018-04-27 11:19:14 +01:00
Michael Telatynski
82d117974f
Remove unused import
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:16:29 +01:00
David Baker
f70096b8fa Fix error handling on session restore
Fix a number of failures that meant the excellent error handling
we had for failing to restore a session didn't work.

1. .catch on the promise rather than try/catch: it's async
2. Explicit cancel method in SessionRestoreErrorDialog that invokes
   onFinished with `false` because even with the catch fixed, this
   was getting the event as its first arg which is truthy, so
   clicking cancel still deleted your data.
3. DialogButtons: Don't pass onCancel straight into the button event
   handler as this leaks the MouseEvent through as an argument.
   Nothing is using it and it exacerbates failures like this
   because there are surprise arguments.

Fixes https://github.com/vector-im/riot-web/issues/6616
2018-04-26 17:07:58 +01:00
Luke Barnard
665e052596 Allow debugging of unhandled login errors 2018-04-26 15:09:17 +01:00
David Baker
53528f338a Replace document.origin with window.location.origin
document.origin is not a thing on firefox
2018-04-26 10:43:52 +01:00
David Baker
e26c3f3dc9 Get variable name right in commented usercontent code 2018-04-26 10:12:50 +01:00
Richard Lewis
b2d6dd8f6e Optionally hide widget popout button. 2018-04-25 16:28:27 +01:00
David Baker
81488b27e2
Merge pull request #1851 from matrix-org/rxl881/popoutWidget
Add a button to 'pop out' widgets in to their own tab.
2018-04-25 15:36:07 +01:00
Richard Lewis
0f0e89d394 Add a button to 'pop out' widgets in to their own tab. 2018-04-25 12:49:30 +01:00
David Baker
54040659ec Fix cross-origin renderer code in comment 2018-04-25 11:35:08 +01:00
David Baker
7720585cea
Merge pull request #1849 from matrix-org/dbkr/cross_origin_renderer_origin_lock
Support origin lock in cross-origin renderer
2018-04-25 11:22:48 +01:00
David Baker
80837a9199 s/contian/contain/g
Fixes https://github.com/vector-im/riot-web/issues/6565
2018-04-24 17:53:23 +01:00
David Baker
79c3335765 Support origin lock in cross-origin renderer
This adds a URL parameter to the cross-origin renderer that makes
it only accept messages from a given domain. This adds an extra
layer of security to the cross-origin iframe and is backwards
compatible in both directions.
2018-04-24 16:05:14 +01:00
David Baker
f5956c87f6 Bind onImageError in constructor
Tt uses `this` but wasn't bound anywhere so the error handler was
just throwing an exception.
2018-04-23 18:14:59 +01:00
Michael Telatynski
d680d805ce
Merge branch 'develop' into t3chguy/m.relates_to 2018-04-23 10:14:48 +01:00
Eric Newport
d42fa9d17a Hide inline encryption icons except when hovering over a message
Closes https://github.com/vector-im/riot-web/issues/2882

This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988)

I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
2018-04-22 22:30:37 -04:00
Matthew Hodgson
75a2be1a8d WIP (doesn't build yet) replacing draft with slate 2018-04-23 01:13:18 +01:00
Aidan Gauland
6a918861bb Add UI for displaying room avatars full size
Change the onClick action on the RoomAvatar inside RoomHeader so that it brings
up a lightbox with the full-size avatar.
2018-04-21 15:47:31 +12:00
Michael Telatynski
941bb94234
fix reply fallback blunder
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 10:15:15 +01:00
Michael Telatynski
06408f843b
post BigMerge fixup - merge in stuff from riot-web PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:23:27 +01:00
Michael Telatynski
58cd585e86
start of BigMerge fixup
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:12:02 +01:00
Matthew Hodgson
92c98aa3e5 displayName should be tracked as static 2018-04-18 16:19:37 +01:00
Matthew Hodgson
f84573ec9f convert HomePage to ES6 and split out the vectory bit 2018-04-18 10:23:32 +01:00
Matthew Hodgson
d91c7f5e54 Add comment about enum hijinks 2018-04-17 16:53:11 +01:00
Matthew Hodgson
ce809e16d9 fix i18n thinko on createTrackedDialog 2018-04-17 16:51:17 +01:00
Matthew Hodgson
32dd7f976f merge vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 00:04:04 +01:00
Matthew Hodgson
4da804fd64 Merge branch 'develop' into matthew/fix_layering 2018-04-15 23:59:09 +01:00
Matthew Hodgson
cb5ff404e1 fix missing i18n 2018-04-15 23:16:31 +01:00
Matthew Hodgson
610747e76a fix paths and updateCheckStatusEnum 2018-04-13 16:49:59 +01:00
Michael Telatynski
a90bd6cd4f
Allow collapsing ReplyThread from MessageContextMenu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-13 12:28:58 +01:00
Michael Telatynski
8b1e411d6b
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-04-13 10:54:09 +01:00
Matthew Hodgson
13765632e9 use new rageshake location 2018-04-13 01:36:41 +01:00
Matthew Hodgson
0336d99b9e move VectorConferenceHandler over and use getUpdateCheckStatusEnum via field rather than export 2018-04-13 01:29:38 +01:00
Matthew Hodgson
40a67ca8fe point imports at the new locations 2018-04-13 00:43:44 +01:00
Michael Telatynski
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
2018-04-12 09:48:06 +01:00
Matthew Hodgson
8ab8f76254 move non-Riot-specific components over from riot-web 2018-04-11 23:58:04 +01:00
Travis Ralston
fe2cbc584d Merge branch 'develop' into travis/remove-presence 2018-04-11 15:17:28 -06:00
Luke Barnard
ab578a5c0c
Merge pull request #1819 from pvagner/jump_to_first_unread_a11y
TopUnreadMessagesBar a11y
2018-04-11 15:47:43 +01:00
Luke Barnard
d877384d64
Merge pull request #593 from matrix-org/luke/fix-render-1-1-avatars-when-others-leave
Use correct 1-1 room avatar after users leave
2018-04-11 11:21:18 +01:00
Luke Barnard
edb754b76b Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-10 18:08:19 +01:00
Luke Barnard
fca7325b20 Change comments 2018-04-10 15:56:57 +01:00
Luke Barnard
31e9979285 Add 500ms delay to show membershipBusy for longer
to avoid a UI that flashes quickly
2018-04-10 15:31:04 +01:00
David Baker
74c84addea
Merge pull request #1831 from matrix-org/luke/fix-group-join-or-leave-update
Improve group join/leave feedback
2018-04-10 13:40:50 +01:00
Luke Barnard
de1073aacb Factor out _closeSettings for cleanliness 2018-04-10 13:28:42 +01:00
Luke Barnard
24d4df87d1 Show membership spinner next to Leave/Join button when leaving/joining 2018-04-10 11:49:59 +01:00
Luke Barnard
0681df71b0 Hide settings after leaving a group 2018-04-10 11:49:35 +01:00
Luke Barnard
42141f7da7 Fetch group data when leaving or joining to update the view 2018-04-10 10:03:54 +01:00
Matthew Hodgson
0ff2837d7f rename createGroupButton to not be a total misnomer... 2018-04-09 23:02:59 +01:00
Matthew Hodgson
2d8880ec5f patch NPE on Pill when lazyloading members 2018-04-09 23:02:15 +01:00
Luke Barnard
2da45277cd Update group join button to match new API 2018-04-09 16:57:27 +01:00
Michael Telatynski
f765db7d16
only clear reply_to_event if there was one to begin with
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-07 12:18:53 +01:00
David Baker
03016b9fc8
Merge pull request #1828 from matrix-org/luke/fix-redact-avatar
Make stickers/messages continuations of each other
2018-04-06 17:58:26 +01:00
Luke Barnard
01dd494f50 Make stickers/messages continuations of each other 2018-04-06 17:47:44 +01:00
Luke Barnard
008572afe1 Revert "Handle non-m.room.message event types."
This reverts commit f8d7ab10fa.
2018-04-06 16:42:59 +01:00
Luke Barnard
1e586428ac Update to match is_openly_joinable API 2018-04-06 14:58:10 +01:00
Luke Barnard
adb78c2931 Fix broken ForgotPassword component 2018-04-06 10:27:03 +01:00
David Baker
28bf76b319
Merge pull request #1824 from matrix-org/luke/fix-wrappedRef-warning
Fix warning "Unknown prop `wrappedRef` on <div> tag..."
2018-04-05 17:49:35 +01:00
Luke Barnard
e20f223e78 Fix warning "Unknown prop wrappedRef on <div> tag..."
GeminiScrollbar should not receive wrappedRef as a property,
so remove it using object destructuring.
2018-04-05 17:39:25 +01:00
Luke Barnard
59abfa6337
Merge pull request #1817 from matrix-org/luke/feature-group-set-joinable
Add radio button for setting group m.join_policy
2018-04-05 17:03:04 +01:00
David Baker
03747b8287 Update to use new join_policy API 2018-04-05 16:56:35 +01:00
Richard Lewis
a41384a994 Fix function binding. 2018-04-04 23:45:47 +01:00
Richard Lewis
da6c2c51fb Remove left and right menu padding 2018-04-04 13:38:48 +01:00
Richard Lewis
369cbdaaf6 Add missing PropType declarations. 2018-04-04 13:38:07 +01:00
Richard Lewis
702380c591 Add props to style (remaining) menu padding attributes. 2018-04-04 13:37:52 +01:00
Michael Telatynski
9df2f7ddc8
Add warning to Upload Confirm prompt if replying, as can't reply with file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 11:19:13 +01:00
Michael Telatynski
1d90835de0
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/RoomView.js
2018-04-04 11:08:34 +01:00
Michael Telatynski
9c2e3e25f0
clear reply_to_event at queue not send time
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 10:34:39 +01:00
Richard Lewis
06f1c504e7
Merge pull request #1672 from matrix-org/rxl881/snapshot
Bi-directional widget postMessaging API (stickerpacks) [WIP]
2018-04-03 18:37:03 +01:00
Luke Barnard
8ca1243ecb Add null-guard to prevent RoomAvatar NPE when room is null
which may have been occuring when peeking into a room that the
client hasn't got a Room object for.

Fixes https://github.com/vector-im/riot-web/issues/6432
2018-04-03 17:35:34 +01:00
Richard Lewis
f8f8bc469e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-04-03 11:34:14 +01:00
Richard Lewis
b109c9304c Put stickers behind labs flag. 2018-04-02 22:24:46 +01:00
Richard Lewis
8241afe87d Fix content references 2018-04-02 20:25:24 +01:00
Richard Lewis
49bea1a35b Move stickerpicker content out of state in to generator function. 2018-04-02 10:56:45 +01:00
Richard Lewis
d83b6f1cf8 Use AccessibleButton. 2018-04-02 10:18:35 +01:00
Michael Telatynski
80fbc757f5
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-03-31 17:46:31 +01:00
Peter Vágner
778ebe63ff TopUnreadMessagesBar: turn clickables into accessible buttons and fix
over verbosity for the accessible name.
2018-03-31 17:42:10 +02:00
Richard Lewis
557a45e890 Remove inline styling. 2018-03-29 22:22:57 +01:00
Richard Lewis
9cc3d3c9bb Move default sticker content into generator function. 2018-03-29 21:48:03 +01:00
Richard Lewis
ff0834ad9d Add comment. 2018-03-29 21:31:09 +01:00
Richard Lewis
003cf61388 Handle remove sticker picker errors. 2018-03-29 21:16:35 +01:00
Richard Lewis
2e6d6c83cd Add back in body 'ref' 2018-03-29 21:16:12 +01:00
Richard Lewis
6181ca642f "Stickerpack" translation. 2018-03-29 17:47:53 +01:00
Richard Lewis
c8f9586c9b Check for valid reference. 2018-03-29 17:35:21 +01:00
Luke Barnard
c9283ad988 Merge branch 'luke/feature-group-set-joinable' of github.com:matrix-org/matrix-react-sdk into luke/feature-group-set-joinable 2018-03-29 17:28:44 +01:00
Richard Lewis
67f755efcb Comment. 2018-03-29 17:26:54 +01:00
Richard Lewis
e21cc14e5b Comment. 2018-03-29 17:26:19 +01:00
Richard Lewis
38c8bc7d9a Consistent function naming. 2018-03-29 17:25:07 +01:00
Luke Barnard
2bc8d6d3a4 Use less confusing values on radio buttons 2018-03-29 17:25:06 +01:00
Richard Lewis
9c10d243e8 Add comment. 2018-03-29 17:09:03 +01:00
Richard Lewis
f383298267 Remove duplicate event handler. 2018-03-29 17:08:07 +01:00
Luke Barnard
e9193ff0b6
Merge branch 'develop' into luke/feature-group-set-joinable 2018-03-29 17:01:19 +01:00
Richard Lewis
cafbd2904e Remove unused ref. 2018-03-29 16:57:21 +01:00
Luke Barnard
f42cdf6a4c Add radio button for setting group is_joinable
which dictates whether the group can be joined without invitation.
2018-03-29 16:57:07 +01:00
Richard Lewis
aefccb134c Ensure deleting is set to false. 2018-03-29 16:56:25 +01:00
Richard Lewis
35fcb2c9ab Catch rather than 'done' error handler. 2018-03-29 16:56:02 +01:00
Richard Lewis
23a52bdb4c Indentation. 2018-03-29 16:46:22 +01:00
Luke Barnard
1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join
Join this community button
2018-03-29 15:44:46 +01:00
Luke Barnard
c4322892de Reword group setting delay 2018-03-29 14:33:54 +01:00
Luke Barnard
385211528d Implement "Join this community" button
for groups that have truthy summary.profile.is_joinable.
2018-03-29 12:39:09 +01:00
Richard Lewis
4ac9653ab9 Refactor widget postMessage API. 2018-03-28 12:22:06 +01:00
Luke Barnard
00167fbc06 Init page change state in willMount 2018-03-28 11:25:28 +01:00
Luke Barnard
8d994f2788 Merge branch 'develop' into luke/track-page-change-duration 2018-03-28 10:56:36 +01:00
Luke Barnard
c8312dd5ae Use a less fragile API to track page change performance 2018-03-28 10:25:28 +01:00
Michael Telatynski
fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to 2018-03-28 08:38:33 +00:00
Luke Barnard
944940057e Remember that React needs React 2018-03-27 13:04:26 +01:00
Luke Barnard
2ffcad0981 Convert GeminiScrollbarWrapper to stateless component 2018-03-27 13:04:26 +01:00