matrix-org/matrix-react-sdk

Pull Requests Commits

Luke Barnard committed 8 years ago

c9c07713

Add comment for StickyContainer extension

Luke Barnard committed 8 years ago

cdb28f95

Update tests to reflect not supressing first date separator

Luke Barnard committed 8 years ago

69bce6ae

Merge branch 'develop' into luke/feature-sticky-date-separators

Luke Barnard committed 8 years ago

a29e7da0

Merge pull request #1346 from matrix-org/t3chguy/shouldHideEvent_RoomStatusBar

dbkr committed 8 years ago

32b33c66

Merge pull request #1345 from matrix-org/t3chguy/text4event_modified_widget

dbkr committed 8 years ago

b13ae76c

Implement sticky date separators

Luke Barnard committed 8 years ago

d516906b

Merge pull request #1352 from matrix-org/fix_hide_rr_regression

dbkr committed 8 years ago

22bb635f

revert fancy indents

t3chguy committed 8 years ago

05c232c8

separate concepts of showing and managing RRs to fix regression

t3chguy committed 8 years ago

282618d5

Update .eslintignore.errorfiles

richvdh committed 8 years ago

e800c29e

Merge pull request #1350 from matrix-org/rxl881/scalarTokenFix

rxl881 committed 8 years ago

84481f1a

Merge pull request #1349 from matrix-org/rav/avoid_sync_exception

dbkr committed 8 years ago

52683625

Make staging widgets work with live and vice versa.

rxl881 committed 8 years ago

2ff18880

Avoid breaking /sync with uncaught exceptions

richvdh committed 8 years ago

b9e047f0

Merge pull request #1343 from matrix-org/t3chguy/fix_two_roomlist_regressions

lukebarnard1 committed 8 years ago

5e98aa48

Merge pull request #1348 from matrix-org/dbkr/fix_forgot_password_percent_encode

lukebarnard1 committed 8 years ago

3f11f914

Merge pull request #1339 from matrix-org/dbkr/fix_spurious_notifications

lukebarnard1 committed 8 years ago

890218fa

Merge pull request #1347 from matrix-org/dbkr/unbreak_password_reset_alt_hs

lukebarnard1 committed 8 years ago

3fde35b1

Percent encoding isn't a valid thing within _t

dbkr committed 8 years ago

6d5b1b7a

Unbreak password reset with a non-default HS

dbkr committed 8 years ago

ec983b83

Merge pull request #1341 from matrix-org/dbkr/remove_audio_element_load

dbkr committed 8 years ago

3c149a11

apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar

t3chguy committed 8 years ago

315f7a3a

text4event widget modified, used to show widget added each time.

t3chguy committed 8 years ago

61277272

we need to pass whether it is an invite RoomSubList explicitly (i18n)

t3chguy committed 8 years ago

edb449df

Merge pull request #1340 from matrix-org/t3chguy/fix_robot_error

dbkr committed 8 years ago

60776938

Remove unnecessary 'load' on notif audio element

dbkr committed 8 years ago

acbcc000

_tJsx returns a React Object, the sub fn must return a React Object

t3chguy committed 8 years ago

cd1e58cb

dbkr committed 8 years ago

b15bbc8f

Fix spurious notifications

dbkr committed 8 years ago

d63a0d30

Older