Commit Graph

5255 Commits

Author SHA1 Message Date
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 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
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
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