Matthew Hodgson 765174a600 merge conflict

2016-01-18 19:56:35 +00:00

..

components

merge conflict

2016-01-18 19:56:35 +00:00

Avatar.js

Show User avatar URLs

2016-01-15 17:31:32 +00:00

CallHandler.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

component-index.js

Merge branch 'develop' into kegan/invite-search

2016-01-18 17:31:26 +00:00

ContentMessages.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

ContextualMenu.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

DateUtils.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

dispatcher.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

encryption.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

Entities.js

Add ability to click-to-invite

2016-01-18 17:12:35 +00:00

extend.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

GuestAccess.js

No longer persist guest room IDs. Replace with transient peeked room ID.

2016-01-06 17:33:00 +00:00

HtmlUtils.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

index.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

linkify-matrix.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

MatrixClientPeg.js

Merge branch 'develop' into kegan/guest-access

2016-01-07 13:21:06 +00:00

MatrixTools.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

Modal.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

Notifier.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

PasswordReset.js

Implement password reset

2016-01-12 17:20:16 +00:00

Presence.js

Merge branch 'develop' into kegan/guest-access

2016-01-07 13:21:06 +00:00

Resend.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

RoomListSorter.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

Signup.js

M_INVALID_USERNAME to be consistent with param name

2016-01-15 10:08:16 +00:00

SignupStages.js

Correctly display an error if a bad IS URL is entered.

2015-11-20 10:37:46 +00:00

Skinner.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

SlashCommands.js

merge develop

2016-01-17 23:31:21 +00:00

TabComplete.js

Add a Command class; add Entry.getFillText()

2016-01-14 14:39:58 +00:00

TabCompleteEntries.js

Add a Command class; add Entry.getFillText()

2016-01-14 14:39:58 +00:00

TextForEvent.js

make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board

2016-01-17 02:48:55 +00:00

Tinter.js

tint Dave's read-up-to marker

2016-01-09 21:27:00 +00:00

UnreadStatus.js

update copyright for 2016

2016-01-07 04:06:52 +00:00

UserActivity.js

Better date syntax

2016-01-14 16:15:07 +00:00

UserSettingsStore.js

Merge branch 'develop' into kegan/guest-access

2016-01-07 13:21:06 +00:00

Velociraptor.js

Some null checks in animation code

2016-01-08 16:47:13 +00:00

VelocityBounce.js

Move velocity stuff / contextual menu from Vector to React.

2015-11-27 15:37:40 +00:00

WhoIsTyping.js

Partial porting over of vector controller logic to react sdk.

2015-09-17 18:23:38 +01:00