OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,999 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

8999 Commits (9c2e3e25f03803cc413c2f1593b97405f5f039f5)

Author SHA1 Message Date
Michael Telatynski 9c2e3e25f0
clear reply_to_event at queue not send time 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-04 10:34:39 +01:00
Michael Telatynski 80fbc757f5
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-03-31 17:46:31 +01:00
David Baker a79c558763
Merge pull request #1818 from matrix-org/dbkr/dont_notify_bad_encrypted 
Don't notify for bad encrypted messages
 2018-03-29 18:33:44 +01:00
David Baker d6b3083c2f Don't notify for bad encrypted messages 
Continue to wait for decryption if the decryption process failed.
Because we weren't doing this, the first message in a megolm session
was generally failing to decrypt the first time because the keys often
arrive after the message.

Fixes https://github.com/vector-im/riot-web/issues/6284

This is is small & safe enough that we may want to consider
putting it in 0.14 if we're cutting another RC.
 2018-03-29 18:18:53 +01:00
Michael Telatynski 8fa4a525d8
Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to 2018-03-29 17:34:49 +01:00
Michael Telatynski a390cecf92
fix missing null-guard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-29 17:34:08 +01:00
Luke Barnard 1226ad3330
Merge pull request #1815 from matrix-org/luke/feature-group-join 
Join this community button
 2018-03-29 15:44:46 +01:00
Luke Barnard a92f822b04
Merge pull request #1816 from matrix-org/luke/reword-group-settings-delay-warning 
Reword group setting delay
 2018-03-29 15:43:54 +01:00
Luke Barnard c4322892de Reword group setting delay 2018-03-29 14:33:54 +01:00
Luke Barnard 2dea5cd233 run gen-i18n 2018-03-29 12:39:21 +01:00
Luke Barnard 385211528d Implement "Join this community" button 
for groups that have truthy summary.profile.is_joinable.
 2018-03-29 12:39:09 +01:00
Luke Barnard b40b417153
Merge pull request #1814 from matrix-org/luke/track-page-change-duration 
Track duration of page changes
 2018-03-28 12:00:32 +01:00
Luke Barnard 00167fbc06 Init page change state in willMount 2018-03-28 11:25:28 +01:00
Luke Barnard 8d994f2788 Merge branch 'develop' into luke/track-page-change-duration 2018-03-28 10:56:36 +01:00
Luke Barnard f29b58aba5 Always expect generationTimeMs 2018-03-28 10:31:03 +01:00
Luke Barnard 187e8ab8a8 Remove unused variable 2018-03-28 10:27:24 +01:00
Luke Barnard c8312dd5ae Use a less fragile API to track page change performance 2018-03-28 10:25:28 +01:00
Michael Telatynski fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to 2018-03-28 08:38:33 +00:00
Luke Barnard d3e2c4c561
Merge pull request #1810 from matrix-org/luke/force-gemini 
Wrap GeminiScrollbar in a component, enabled forceGemini
 2018-03-27 17:29:00 +01:00
Luke Barnard 944940057e Remember that React needs React 2018-03-27 13:04:26 +01:00
Luke Barnard 2ffcad0981 Convert GeminiScrollbarWrapper to stateless component 2018-03-27 13:04:26 +01:00
Luke Barnard 39e9d52c04 Make sure to proxy special prop `ref` 2018-03-27 13:04:26 +01:00
Luke Barnard b80568b1c5 Wrap GeminiScrollbar in a component, enabled forceGemini 
Fixes https://github.com/vector-im/riot-web/issues/6294
 2018-03-27 13:04:26 +01:00
Luke Barnard 69d9080dd5 Track duration of page changes 
The duration measured is between
 - componentWillUpdate of MatrixChat and
 - componentDidUpdate of MatrixChat.

This does not account for *all* changes to the view that occur
when a room switch happens, for example. But it does at least
capture the difference between switching to a "big" room and
switching to a small test room.
 2018-03-27 11:17:49 +01:00
David Baker a26f3f453c
Merge pull request #1742 from aidalgol/show-display-name-in-receipts 
Add display name to the read receipt view
 2018-03-26 13:41:06 +01:00
