efdc5430d7
merge develop
2018-07-09 17:50:07 +01:00
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
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
a6cff4a969
Show server bans in the timeline
2018-07-06 11:06:31 +01:00
5af8ddcf10
Fix import
2018-07-06 11:00:39 +01:00
b6f854abe4
Simplify event name as it's the only one
2018-07-05 20:00:42 +01:00
eb552e5cef
Just pass the roomId into WidgetEchoStore
2018-07-05 18:43:20 +01:00
d53c836fd7
Implement aggregation by error type for tracked decryption failures
2018-07-05 13:54:44 +01:00
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
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
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist
2018-07-04 11:21:16 +01:00
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
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
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
74f2d0a360
Use inline class field for PropTypes
2018-07-03 14:54:43 +01:00
3f88721bc1
Give PersistedElement a key
...
So there can be more than one on a page
2018-07-03 14:43:27 +01:00
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
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
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
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
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
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
ea6e1b6f72
Merge branch 'develop' into t3chguy/warn_self_mute
2018-06-29 19:17:43 +01:00
85a0736c78
update wording as per D4ve's feedback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-06-29 19:16:56 +01:00
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
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
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
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
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
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
66002a4c00
Fix status bar element positioning
2018-06-27 15:19:27 +01:00
8be173cae3
Show nicer error when receiving a consent error after sending a message
2018-06-27 15:17:57 +01:00
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
6345fcb8f2
Fix incorrectly positioned copy button on <pre> blocks
2018-06-27 11:31:55 +01:00
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
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
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
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
67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist
...
fix historical section
2018-06-26 18:26:29 +01:00
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
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
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
0ee8d18f5a
More code de-duping
2018-06-26 16:41:44 +01:00
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
a88297d7a6
More code reuse
2018-06-26 16:27:17 +01:00
9539a749e5
More refactoring
2018-06-26 16:03:58 +01:00
6cf11a15e6
Move WidgetUtils to utils dir
2018-06-26 11:59:16 +01:00
0f2c47937c
Merge the two different widget utils files
2018-06-26 11:52:21 +01:00
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
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
Matthew Hodgson