OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,329 Commits
207 Branches
552 Tags
435 MiB
Commit Graph

8329 Commits (0f249504663778bb17f84240c0b2da70caa1cd1f)

Author SHA1 Message Date
David Baker 159f0c9594 Merge remote-tracking branch 'origin/develop' into read_receipts 2015-11-02 14:29:20 +00:00
David Baker e869814f2d Don't display anything if TextForEvent doesn't give us any text. Fixes #253 (catapillar of doom). 2015-11-02 14:14:47 +00:00
Kegsay 3b82884947 Merge pull request #298 from vector-im/kegan/reject-invites 
Add invite rejection
 2015-11-02 09:50:17 +00:00
Kegan Dougal 38780ad492 Merge branch 'develop' into kegan/reject-invites 2015-11-02 09:47:51 +00:00
Matthew Hodgson e25d31a9fe Merge pull request #296 from vector-im/matthew/redesign 
Matthew/redesign
 2015-10-30 18:30:13 +00:00
Matthew Hodgson 56d00c2ec7 make onFinished required prop for modal contents 2015-10-30 18:26:22 +00:00
Matthew Hodgson 79af89fd1b fix missing decl 2015-10-30 18:26:05 +00:00
Matthew Hodgson 11e176df66 comment for the hidden collapse button 2015-10-30 18:23:08 +00:00
Matthew Hodgson 75bc878657 comment what a CR is 2015-10-30 18:22:21 +00:00
Matthew Hodgson ddbc8dffb3 switch from enums to string literals for SearchBar.Scope 2015-10-30 18:21:54 +00:00
Matthew Hodgson 6aad99a505 comment \u200b 2015-10-30 18:20:29 +00:00
Matthew Hodgson 35cebc56d3 rewrite the HTML message stuff to fix XSS and improve clarity 2015-10-30 18:19:20 +00:00
Kegan Dougal 668234be4c Add reject button and impl 2015-10-30 17:18:25 +00:00
Kegsay 626e8bab1a Merge pull request #283 from vector-im/kegan/blocking 
Add feature-based browser blocking
 2015-10-30 14:59:06 +00:00
Kegan Dougal 633bbd8f29 Review comments: add chrome blurb. 2015-10-30 14:58:47 +00:00
David Baker ffb9ce89c7 Merge branch 'develop' into matthew/redesign 2015-10-30 11:50:34 +00:00
David Baker ce9a91e155 bundle.css shouldn't be necessary apart from the vector/bundle.* above 2015-10-30 11:33:33 +00:00
Matthew Hodgson fdfa0cbd0e display search results correct; support HTML markup 2015-10-30 04:10:37 +00:00
Matthew Hodgson d315e4afcd show m.room.names 2015-10-30 02:06:34 +00:00
Matthew Hodgson 80c04048d0 cancel viewsource dialog with escape 2015-10-29 21:30:29 +00:00
Matthew Hodgson 05d96f4cfb fix filters, and stop react exploding on unrecognised event tiles 2015-10-29 18:28:30 +00:00
Matthew Hodgson 8239e57fa1 more lightbox tweaks 2015-10-29 18:28:30 +00:00
David Baker f4ca30bb38 Throw exception if EventTile is instantiated with an event type it doesn't support. 2015-10-29 18:12:42 +00:00
Kegan Dougal cc313f350c Merge branch 'develop' into kegan/blocking 2015-10-29 16:03:26 +00:00
Erik Johnston ae2768af9c Remove left/right padding from ongoing call notification, so that we don't get scrollbars in chrome 2015-10-29 15:57:31 +00:00
Kegan Dougal 511b1f409c Add objectfit and localstorage to browser features 2015-10-29 15:56:03 +00:00
David Baker f00ee95563 Merge branch 'develop' of github.com:vector-im/vector-web into read_receipts 2015-10-29 11:27:56 +00:00
Matthew Hodgson 9fd2bf0989 remove transparent background for now; specify image width & height; punt the label over to the far RHS; to get around various layout problems in Chrome 44 and Safari 8 2015-10-29 11:01:23 +00:00
Matthew Hodgson 2c05515141 simplify keys 2015-10-29 02:34:06 +00:00
Matthew Hodgson eb6fbe6a5a theoretically scope the search, but it doesn't work 2015-10-29 02:24:35 +00:00
Matthew Hodgson 2ee840922d basic implementation of search 2015-10-29 02:03:04 +00:00
Matthew Hodgson 0ade5ff640 lightbox buttons 2015-10-29 00:39:12 +00:00
Matthew Hodgson dc401075a7 try to make the edit button more reliable 2015-10-29 00:38:51 +00:00
Matthew Hodgson de1e8e9f93 implement redact and links 2015-10-29 00:38:26 +00:00
Matthew Hodgson dbac2e299e tweak spacing of label on lightbox 2015-10-28 22:49:20 +00:00
Matthew Hodgson 8eaa96b0b3 black magic fixes to the lightbox 2015-10-28 19:41:49 +00:00
Matthew Hodgson cb095ba5a0 WIP search stuff 2015-10-28 19:41:23 +00:00
Matthew Hodgson 0bfb1416c1 WIP search stuff 2015-10-28 19:39:45 +00:00
David Baker 3db86b1f59 changelog 2015-10-28 18:37:53 +00:00
David Baker 5c77395faa v0.1.2 2015-10-28 18:32:13 +00:00
David Baker 74afa710d1 Merge branch 'develop' 2015-10-28 18:27:33 +00:00
David Baker e48e636c44 Bump js-sdk & react-sdk deps 2015-10-28 18:27:09 +00:00
Kegan Dougal 22369729f9 Remove test feature 2015-10-28 17:42:19 +00:00
Kegan Dougal 59d8cbe742 Use Modernizr to check for browser compatibility 
Add a CompatibilityPage which is shown for incompatible clients. If they
continue on regardless, proceed as if it never happened.
 2015-10-28 17:39:50 +00:00
Matthew Hodgson 00a7ea994a kill random grey backgrounds for transparent avatars 2015-10-28 16:52:50 +00:00
David Baker 4118c05d15 Unused variables 2015-10-28 16:23:48 +00:00
Matthew Hodgson 7fbe38e74d fix padding feckup 2015-10-28 16:02:59 +00:00
David Baker cee37c4152 Port react-sdk 2365fe8c over to vector's fork of the roomlist controller 2015-10-28 15:17:03 +00:00
Kegsay 4175dcd102 Merge pull request #260 from vector-im/inbound-audio 
Fix inbound audio
 2015-10-28 11:43:52 +00:00
Kegan Dougal 35862e0c66 Explicitly make React use the same audio element.. Use a 'key' and comment why it is required. 2015-10-28 11:43:13 +00:00