Matthew Hodgson 07200d7953 Merge branch 'develop' into matthew/orderable-roomlist		2015-11-07 17:29:18 +00:00
..
controllers	fix various edge cases when dragging stuff back to the conversations list	2015-11-06 23:30:57 +01: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	Merge branch 'develop' into matthew/orderable-roomlist	2015-11-07 17:29:18 +00:00
vector	Replace CAS login with token login	2015-11-06 11:22:59 +00:00
Avatar.js	Fix missing getAvatarUrlForMember	2015-10-20 11:49:21 +01:00
ContextualMenu.js	Make context menus point the right way	2015-10-21 19:02:02 +01:00
DateUtils.js	WIP for new lightbox viewer	2015-10-27 01:39:19 +00:00