OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,989 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

9989 Commits (033b110f5fdc774c384ce1342201ee61513d96cd)

Author SHA1 Message Date
Luke Barnard 033b110f5f
Merge pull request #1929 from matrix-org/luke/cookie-bar-update 
Cookie bar update
 2018-05-24 17:19:05 +01:00
Luke Barnard 023c4e2a43
Merge pull request #1928 from matrix-org/dbkr/leave_server_notices_room_message 
Message for leaving server notices room
 2018-05-24 17:06:41 +01:00
David Baker 168b956b3c homeserver 2018-05-24 17:01:00 +01:00
Luke Barnard fd8d501732 Update cookie bar wording 2018-05-24 16:58:14 +01:00
David Baker 9d2f223773 Message for leaving server notices room 2018-05-24 16:54:48 +01:00
Luke Barnard 24aeda2e05 Fix bug where usage data link not visible when no cookie policy url 2018-05-24 16:52:04 +01:00
Richard Lewis e4a67e8f02
Merge pull request #1927 from matrix-org/rxl881/ImURLCheck 
More thorough check of IM URL validity.
 2018-05-24 16:38:24 +01:00
Richard Lewis 9753ee8d82 Better check of jitsi widget message origin. 2018-05-24 16:14:18 +01:00
Richard Lewis a13d58f6c2 More thorough check of IM URL validity. 2018-05-24 14:58:59 +01:00
Luke Barnard 693ccf69c7
Merge pull request #1926 from matrix-org/luke/cookie-bar-anayltics-modal 
Add usage data link to cookie bar
 2018-05-24 13:11:36 +01:00
Luke Barnard aae89efa01 Add usage data link to cookie bar 
this opens the analytics modal
 2018-05-24 12:47:27 +01:00
Luke Barnard 6f77b8ae26 Modify showDetailsModal to give examples if analytics is not enabled 2018-05-24 12:46:06 +01:00
Luke Barnard e0a3debb7a prune-i18n 2018-05-24 12:08:22 +01:00
Luke Barnard 8dcf43a88d gen-i18n 2018-05-24 12:08:05 +01:00
Luke Barnard 03c97140a6
Merge pull request #1925 from matrix-org/luke/deactivate-account-reword 
Change wording and appearance of Deactivate Account dialog
 2018-05-24 12:02:10 +01:00
Luke Barnard dca1217a45 Change wording and appearance of Deactivate Account dialog 2018-05-24 11:50:45 +01:00
Matthew Hodgson 3bee23e733
Merge pull request #1924 from matrix-org/matthew/fix-memberlist-ordering 
fix membership list ordering when presence is disabled.
 2018-05-24 11:29:29 +01:00
Luke Barnard a8f6ebe567
Merge pull request #1922 from matrix-org/luke/erase-on-deactivate 
Implement erasure option upon deactivation
 2018-05-24 10:48:57 +01:00
Matthew Hodgson cc79384839 fix https://github.com/vector-im/riot-web/issues/6643 2018-05-24 01:57:22 +01:00
Luke Barnard b124989968 Implement erasure option upon deactivation 2018-05-23 16:33:32 +01:00
Luke Barnard ba3dd0c87a Refactor onOk to async function 2018-05-23 13:35:42 +01:00
Luke Barnard a6cc0406dd
Merge pull request #1921 from matrix-org/luke/widget-cookie-warning 
Add cookie warning to widget warning (AppPermission)
 2018-05-23 11:07:16 +01:00
Luke Barnard ef686a966d Add cookie warning to widget warning (AppPermission) 2018-05-23 10:46:32 +01:00
Luke Barnard c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog 
Terms and Conditions dialog
 2018-05-23 10:17:14 +01:00
Luke Barnard 658e88c30f Implement consent/terms and conditions dialog for /_matrix/consent flow 2018-05-22 18:03:56 +01:00
Luke Barnard c47c7b8d98
Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users 
improve privileged section users in room settings
 2018-05-22 16:07:01 +01:00
