David Baker
5804040a9b
Merge pull request #1959 from matrix-org/t3chguy/faded_encrypting_padlock
...
fix message appears unencrypted while encrypting and not_sent
2018-06-14 10:49:14 +01:00
David Baker
bb99950216
Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception
...
Fix exception when opening dev tools
2018-06-14 09:45:19 +01:00
David Baker
038b43aabd
Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker
...
show redacted stickers like other redacted messages
2018-06-13 17:28:22 +01:00
David Baker
b81e12e4cc
Fix exception when opening dev tools
...
Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.
This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.
Fixes https://github.com/vector-im/riot-web/issues/6436
2018-06-13 16:55:16 +01:00
Michael Telatynski
5cc2361737
change not_sent e2e lock to match colour of text
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 15:52:50 +01:00
Michael Telatynski
d4b2f06a63
fix message appears unencrypted while in flight
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 13:51:04 +01:00
Luke Barnard
bfb535d05c
Merge pull request #1951 from matrix-org/t3chguy/theme_memberinfo_close_btn
...
add mx_filterFlipColor to mx_MemberInfo_cancel img
2018-06-13 10:04:23 +01:00
Michael Telatynski
20caea47f8
make more generic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:32:21 +01:00
Michael Telatynski
846c14062a
show redacted stickers like other redacted messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:28:35 +01:00
Michael Telatynski
22bec0d67d
allow CreateRoom to scale properly horizontally
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:13:32 +01:00
Michael Telatynski
ed779cabc4
add mx_filterFlipColor to mx_MemberInfo_cancel img
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 15:35:06 +01:00
David Baker
8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics
...
Pinned message cosmetic improvements
2018-06-08 16:46:33 +01:00
Michael Telatynski
ffec32c7d9
Merge pull request #1943 from akihikodaki/react
...
Import react as React in src/components/views/elements/DNDTagTile.js
2018-06-06 10:08:52 +01:00
Akihiko Odaki
bf0d03bce3
Import react as React in src/components/views/elements/DNDTagTile.js
...
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
2018-06-06 17:59:50 +09:00
Travis Ralston
254e8c358a
Remove unused imports
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-28 11:38:09 -06:00
Travis Ralston
98613748b6
Move Scalar Widget URL check to WidgetUtils
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 11:12:55 -06:00
Travis Ralston
23162c8625
Support third party integration managers in AppPermission
...
Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL).
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 10:56:50 -06:00
Michael Telatynski
96ec3ab78a
Merge pull request #1934 from turt2live/travis/realtime-pins
...
Update pinned messages in real time
2018-05-27 17:50:23 +01:00
Travis Ralston
929da30df8
onEvent -> onStateEvent
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-27 10:28:47 -06:00
Travis Ralston
ec53b5f5ab
Expose at-room power level setting
...
Fixes https://github.com/vector-im/riot-web/issues/5835
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 21:22:42 -06:00
Travis Ralston
53396ff38d
Show timestamp of pinned messages on hover
...
Addresses part of https://github.com/vector-im/riot-web/issues/5405
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 19:46:11 -06:00
Travis Ralston
085271a864
Update pinned messages in real time
...
Fixes https://github.com/vector-im/riot-web/issues/5358
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 19:18:35 -06:00
Travis Ralston
033c41a2a8
Align pinned message contents and reduce image size
...
Fixes https://github.com/vector-im/riot-web/issues/5421
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 18:40:48 -06:00
Travis Ralston
62f4cfe734
Don't affect avatars in pinned message contents
...
This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-05-26 18:21:24 -06:00
Richard Lewis
b2c26e6984
Merge pull request #1920 from matrix-org/rxl881/refreshWidget
...
Add a "reload widget" button.
2018-05-24 18:11:22 +01:00
Richard Lewis
6288e9bc08
Merge pull request #1923 from matrix-org/rxl881/devTools
...
Make devTools styling more consistent and easier to edit event data.
2018-05-24 18:10:59 +01:00
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
fd8d501732
Update cookie bar wording
2018-05-24 16:58:14 +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
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
aae89efa01
Add usage data link to cookie bar
...
this opens the analytics modal
2018-05-24 12:47:27 +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
Richard Lewis
2a9859c7b6
Styling for consistency.
2018-05-23 17:40:15 +01:00
Richard Lewis
9f9cde12ce
Make devTools styling more consistent and easier to edit event data.
2018-05-23 17:18:33 +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
Richard Lewis
6df3371c6c
Add a "reload widget" button.
2018-05-22 19:14:54 +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
31dcd85c08
Add customisable cancel button to QuestionDialog
2018-05-22 15:45:58 +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
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
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