matrix-org/matrix-react-sdk

Pull Requests Commits

Merge pull request #2253 from matrix-org/dbkr/fix_ascii_smiley_emojification

dbkr committed 7 years ago

Verified 3b6a0f91

Move the max candidates constant out of the function

turt2live committed 7 years ago

d802ee0f

Appease the linter

turt2live committed 7 years ago

c3895405

Maybe fix UserSettings?

turt2live committed 7 years ago

ef8c9246

Fix autoreplacement of ascii emoji

dbkr committed 7 years ago

156ffd13

Merge branch 'develop' into travis/permalink-routing

turt2live committed 7 years ago

ea8a37ff

Merge pull request #2252 from jryans/dialog-padding

turt2live committed 7 years ago

Verified 6c23dc00

Merge pull request #2232 from matrix-org/travis/redirect-widgets

turt2live committed 7 years ago

Verified eaa2230d

fix after merge conflict error

bwindels committed 7 years ago

33925b2f

Merge branch 'develop' into experimental

bwindels committed 7 years ago

2c039483

Repair DevTools button padding by centralizing styles

jryans committed 7 years ago

2dc33579

Merge pull request #2251 from matrix-org/bwindels/noe2eforredesign

bwindels committed 7 years ago

Verified e799b30b

Use about:blank instead

turt2live committed 7 years ago

aaeb6e49

Merge branch 'develop' into travis/redirect-widgets

turt2live committed 7 years ago

749441b4

Merge branch 'develop' into travis/permalink-routing

turt2live committed 7 years ago

d58ff90e

Fix the server candidate picker to actually work

turt2live committed 7 years ago

52094964

Add hostname sanity tests

turt2live committed 7 years ago

43980add

Fix the tests so they actually test something

turt2live committed 7 years ago

b9bfbdc2

Fix Karma/Webpack so it can build the tests

turt2live committed 7 years ago

54ff5d8f

disable e2e tests for PRs targeted at experimental (redesign)

bwindels committed 7 years ago

206ad315

Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement

dbkr committed 7 years ago

Verified 85bb8392

Fix variable scope

dbkr committed 7 years ago

5e81e5b8

Do...while loops are a thing

dbkr committed 7 years ago

401f6333

Merge pull request #2248 from matrix-org/bwindels/memberpanel

dbkr committed 7 years ago

Verified adee0fdc

fix css in chrome

bwindels committed 7 years ago

3096bf42

avoid downloading avatars at full resolution

bwindels committed 7 years ago

030deba9

Pick servers for ?via on matrix.to links based on some heuristics

turt2live committed 7 years ago

e8cb6366

Install memfs because webpack is made of fail

turt2live committed 7 years ago

a8782120

Merge remote-tracking branch 'origin/develop' into travis/permalink-routing

turt2live committed 7 years ago

6ee495b9

Merge pull request #2249 from Half-Shot/hs/devtools-in-roomsettings

turt2live committed 7 years ago

Verified 8d47baa9

Newer Older