Commit Graph

8801 Commits (7755a3ce9002a145ff88836f1d35ff5c4ba42be3)

Author SHA1 Message Date
Richard Lewis 7755a3ce90 Nest sticker image element for correct positioning of tooltips. 2018-03-06 10:48:32 +00:00
Richard Lewis e2cedbe9d7 Pull in changes from develop 2018-03-05 16:43:59 +00:00
David Baker 9a7a7ea2d6
Merge pull request #1784 from matrix-org/luke/fix-group-avatar-default-colour
Fix varying default group avatar colour for given group
2018-03-01 15:56:33 +00:00
Luke Barnard 94c1baa25d Fix varying default group avatar colour for given group 2018-03-01 15:42:22 +00:00
Luke Barnard a62a650c5a
Merge pull request #1783 from matrix-org/luke/fix-group-avatar-update
Fix bug where avatar change not reflected in LLP
2018-03-01 15:38:12 +00:00
Luke Barnard 86295acba3 Merge branch 'develop' into luke/fix-group-avatar-update 2018-03-01 15:27:06 +00:00
Luke Barnard d5908fbc1e Fix FlairStore cache busting 2018-03-01 15:06:05 +00:00
David Baker e91ae6b5ac
Merge pull request #1782 from matrix-org/luke/fix-drag-drop-click-weirdness
Workaround for atlassian/react-beautiful-dnd#273
2018-03-01 15:05:47 +00:00
David Baker ef58f71152
Merge pull request #1781 from matrix-org/luke/feature-disable-tag-panel
Add setting to disable TagPanel
2018-03-01 15:05:09 +00:00
Luke Barnard 61a6f140f5 onClientSync -> _onClientSync 2018-03-01 14:43:26 +00:00
Luke Barnard 4037a22492 Fix bug where avatar change not reflected in LLP
Fixes vector-im/riot-web#6189
2018-03-01 14:40:03 +00:00
Luke Barnard 64332b3021 Workaround for atlassian/react-beautiful-dnd#273
Fix two bugs in Riot due to a single bug in react-b-dnd

Fixes vector-im/riot-web#6253
Fixes vector-im/riot-web#6156
2018-03-01 13:48:46 +00:00
Luke Barnard f29918b766 gen-i18n 2018-02-28 18:18:59 +00:00
Luke Barnard 27c71f15b9 Add setting to disable TagPanel 2018-02-28 18:16:01 +00:00
David Baker 1ac62a17ff
Merge pull request #1779 from matrix-org/luke/fix-room-settings-power-levels
Fix room power level settings
2018-02-28 17:07:31 +00:00
Luke Barnard fa9ff4ae6e
Merge pull request #1769 from matrix-org/t3chguy/fix_hide_joins_parts
fix shouldHideEvent saying an event is a leave/join when a profile ch…
2018-02-28 16:58:26 +00:00
Luke Barnard d3dc2a33b4 Fix bug preventing setting room power levels
- don't use refs, use onChange of PowerSelector
 - store power levels as state in the RoomSetting component
2018-02-28 16:32:20 +00:00
Luke Barnard 567d83ba52 Update PowerSelector to support powerLevelKey prop
As a key to send as second argument to onChange. This is useful
when passing the same callback to multiple PowerSelectors.
2018-02-28 16:15:20 +00:00
Luke Barnard 9a72e69a43 Handle lack of room directory visibility response 2018-02-28 16:14:18 +00:00
Luke Barnard dd529791fb Remove unused prop 2018-02-28 16:13:01 +00:00
Luke Barnard d91d1932f4 Add tests for RoomSettings
For setting:
 - name
 - topic
 - history visibility
 - power levels

Testing RoomSettings required more stubbing on the matrix client.

The power level tests should be failing at this commit, with
fixes being made in upcoming commits.

