David Baker 75f8363be0 Merge branch 'master' into vector

2015-07-16 16:53:27 +01:00

..

controllers

Merge branch 'master' into vector

2015-07-16 16:53:27 +01:00

CallHandler.js

Remove 'status' from payload; unused.

2015-07-16 12:57:59 +01:00

ComponentBroker.js

Move position of incoming call buttons.

2015-07-16 16:32:21 +01:00

ContentMessages.js

Upload files and images

2015-07-08 14:34:53 +01:00

dispatcher.js

Add desktop notifications, overridable in the same way as other components (although it's not a react component). Also extend the flux dispatcher a little to be less dumb about dispatching while something else is already dispatching.

2015-07-03 11:12:54 +01:00

extend.js

add license header

2015-07-03 11:24:04 +01:00

index.js

s/themes/skins/g as we are always describing the whole UI layout here, whereas themes can sometimes just be small cosmetic tweaks (light-on-dark, dark-on-light etc)

2015-06-23 18:28:20 +01:00

linkify-matrix.js

tabs->spaces everywhere; sorry folks - \!blame sublime

2015-07-14 12:11:01 +01:00

MatrixClientPeg.js

Get as far as requesting a token

2015-07-14 19:39:18 +01:00

Modal.js

Add a basic modal dialog implementation

2015-07-16 09:37:14 +01:00

RoomListSorter.js

fix NPE for invites

2015-07-14 12:10:15 +01:00