Commit graph

12 commits

Author SHA1 Message Date
Michael Telatynski
9c5ceb6775
don't track error messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:56:01 +01:00
Michael Telatynski
5b6dbfb701
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics 2017-07-28 21:02:48 +01:00
Michael Telatynski
93a3c896a4
un-i18n Modal Analytics
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:45:02 +01:00
Richard van der Hoff
bc2f639aae Fix a couple of minor errors in the room list
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
2017-07-24 17:19:46 +01:00
Luke Barnard
53ae42ed68 Use catch instead of fail to handle room tag error
Because bluebird doesn't support fail
2017-07-19 14:11:22 +01:00
Michael Telatynski
884322f82c remove unused imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:57:42 +01:00
David Baker
ee85eb961a Bulk change counterpart imports
to use react-sdk wrapper function, rather than using counterpart
directly.
2017-05-25 11:39:56 +01:00
David Baker
6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Matthew Hodgson
40eceaf9bc show err.message in errors if present 2017-04-23 02:22:31 +01:00
Luke Barnard
be02ac3bc6 Fix people section again
- Alter CSS due to removed mx_RoomDropTarget_avatar. The avatar was removed because it didn't particularly add anything and we needed space for "Drop here to tag as direct chat", which is quite long.
 - Use guessAndSetDMRoom as a convenience method for guessing the DM member and setting the state.
 - Do evil hacks to make DNDRoomTile do dragging of RoomTiles to and from the People section. Dragging a DM to and from Rooms/Favourites/Low Priority now works as one would expect. This is still not ideal however because edge cases exist where you have more than one tag set and then you drag a DM from "Favourites" to "Rooms" and the tile ends up in "People". This would require setting multiple tags, and breaks the 1-1 mapping between tags and sections even further. Ultimately the UI needs a rework.
2017-03-17 12:14:44 +00:00
Matthew Hodgson
d639eb1049 beautify all error msgs 2017-03-12 23:26:26 +00:00
David Baker
57804f4e02 Support for common rooms in MemberInfo
Renames RoomDNDView to DNDRoomTile which now provides a separate DNDRoomTile component rather than
clobberring RoomTile, so we can use a draggable one where we want a draggable one and a non-draggable
one where we don't want it to be draggable. RoomTile main is still polluted with DND stuff, but is
now optional.

Remove BottomLeftMenuTile because it was no longer used in the bottom left menu. Just include
the equivalent markup directly in the one place we now use it (in MemberTile in react-sdk).
2016-09-09 16:15:45 +01:00
Renamed from src/components/views/rooms/RoomDNDView.js (Browse further)