David Baker 0a920ae801
Indenting fix 2018-03-26 13:33:47 +01:00
Michael Telatynski b5ed08eba2
Merge 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-24 17:52:49 +00:00
Aidan Gauland 3d4feac75b Don't try to show unset display name 
In the ReadReceiptMarker title, show the display name only when it is not the
same as the user ID.
 2018-03-23 17:18:44 +13:00
Aidan Gauland 7e1913ef3c Merge branch 'develop' into show-display-name-in-receipts 2018-03-23 15:51:10 +13:00
David Baker 35d25ac0ea
Merge pull request #1811 from matrix-org/luke/fix-people-tagging 
Fix broken import preventing people tag
 2018-03-22 10:31:51 +00:00
Luke Barnard 4b6140b6c5 Fix broken import preventing people tag 2018-03-22 10:23:34 +00:00
David Baker 8342f441df
Merge pull request #1778 from matrix-org/t3chguy/devtools_autocomplete 
Add /devtools to Autocomplete and run gen-i18n
 2018-03-22 09:54:26 +00:00
Luke Barnard 7a2b493451
Merge pull request #1809 from matrix-org/dbkr/fix_presence_labels 
Fix PresenceLabel in MemberInfo
 2018-03-21 14:08:28 +00:00
David Baker e06783c5c7 Fix PresenceLabel in MemberInfo 
Which crashing when clicking on a member if presence was still
enabled.
 2018-03-21 12:45:09 +00:00
Michael Telatynski 9df5638c8e
make linter happy - add missing trailing comma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-21 11:00:07 +00:00
David Baker 55aeac6990
Merge pull request #1807 from matrix-org/luke/fix-room-tile-badge-flicker 
Fix room tile badge not disappearing when receiving a read receipt
 2018-03-20 17:26:50 +00:00
Luke Barnard 856c499541 Fix room tile badge not disappearing when receiving a read receipt 
Fixes https://github.com/vector-im/riot-web/issues/6357
 2018-03-20 17:19:49 +00:00
Luke Barnard eb52487b6d
Merge pull request #1806 from matrix-org/dbkr/lets_kill_presence 
Option to remove the presence feature by HS
 2018-03-20 13:01:18 +00:00
David Baker 580b68a1b6
Merge pull request #1652 from pvagner/dialog-a11y 
Dialog a11y
 2018-03-20 11:35:57 +00:00
David Baker 081edfba54
Merge pull request #1740 from matrix-org/luke/submit-debug-logs 
Change wording of debug log submission
 2018-03-20 10:57:32 +00:00
David Baker 2f564b8861
Merge pull request #1768 from adi1/develop 
Fix TextualBody.js to remove NodeList.forEach()
 2018-03-20 10:43:08 +00:00
David Baker 4b762b32ca
Merge pull request #1770 from matrix-org/t3chguy/piwik_disable_hbtimer 
Use undocumented piwik cmd to disable heartbeattimer
 2018-03-20 10:41:52 +00:00
David Baker 7ac583bc96
Merge pull request #1800 from ma1uta/develop 
Enable autocompletion for non-English languages.
 2018-03-20 10:39:20 +00:00
David Baker 31b772997e Option to remove the presence feature by HS 
Adds a config option that disables showing presence for certain
HS URLs, so we can disable it on matrix.org where the feature is
turned off.
 2018-03-19 16:47:12 +00:00
Luke Barnard 6789a6ec25 Add missing trailing comma 2018-03-19 14:57:41 +00:00
Luke Barnard 0c125b3dff Merge branch 'develop' into luke/submit-debug-logs 2018-03-19 14:55:28 +00:00
Luke Barnard aed7c2039d Update debug logs submission explanation 2018-03-19 14:54:50 +00:00
David Baker 0f6a21849e
Merge pull request #1805 from matrix-org/luke/feature-tag-panel-out-of-labs 
Take TagPanel out of labs
 2018-03-19 14:49:27 +00:00
Luke Barnard 1b28ab136b Take TagPanel out of labs 2018-03-19 14:12:06 +00:00
Michael Telatynski 661073493b
implement desired m.room.message->m.text fallbacks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-16 18:31:17 +01:00