Matthew Hodgson f9040e08ce fix conflicts

2015-11-24 16:05:58 +00:00

..

components/login

Clear the 'screen' to load the main left/middle/right panels, then show the settings after post-reg is done

2015-11-20 14:27:39 +00:00

controllers

Merge pull request #399 from vector-im/kegan/reg-refactor

2015-11-20 10:28:26 +00:00

modules

Get conf calling working, apart from the end call button showing in the right room.

2015-09-30 18:22:15 +01:00

skins/vector

fix conflicts

2015-11-24 16:05:58 +00:00

vector

revert bad fix to managing history

2015-11-11 02:31:37 +01:00

Avatar.js

Fix missing getAvatarUrlForMember

2015-10-20 11:49:21 +01:00

ContextualMenu.js

s/React/ReactDOM/ to fix another 0.14 warning

2015-11-18 22:22:19 +00:00

DateUtils.js

WIP for new lightbox viewer

2015-10-27 01:39:19 +00:00

HtmlUtils.js

STOP PEOPLE SHOUTING

2015-11-22 22:35:34 +00:00

Resend.js

Add resending bar (and resend all option)

2015-11-05 15:59:03 +00:00

Velociraptor.js

Fix the ref we keep to be the react element and make velociraptor correctly track what nodes it had at the start (c.key not c.props.key)

2015-11-20 18:22:38 +00:00

VelocityBounce.js

Hidden localstorage option to enable bouncy read receipts :p

2015-11-19 09:44:24 +00:00