Richard van der Hoff 776b6a26c3 Merge commit '9a0ea56' into rav/roomview_works ...

Conflicts:
	src/components/structures/RoomView.js

2016-02-23 13:02:02 +00:00

..

components

Merge commit '9a0ea56' into rav/roomview_works

2016-02-23 13:02:02 +00:00

AddThreepid.js

Implement adding email addresses to your profile.

2016-01-19 16:36:54 +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

Factor out a TimelinePanel from RoomView

2016-02-10 18:41:48 +00:00

ContentMessages.js

clear upload bar correctly after upload completes by fixing a race and moving the upload_finished dispatch after clearing up the inprogress uploads data structure. I have zero idea how this ever worked... :/

2016-02-15 21:29:56 +02: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

email.js

Implement adding email addresses to your profile.

2016-01-19 16:36:54 +00:00

encryption.js

update copyright for 2016

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

Entities.js

Add a tile to the invitee list which represents an email tile

2016-01-22 17:20:52 +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

Fix search clickthrough for HTML events

2016-02-17 21:06:27 +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

Log when sessions are saved/restored/not found

2016-02-05 13:32:01 +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

stop floods of notifs when doing a logout+login

2016-02-15 22:07:08 +00:00

ObjectUtils.js

Split out alias settings into its own component: AliasSettings

2016-02-02 12:46:14 +00:00

PasswordReset.js

Remove generateClientSecret and use the one the js sdk gives us.

2016-01-18 17:50:27 +00:00

Presence.js

Merge branch 'develop' into kegan/guest-access

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

ratelimitedfunc.js

Style things from PR comments

2016-02-05 09:51:09 +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

add markdown to tab complete list

2016-02-14 13:45:52 +02: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

unbreak safari

2016-02-09 15:08:04 +00:00

Unread.js

Your own messages should not count as unread

2016-01-28 11:12:56 +00:00

UserActivity.js

Consider mouse-clicking as user activity

2016-02-12 10:19:45 +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