matrix-org/matrix-react-sdk

Pull Requests Commits

use originalEvent if present and append it to list

bwindels committed 6 years ago

11718a98

Merge pull request #3194 from matrix-org/bwindels/fix-history-redactions

bwindels committed 6 years ago

Verified 31723e9e

Merge pull request #3193 from matrix-org/bwindels/replace-server-date

bwindels committed 6 years ago

Verified 7ab665bf

Don't try to call bodyToHtml with an empty content

bwindels committed 6 years ago

f0318719

Merge pull request #3164 from matrix-org/t3chguy/fix_proptypes_mismatches

t3chguy committed 6 years ago

Verified 349afb13

use method that also takes server aggregations into account for tooltip date

bwindels committed 6 years ago

58d7ed02

Merge pull request #3192 from matrix-org/bwindels/preserve-reply-fallback-on-edit

bwindels committed 6 years ago

Verified cd803617

turn flag into options object

bwindels committed 6 years ago

f6e71b23

don't show reply fallback in edit history

bwindels committed 6 years ago

e601037c

preserve reply fallback when editing

bwindels committed 6 years ago

888e4d1e

Merge branch 'master' into develop

RiotRobot committed 6 years ago

0347c427

RiotRobot committed 6 years ago

61e2d871

Prepare changelog for v1.3.0

RiotRobot committed 6 years ago

6cafcf64

Upgrade to JS SDK 2.1.0

RiotRobot committed 6 years ago

33eba0e5

Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl

t3chguy committed 6 years ago

Verified dd27891e

Merge pull request #3180 from matrix-org/bwindels/history-actions

bwindels committed 6 years ago

Verified 7a482461

constistent jsx bracket and indent styling

bwindels committed 6 years ago

1af2ca6b

set analyticsInfo for dialogs

bwindels committed 6 years ago

cf11a375

make things a tad saner

t3chguy committed 6 years ago

c2905bd3

Make id used in EditableItemList unique, namespace mx_EditableItemList_*

t3chguy committed 6 years ago

89ece266

Don't show Remove button in ImageView if can't redact, delint ImageView

t3chguy committed 6 years ago

6b9c6a31

Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying

t3chguy committed 6 years ago

Verified 040e580c

Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit

t3chguy committed 6 years ago

Verified 000f7e80

Merge pull request #3184 from matrix-org/jryans/reactions-send-marks-unread

jryans committed 6 years ago

Verified 017fc848

Merge pull request #3179 from matrix-org/jryans/upgrade-deps

jryans committed 6 years ago

Verified 480fe44d

Merge pull request #3186 from matrix-org/jryans/reactions-allow-text

jryans committed 6 years ago

Verified 74431fe8

Merge pull request #3185 from matrix-org/jryans/tooltip-target-null

jryans committed 6 years ago

Verified 87188e92

Merge pull request #3181 from matrix-org/travis/soft-logout-force

turt2live committed 6 years ago

Verified 9266c797

Clamp reaction content width to at most 100px

jryans committed 6 years ago

eb0e1ead

Allow diplayed reaction values to contain anything

jryans committed 6 years ago

2a8f9a81

Older