Kegan Dougal 7cbb43fddb Merge branch 'vector' into voip ...

Conflicts:
	src/ComponentBroker.js

2015-07-15 14:21:58 +01:00

..

controllers

Merge branch 'vector' into voip

2015-07-15 14:21:58 +01:00

ComponentBroker.js

Merge branch 'vector' into voip

2015-07-15 14:21:58 +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

Copyright headers (and use strict, while we're at it).

2015-06-23 16:41:25 +01:00

RoomListSorter.js

fix NPE for invites

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