Luke Barnard e602213806 Add concept of priority modal to modal manager 2018-05-22 15:47:05 +01:00
Luke Barnard 31dcd85c08 Add customisable cancel button to QuestionDialog 2018-05-22 15:45:58 +01:00
David Baker 1895f82d62
Merge pull request #1918 from matrix-org/dbkr/leave_room_warning_space 
Space between sentences in 'leave room' warning
 2018-05-22 09:42:06 +01:00
David Baker ae10491f95 Space between sentences in 'leave room' warning 2018-05-22 09:28:41 +01:00
David Baker 6d2d7bb287
Merge pull request #1908 from matrix-org/luke/fix-start-chat-error 
Specify valid address types to "Start a chat" dialog
 2018-05-18 10:47:54 +01:00
David Baker 5952de772b
Merge pull request #1906 from matrix-org/luke/opt-in-analytics 
Implement opt-in analytics with cookie bar
 2018-05-18 10:44:53 +01:00
Luke Barnard 3e79c3e8a5
Merge pull request #1910 from MazeChaZer/fix-emoji-line-break-bug 
Fix vector-im/riot-web#6523 Emoji rendering destroys paragraphs
 2018-05-18 10:42:20 +01:00
Jonas Schürmann 4a9f4ba5eb Fix vector-im/riot-web#6523 Emoji rendering destroys paragraphs 
This regression was probably introduced in
4f4441fb07 and is caused by the fact that
the variable `isHtml` conflates two different meanings:

- The event contains an HTML message
- The event message is displayed using HTML

This is an important difference. Plain text messages that contain
emojies are rendered with an HTML string and thus have to be sanitized
etc. But they must not use the MarkDown CSS styles for HTML messages.

The MarkDown CSS styles include `whitespace: normal` because HTML events
use `<br/>`-tags for line breaks. Plain text messages with emojies
obviously don't use `<br/>`-tags, so these styles must not be applied.

Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de>
 2018-05-17 20:12:51 +02:00
David Baker fa7f6c2c4c v0.12.5 2018-05-17 17:04:39 +01:00
David Baker 43dbf306b0 Prepare changelog for v0.12.5 2018-05-17 17:04:38 +01:00
Luke Barnard cc87b73de2
Merge pull request #1909 from matrix-org/dbkr/fix_image_size_jump 
Fix image size jumping regression
 2018-05-17 16:56:51 +01:00
David Baker a7006307bf Call afterComponentDidMount() after componentDidMount 2018-05-17 16:50:16 +01:00
David Baker e53497421e Fix image size jumping regression 
Fixes https://github.com/vector-im/riot-web/issues/6654
 2018-05-17 16:47:17 +01:00
Luke Barnard fb79c57ec6 Specify valid address types to "Start a chat" dialog 
fixes https://github.com/vector-im/riot-web/issues/5459
 2018-05-16 18:57:53 +01:00
Luke Barnard 445badf4fc Merge branch 'luke/opt-in-analytics' of github.com:matrix-org/matrix-react-sdk into luke/opt-in-analytics 2018-05-16 15:58:04 +01:00
Luke Barnard 0bda607bb2 Only show cookie bar if analytics configured 2018-05-16 15:53:43 +01:00
Luke Barnard d15051a635 Add policyLink configuration to piwik 
Also:
 - Make CookieBar ES6 class
 - Alter phrasing on CookieBar
 - Conditionaly display longer "...(See our ++cookie and privacy
   policies++)." if policy link is configured.
 2018-05-16 15:49:23 +01:00
Luke Barnard 4e6594d64b Allow arbitrary hrefs for cookie/privacy links 2018-05-16 15:20:38 +01:00
Luke Barnard d01e738839 Fix UserSettings for new analyticsOptIn 2018-05-16 15:20:38 +01:00
Luke Barnard aa4bbbc3db Remove cookie bar setting from UserSettings 2018-05-16 15:20:38 +01:00
Luke Barnard ac1cd384e7 Implement opt-in analytics with cookie bar 2018-05-16 15:20:38 +01:00
David Baker bf0ec249b6 v0.12.4 2018-05-16 11:49:06 +01:00
David Baker 7bd9863e6a Prepare changelog for v0.12.4 2018-05-16 11:49:05 +01:00
Luke Barnard e98b31958b Allow arbitrary hrefs for cookie/privacy links 2018-05-16 10:41:18 +01:00