Commit Graph

4371 Commits

Author SHA1 Message Date
David Baker 613e3b7ac1 Remove extra full stop 2018-01-03 11:57:49 +00:00
lukebarnard 57fb09dfb7 Fix dodgy merge done in 874a7bf
where develop branch should have been used for a chunk of code
2018-01-02 19:26:56 +00:00
Luke Barnard 8eef09335a Merge pull request #1667 from matrix-org/luke/fix-naive-tag-panel-group-profile-requesting
Get Group profile from TagTile instead of TagPanel
2018-01-02 19:02:33 +00:00
lukebarnard 874a7bf1de Merge branch 'develop' into luke/fix-room-list-group-store-leak 2018-01-02 16:19:37 +00:00
lukebarnard 133837cdbe Document initial state 2018-01-02 15:59:10 +00:00
lukebarnard 833cd321f3 Log warning in case of failed group profile fetch 2018-01-02 15:58:24 +00:00
lukebarnard 31855f18f8 Initialise profile state 2018-01-02 15:56:32 +00:00
lukebarnard 2cb4c897ce Move getInitialState before componentWillMount 2018-01-02 13:45:19 +00:00
lukebarnard 3cb128094d Add more comments to TagTile to explain what it is 2018-01-02 13:44:22 +00:00
lukebarnard 80f11e5c77 Comment tag PropType 2018-01-02 13:34:47 +00:00
Matthew Hodgson fa14bc9b8d don't gutwrench 2017-12-18 22:49:23 +00:00
Matthew Hodgson e65c67ca15 fix https://github.com/vector-im/riot-web/issues/5841 2017-12-18 22:47:28 +00:00
Richard Lewis 32bdbdb2f3 Merge pull request #1669 from turt2live/travis/integ-theme
Give the current theme to widgets and the integration manager
2017-12-18 17:35:06 +00:00
Travis Ralston e5df0dcf1e $riot_theme -> $theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-18 09:19:54 -07:00
Michael Telatynski 201d8f04c0 Merge pull request #1671 from oivoodoo/riot-web-issue-1953-multiple-file-upload
Allow multiple file uploads using drag & drop for RoomView
2017-12-18 14:56:31 +00:00
Alexandr Korsak d051a2e0b3 Remove extra space 2017-12-18 15:59:21 +03:00
Alexandr Korsak 78af02b29b Replace lodash/every by Array.prototype.every function 2017-12-18 15:51:01 +03:00
Alexandr Korsak c07c4fd1cb Allow multiple file uploads on drag & drop 2017-12-18 13:20:18 +03:00
Alexandr Korsak fddbf3a2a2 Fix issue with preview of phone number on register and waiting for sms code confirmation code 2017-12-18 12:23:54 +03:00
Travis Ralston 94ef80c008 Support sending the current theme to widgets
This is a namespaced variable because some clients may not be able to support themes, or may have varying definitions of what "light" means. Widgets are recommended to opt for per-client checks, or accept that some clients may differ.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-16 20:11:00 -07:00
Luke Barnard adaea9ad5b Merge pull request #1647 from matrix-org/luke/tag-panel-improve-performance
Attempt to improve TagPanel performance
2017-12-15 17:38:15 +00:00
Luke Barnard 71740cc176 Merge branch 'develop' into luke/fix-room-list-group-store-leak 2017-12-15 17:36:36 +00:00
Luke Barnard d292dab9c6 More doc 2017-12-15 17:30:21 +00:00
Luke Barnard 56affd3d42 Rename for clarity 2017-12-15 17:29:06 +00:00
Luke Barnard d2066f41d5 Merge pull request #1656 from matrix-org/luke/fix-scroll-jump-on-message-decryption
Fix one variant of a scroll jump that occurs when decrypting an m.text
2017-12-15 17:25:21 +00:00
Luke Barnard 653137f6ec Update comment 2017-12-15 17:21:20 +00:00
Luke Barnard 6f896098e3 Get Group profile from TagTile instead of TagPanel
So that instead of getting all group profiles everytime the tags
change order, get them when the TagTile mounts for a group tag.
2017-12-15 17:18:46 +00:00
Luke Barnard 8b11b10531 Avoid NPEs by using ref method for collecting loggedInView in MatrixChat 2017-12-15 15:24:37 +00:00
Luke Barnard 961d5e1868 Split updatedSelectedTagsRooms
because we don't need to get the rooms for all groups when
the filtered tags change.
2017-12-15 14:23:35 +00:00
Luke Barnard 34e455c6fc Fix leaking of GroupStore listeners in RoomList 2017-12-15 14:12:21 +00:00
Luke Barnard 7f551f517b Add comments to _onDecrypted 2017-12-15 14:01:07 +00:00
Luke Barnard a516c18cc5 Indicate event tile resize after rendering 2017-12-15 13:58:58 +00:00
Luke Barnard df1134f092 Use "shared" DMRoomMap 2017-12-14 16:34:49 +00:00
Luke Barnard 3732fd29d5 Comments for instance variables 2017-12-14 16:17:06 +00:00
Luke Barnard 9975941f3c Merge pull request #1653 from matrix-org/luke/feature-ordered-tag-panel
DnD Ordered TagPanel
2017-12-14 10:36:16 +00:00
Luke Barnard 950f591b3f Clarify more docs 2017-12-13 15:50:20 +00:00
lukebarnard f38690f265 Doc orderedGroupTagProfiles 2017-12-13 10:51:04 +00:00
lukebarnard a8b245d0cf Add unmounted guard 2017-12-13 10:42:11 +00:00
lukebarnard 42c1f3cfe2 Fix incorrect bind 2017-12-13 10:41:24 +00:00
Richard Lewis c739269777 Update widget title on edit. 2017-12-13 10:14:26 +00:00
Luke Barnard 13925db251 Refactor to allow dispatching of two kinds of Actions
They are:
 1. The existing type of Action, Objects with an `action` type.
 1. Asyncronous Actions, functions that accept a `dispatch` argument, which can be used to dispatch Actions asyncronously.
2017-12-12 17:32:43 +00:00
Luke Barnard a120335130 Handle groups being joined and left 2017-12-11 18:03:19 +00:00
Luke Barnard aa914098dc Return null if TagOrderStore is loading
The view should decide the default state.
2017-12-11 17:19:29 +00:00
Luke Barnard 991ea4ebe5 Fix a few bugs with TagOrderStore:
- Have TagOrderStore listen for MatrixSync actions so that it can initialise
   tag ordering state.
 - Expose an empty list until the client has done its first sync and has
   fetched list of joined groups
2017-12-11 17:17:05 +00:00
Richard Lewis c93266b6af Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar 2017-12-11 13:08:49 +00:00
Richard Lewis 24db57bfb6 Fix api prefix. 2017-12-08 18:47:00 +00:00
Matthew Hodgson f2d68e4601 Merge pull request #1649 from matrix-org/rxl881/titleBar
Add maximize / minimize apps drawer icons.
2017-12-08 19:18:45 +01:00
David Baker bb9376098a Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning
Warn when migrating e2e data to indexeddb
2017-12-08 16:52:05 +00:00
David Baker 0d38e7510d Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
Richard Lewis a9ae4be74c Fix page title variable name. 2017-12-08 15:27:14 +00:00