Some tests are marked as known failures that we should fix but
aren't necessarily bugs:
 - SettingStore.setValue is used when saving despite the user not
   having made a change.
 - Testing directory publicity changes cannot be tested because we
   update state asynchronously in componentWillMount (which we do
   not block on in beforeEach).

Also, we needed to use `export default` to make sure everything
uses the same client peg and client.
2018-02-28 16:07:21 +00:00
Richard Lewis f3c928a4fc Lint. 2018-02-28 13:43:19 +00:00
Richard Lewis 21c8bed94d Bump build 2018-02-28 09:55:35 +00:00
Michael Telatynski bd4b40309d
fix based on PR review
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-28 00:49:14 +00:00
Richard Lewis 0fdbddf8fd Show sticker description as a tooltip, on hover. 2018-02-27 23:07:59 +00:00
Luke Barnard b78e248110
Merge pull request #1777 from matrix-org/luke/groups-my-groups-microcopy
Add "Did you know:..." microcopy to groups view
2018-02-27 15:11:12 +00:00
Richard Lewis 57c98d96a5 Update widget type. 2018-02-27 13:40:21 +00:00
Richard Lewis ef4d13715a Wrap menu close in timeout to avoid element disappearing unexpectedly. 2018-02-27 11:29:14 +00:00
Luke Barnard 2b49947e1e Add "Did you know:..." microcopy to groups view
To explain how to drag group avatars into the TagPanel
2018-02-27 09:20:06 +00:00
Richard Lewis 8e7564b9a3 Wrap the close menu trigger in a timeout 2018-02-26 17:47:52 +00:00
Richard Lewis 5ca0fc3ab5 Make MStickerBody extend MImageBody. 2018-02-26 14:01:33 +00:00
Richard Lewis b64736aa44 Add listener to close stickerpicker. 2018-02-26 13:43:16 +00:00
Richard Lewis 73c8ef50d1 Fix current roomID. 2018-02-26 13:37:53 +00:00
Richard Lewis 707e3f3382 Temp. revert unintended commit. 2018-02-26 13:32:27 +00:00
Richard Lewis 14d52c9f25 Open integration manager from widget postMessage. 2018-02-26 13:29:16 +00:00
Richard Lewis d3de44e6eb Global interface to start integration manager. 2018-02-26 13:26:49 +00:00
Richard Lewis 20a442c962 Add comment. 2018-02-25 23:00:46 +00:00
Richard Lewis 2b0790b32b Fix PropTypes. 2018-02-25 22:36:59 +00:00
Richard Lewis c93faf7de7 Fix promise wrapping. 2018-02-25 22:21:30 +00:00
Richard Lewis e249e3d622 Correct stickerpicker naming, 2018-02-25 22:10:38 +00:00
Richard Lewis ee4310cc41 Avoid potential NPE. 2018-02-25 21:47:23 +00:00
Richard Lewis 86461bc88f Disable all widget assets on widget removal. 2018-02-24 00:10:28 +00:00
Richard Lewis 332892fee6 Pull in changes from develop 2018-02-23 17:30:42 +00:00
Matthew Hodgson 3552800d19
Merge pull request #1753 from matrix-org/luke/fix-room-list-drop-target-bg
Give emptySubListTip a container for correct bg colour
2018-02-23 16:36:10 +00:00
Richard Lewis 891199b739 Force rebuild 2018-02-23 16:20:15 +00:00
Richard Lewis b2bf4d4709 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-02-23 15:37:33 +00:00
Richard Lewis 9ae89e2b43 Reduce logging. 2018-02-23 15:27:55 +00:00
Richard Lewis 9b667f2c38 Reduce logging. 2018-02-23 15:26:47 +00:00
Richard Lewis d755b8284c Remove logging and cleanup. 2018-02-23 15:22:56 +00:00
David Baker d23cb4dc1f
Merge pull request #1776 from matrix-org/luke/fix-to-device-event-bug
Do proper null-checks on decypted events to fix NPEs
2018-02-23 15:15:56 +00:00