Commits · matthew/html-highlight-fix · GitHub Mirror / Matrix.org / matrix-react-sdk · GitLab

Snippets Groups Projects

Feb 11, 2016
- remove unused 'body' var; use a `finally` to clean up the temporary textfilter · 1c30640a
  Matthew Hodgson authored Feb 11, 2016
  
  1c30640a
Feb 10, 2016
- ooops, don't forget to actually sanitize the highlights after all that · 92435c08
  Matthew Hodgson authored Feb 10, 2016
  
  92435c08
- use sanitize-html's textFilter callback to only apply highlights to textNodes... · d055dbe5
  Matthew Hodgson authored Feb 10, 2016
  d055dbe5
- Merge pull request #152 from matrix-org/dbkr/fix_room_settings_guest_exception · f016a327
  David Baker authored Feb 10, 2016
  f016a327
- Merge pull request #153 from matrix-org/dbkr/no_notif_settings_guests · 124155df
  David Baker authored Feb 10, 2016
  124155df
- Don't show the Notifications widget for guests since they can't use them (and... · 1e945cd1
  David Baker authored Feb 10, 2016
  1e945cd1
- Don;t try to fetch push rules if we're a guest: it throws. · 038f6130
  David Baker authored Feb 10, 2016
  
  038f6130
- Merge pull request #148 from matrix-org/rav/keep_scrolling · 0d2b042c
  Richard van der Hoff authored Feb 10, 2016
  0d2b042c
Feb 09, 2016
- Merge pull request #151 from matrix-org/dbkr/spinner_while_joining · bd73c4e0
  David Baker authored Feb 9, 2016
  bd73c4e0
- Merge pull request #150 from matrix-org/dbkr/null_check_invite_member_list · f72e534a
  David Baker authored Feb 9, 2016
  f72e534a
- Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city. · af0597e0
  David Baker authored Feb 9, 2016
  
  af0597e0
- Add a null check here since room can be null and this was throwing · b4a71246
  David Baker authored Feb 9, 2016
  
  b4a71246
- Merge pull request #149 from matrix-org/rav/kill_autopeek · b5f7bd6c
  Richard van der Hoff authored Feb 9, 2016
  b5f7bd6c
- Kill another scrollToToken · f48f28ee
  Richard van der Hoff authored Feb 9, 2016
  f48f28ee
- Kill off the remains of auto_peek · 576b59be
  Richard van der Hoff authored Feb 9, 2016
  576b59be
- unbreak safari · 3fd7dff2
  Matthew Hodgson authored Feb 9, 2016
  
  3fd7dff2
- better commenting · baa68264
  Matthew Hodgson authored Feb 9, 2016
  
  baa68264
- Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling · 178e9938
  Richard van der Hoff authored Feb 9, 2016
  
  178e9938
- Fix 'unread messages' in status · 7fd56351
  Richard van der Hoff authored Feb 9, 2016
  7fd56351
- Merge pull request #147 from matrix-org/rav/factor_out_statusbar · 194110dd
  Richard van der Hoff authored Feb 9, 2016
  194110dd
- Wire up jump-to-bottom knob · 81e95ca8
  Richard van der Hoff authored Feb 9, 2016
  81e95ca8
- Don't stop scrolling at the read-up-to mark. · 8641dab7
  Richard van der Hoff authored Feb 9, 2016
  8641dab7
- Merge pull request #146 from matrix-org/kegan/warning-bars-dom · da81d240
  Kegsay authored Feb 9, 2016
  da81d240
Feb 08, 2016
- Factor the statusbar implementation out of RoomView · 1d9c8869
  Richard van der Hoff authored Feb 8, 2016
  1d9c8869
- Merge pull request #145 from matrix-org/rav/outdent_roomview_render · 4996164b
  Richard van der Hoff authored Feb 8, 2016
  4996164b
- Fix the mess of warning bars so it doesn't trigger remounts of alllll the components · ecaa2c1e
  Kegan Dougal authored Feb 8, 2016
  
  ecaa2c1e
- Drop a redundant 'else' from RoomView.render, and outdent a load of code · 3ca2bbe3
  Richard van der Hoff authored Feb 8, 2016
  3ca2bbe3
- Merge pull request #143 from matrix-org/dbkr/fix_display_name_prompt_when_peeking · a2e50eb4
  David Baker authored Feb 8, 2016
  a2e50eb4
- explicitly check join status as it's clearer · 9bf8f37e
  David Baker authored Feb 8, 2016
  
  9bf8f37e
- Merge pull request #144 from matrix-org/kegan/invite-autocompleting-race · fba497d3
  Kegsay authored Feb 8, 2016
  fba497d3
- Fix bug where clicking on the email tile didn't work · 2027ed9f
  Kegan Dougal authored Feb 8, 2016
  
  2027ed9f
- Merge branch 'develop' into kegan/invite-autocompleting-race · 70ed0be3
  Kegan Dougal authored Feb 8, 2016
  
  70ed0be3
- Split out invite memberlist logic into its own component · 3fa23798
  Kegan Dougal authored Feb 8, 2016
  
  3fa23798
- Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined. · baba5001
  David Baker authored Feb 8, 2016
  baba5001
- Merge pull request #140 from matrix-org/dbkr/fix_tab_complete · 05f1e1e2
  David Baker authored Feb 8, 2016
  05f1e1e2
Feb 05, 2016
- Reset truncation when the text box is cleared · 7ccce1dc
  Kegan Dougal authored Feb 5, 2016
  
  7ccce1dc
- Fix canonical alias bug showing the first alias if one was not set. · 5dafe1f4
  Kegan Dougal authored Feb 5, 2016
  5dafe1f4
- Merge pull request #142 from matrix-org/kegan/truncate-invite-search-list · ac67cd55
  Kegsay authored Feb 5, 2016
  ac67cd55
- Merge pull request #141 from matrix-org/kegan/room-settings-refactor · 4ce41f7f
  Kegsay authored Feb 5, 2016
  4ce41f7f
- camelCasePlease · b99c6b9a
  Kegan Dougal authored Feb 5, 2016
  
  b99c6b9a