enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
9,981 Commits 1 Branch 7 Tags
24aeda2e05eed18d836df8d809abb75ff994edcc
Commit Graph

8357 Commits

Author SHA1 Message Date
Luke Barnard 24aeda2e05 Fix bug where usage data link not visible when no cookie policy url 2018-05-24 16:52:04 +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
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 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 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 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 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 fadf264a1b Rename uses of function too 2018-05-15 17:34:02 +01:00
David Baker e4a221e42d More helpful function name 2018-05-15 17:28:55 +01:00
David Baker bb5ae741bc Wait for deletion of widgets as well addition 
We were previously waiting for them to appear which is silly if we
were deleting them.
 2018-05-15 17:12:59 +01:00
David Baker 9d5ba25131 oh, sendError does support sending the error 2018-05-15 15:19:28 +01:00
David Baker 464e093f40 log exception 2018-05-15 15:14:33 +01:00
David Baker 5b781043a5 just use the one if statement 2018-05-15 15:02:24 +01:00
David Baker 7bfe84f8be Catch errors adding widget 2018-05-15 14:53:49 +01:00
David Baker e9336eab63 lint 2018-05-15 14:18:02 +01:00
David Baker d0ec467c34 Oops, actually get account data event. 
Also ignore any account data events that aren;t widgets.
 2018-05-15 14:13:56 +01:00
David Baker f4d69e26e9 PR feedback 2018-05-15 12:06:23 +01:00
David Baker 142ce4c256 better comment 2018-05-15 11:50:24 +01:00
David Baker 2956c049d6 Wait for echo from server when adding user widgets 
As hopefully all explained in comments.

Fixes https://github.com/vector-im/riot-web/issues/6727
 2018-05-15 11:41:16 +01:00
Luke Barnard b016a79d97 Merge branch 'develop' into release-v0.12.4 2018-05-14 17:51:27 +01:00
Luke Barnard e596924074 Merge branch 'develop' into release-v0.12.4 2018-05-14 17:43:40 +01:00
Weblate deec515e97 Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 16:40:18 +00:00
Richard Lewis 8c3a63a169 Merge pull request #1894 from turt2live/travis/fix-stickerpacks 
Correctly identify sticker picker widgets
 2018-05-14 17:40:13 +01:00
Luke Barnard ff0254d346 Fix ContextualMenu imports for TagTile and code block copy button 2018-05-14 17:36:57 +01:00
Weblate 9c4b25817c Merge remote-tracking branch 'origin/develop' into develop 2018-05-14 16:27:14 +00:00
Slavi Pantaleev 4ce6093daf Translated using Weblate (Bulgarian) 
Currently translated at 99.1% (1165 of 1175 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-05-14 16:27:13 +00:00