Commit Graph

8846 Commits (767e67dc70a2bd9581b1e52685735888320d53fe)

Author SHA1 Message Date
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
David Baker 34f6134595
Merge pull request #1974 from matrix-org/t3chguy/warn_self_mute
warn on self-mute
2018-07-02 10:13:49 +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
Michael Telatynski 36ace9dcb9
using map-i18n remap all changed `%(...)s` => `<...>` to keep i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 15:21:44 +01:00
Michael Telatynski 6021c3a634
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev 2018-06-29 14:56:18 +01:00
Michael Telatynski 1d91469104
switch to <ClickableUsername> and use `<a>` over `<span>`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 14:52:25 +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 3846aef8a1 Alter docs, add comments 2018-06-28 16:06:12 +01:00
Luke Barnard ab990d8cec Increase grace period to allow time for key sharing 2018-06-28 15:07:58 +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
Luke Barnard 4c575bb1ca
Merge pull request #2018 from matrix-org/luke/fix-piwik-path-reporting
Redact pathnames with origin `file://`
2018-06-27 10:40:17 +01:00
Luke Barnard 483edb8211 `pathname` is not constant 2018-06-27 10:31:51 +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
David Baker 2bc1679b97
Merge pull request #2020 from matrix-org/t3chguy/improve_linkifier2
improve linkifier AGAIN
2018-06-27 10:27:30 +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
Michael Telatynski 96163d1402
prevent multiple ports (🔢1234:1234)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:41:46 +01:00
Michael Telatynski 9f3a121abc
optimize linkify-matrix by skipping an intermediary state
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:36:01 +01:00
Michael Telatynski 09b09846cf
allow `:port` specifiers in roomalias,groupid and userid as per spec
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:33:35 +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
David Baker 10e39d5a5d
Merge pull request #2019 from matrix-org/t3chguy/room_settings_leave_room
when the user switches room, close room settings
2018-06-26 17:15:19 +01:00
Michael Telatynski a548c83647
when the user switches room, close room settings
this is especially annoying if they choose Leave Room
which indirectly switches room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 17:07:39 +01:00
Luke Barnard 19e948155c Redact pathnames with origin `file://` 2018-06-26 17:06:45 +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 cb89406d3e Indent 2018-06-26 15:42:29 +01:00
David Baker 4a39297e65 PR feedback 2018-06-26 15:41:43 +01:00
David Baker 0a6450507e Bits of PR feedback 2018-06-26 15:21:22 +01:00
David Baker b6f3b2f594 More code re-use 2018-06-26 12:28:59 +01:00
David Baker ca8a4a0c3f Remove unused function 2018-06-26 12:08:33 +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
David Baker 069080e7ed lint 2018-06-26 09:41:20 +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 cdf7101222
run gen-i18n and prune-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:46:48 +01:00