Michael Telatynski
|
41af9f7a96
|
fix changed method name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-29 08:23:35 +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 |
|
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 |
|
Michael Telatynski
|
82d117974f
|
Remove unused import
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-04-27 11:16:29 +01:00 |
|
Michael Telatynski
|
d680d805ce
|
Merge branch 'develop' into t3chguy/m.relates_to
|
2018-04-23 10:14:48 +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 |
|