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
48f03bfd86
Merge pull request #2026 from matrix-org/dbkr/share_icons
...
Replace share icons
2018-06-27 17:22:21 +01:00
7bce29db6e
Replace share icons
...
with ones that look a bit more like the actual logos those sites use now
2018-06-27 17:17:44 +01:00
74770acf73
Merge pull request #2025 from matrix-org/luke/fix-status-bar-consent-error
...
Improve status bar errors (namely the consent error)
2018-06-27 15:40:18 +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
a0871116d8
Merge pull request #2023 from matrix-org/luke/fix-copy-button-position
...
Fix incorrectly positioned copy button on `<pre>` blocks
2018-06-27 11:37:22 +01:00
6345fcb8f2
Fix incorrectly positioned copy button on `<pre>` blocks
2018-06-27 11:31:55 +01:00
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
cf24427d12
Merge pull request #2022 from matrix-org/dbkr/update_package_lock
...
Update package-lock.json
2018-06-27 10:33:41 +01:00
483edb8211
`pathname` is not constant
2018-06-27 10:31:51 +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
2bc1679b97
Merge pull request #2020 from matrix-org/t3chguy/improve_linkifier2
...
improve linkifier AGAIN
2018-06-27 10:27:30 +01:00
ee729233c8
Update package-lock.json
2018-06-27 10:17:25 +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
96163d1402
prevent multiple ports ( 🔢 1234:1234)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:41:46 +01:00
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
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
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
166ec68a9a
Merge pull request #2013 from matrix-org/revert-1980-t3chguy/fix_copy-code-block_hscroll
...
Revert "affix copyButton so that it doesn't get scrolled horizontally"
2018-06-26 17:18:21 +01:00
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
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
19e948155c
Redact pathnames with origin `file://`
2018-06-26 17:06:45 +01:00
1c6e5e1cc1
Merge pull request #2015 from matrix-org/dbkr/widgets_refactor
...
Refactor widgets code
2018-06-26 16:59:58 +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
cb89406d3e
Indent
2018-06-26 15:42:29 +01:00
4a39297e65
PR feedback
2018-06-26 15:41:43 +01:00
0a6450507e
Bits of PR feedback
2018-06-26 15:21:22 +01:00
b6f3b2f594
More code re-use
2018-06-26 12:28:59 +01:00
ca8a4a0c3f
Remove unused function
2018-06-26 12:08:33 +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
069080e7ed
lint
2018-06-26 09:41:20 +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
cdf7101222
run gen-i18n and prune-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 07:46:48 +01:00
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
e292ee942f
Fix RoomSubList headers by re-commiting 1faecfd
...
The original got reverted in ebfafb36
2018-06-25 16:37:45 +01:00
f7dfba417c
Revert "affix copyButton so that it doesn't get scrolled horizontally"
2018-06-25 16:31:43 +01:00
5c8eeff08a
Refactor widgets code
...
Split logic out of setWidget & re-use it when we add jitsi widgets.
Also fix the detection of existing jitsi widgets and make that use
getRoomWidgets() too.
Add error message when a jitsi call is already in process.
2018-06-25 15:30:04 +01:00
e67e1e8c0d
Merge pull request #2009 from matrix-org/t3chguy/login_local_error
...
Login local errors for blank fields
2018-06-25 14:29:09 +01:00
4594b045d2
Merge pull request #1917 from akihikodaki/lolex
...
Update lolex to 2.7.0
2018-06-25 13:37:59 +01:00
Luke Barnard