t3chguy/matrix-js-sdk

Pull Requests Commits

Merge remote-tracking branch 'origin/develop' into dbkr/new_unread_count_format

dbkr committed 9 years ago

1f1d7436

fix another test

ara4n committed 9 years ago

787c0eba

STUPID LINE LENGTH LIMITS

ara4n committed 9 years ago

d559ad79

missing semicolon

ara4n committed 9 years ago

24655ac6

ara4n committed 9 years ago

5fd0ea2f

if we are the only person in a room, call it an 'Empty room' too, given this is how humans see a room if they're the only person in it...

ara4n committed 9 years ago

eaf7b03b

Merge branch 'develop' into dbkr/new_unread_count_format

dbkr committed 9 years ago

d375804c

Fix PR comments: typos and redundant line

dbkr committed 9 years ago

a24a9d35

kegsay committed 9 years ago

a0d81fcc

Merge branch 'develop' into dbkr/new_unread_count_format

dbkr committed 9 years ago

b4e4aaff

.name defaults to mxid

ara4n committed 9 years ago

3a73b54e

dbkr committed 9 years ago

5ec0fce2

name self-chats by displayname if possible rather than mxid, and name empty-chats as 'Empty room' rather than the fugly '?'

ara4n committed 9 years ago

8b749737

Add getter/setter for unread notif counts.

dbkr committed 9 years ago

8cb18052

kegsay committed 9 years ago

6df9d08d

Update for new unread count format

dbkr committed 9 years ago

b3c06dd7

Improve performance of hasMembershipState to not be stupid

kegsay committed 9 years ago

2a88b8db

Merge pull request #67 from matrix-org/kegan/address-book

kegsay committed 9 years ago

31c29b7e

Make getUsers() return users for *EEEEEVERYOOOOONE* regardless of presence events

kegsay committed 9 years ago

865db906

Merge branch 'push-rules-settings' into develop

manuroe committed 9 years ago

0b52a7e7

Merge branch 'develop' into push-rules-settings

manuroe committed 9 years ago

80f7220a

Updated push rules methods after review

manuroe committed 9 years ago

2e664adb

kegsay committed 9 years ago

14ef9348

Merge pull request #66 from matrix-org/matthew/roomsettings2

kegsay committed 9 years ago

3c170bf0

kegsay committed 9 years ago

3e67406a

ara4n committed 9 years ago

d6075bb5

ara4n committed 9 years ago

d8e56dad

deleteAlias() support

ara4n committed 9 years ago

67872206

Fixed Jenkins tests complaints

manuroe committed 9 years ago

e3b4cb03

Added MatrixClient getRoomPushRule and setRoomMutePushRule methods

manuroe committed 9 years ago

8011aab5

Older