Commit graph

Select branches

Hide pull requests

develop

Mono Color

• e03809b224 Merge pull request #16 from matrix-org/markjh/end-to-end David Baker 2015-07-21 13:21:43 -0700
• 6fc910a259 Don't try to set page_type if not logged in David Baker 2015-07-21 11:12:59 -0700
• 959c0f0669 Order room members by lastActiveAgo David Baker 2015-07-21 11:05:24 -0700
• 8dc73cb6cc finally fix dave's MemberInfo visibility bug, hopefully Matthew Hodgson 2015-07-21 11:03:01 -0700
• 2160440ff1 Add and impl resend button. Update UI when failing to send messages. Kegan Dougal 2015-07-21 18:05:22 +0100
• f036a10a7d Add missing src/encryption.js file Mark Haines 2015-07-21 17:00:57 +0100
• 6bb6eafdc0 Hook up slash commands to enable and disable encryption for a room so that we can experiment with encryption while we wait for the rest of the UI to exist Mark Haines 2015-07-21 16:46:17 +0100
• e0496305aa Log when presence is set. Kegan Dougal 2015-07-21 16:23:21 +0100
• 2698405e2f Add MatrixToolbar CSS. Make the toolbar part of RoomView and don't cover the UI (shift it instead) Kegan Dougal 2015-07-21 16:12:08 +0100
• c1de5e9e95 Factor out logic from EnableNotificationsButton(!) and reuse MatrixToolbar. Kegan Dougal 2015-07-21 15:47:56 +0100
• ed738b6398 Merge pull request #15 from matrix-org/erikj/room_editing David Baker 2015-07-21 08:14:25 -0700
• e36ca10e6c Show banned users in room settings Erik Johnston 2015-07-21 16:07:47 +0100
• 71f5d1f6cb Use bind to take variable value rather than reference: make room directory able to join rooms David Baker 2015-07-21 08:05:58 -0700
• 4679e005bf Merge pull request #14 from matrix-org/erikj/room_editing David Baker 2015-07-21 07:38:10 -0700
• c5d84562ba Move logic from view to controller Erik Johnston 2015-07-21 15:24:10 +0100
• 16846c36fd Handle default named rooms when editing room names Erik Johnston 2015-07-21 14:46:42 +0100
• 2fe56fd86d Re-add the notifications button. Kegan Dougal 2015-07-21 14:45:24 +0100
• 89f6459915 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing Erik Johnston 2015-07-21 14:14:48 +0100
• b8e1927e82 Use getDefaultProps instead of setting porps Erik Johnston 2015-07-21 14:13:59 +0100
• d81260c92a Use getDefaultProps instead of setting porps Erik Johnston 2015-07-21 14:13:59 +0100
• 76c014b9ef Deal with the insanity if there are no power levels Erik Johnston 2015-07-21 13:33:01 +0100
• 2454a71b38 Implement create/remove mod button. Kegan Dougal 2015-07-21 13:24:59 +0100
• 726ee7b50b Hook up the encrypt button when creating rooms Mark Haines 2015-07-21 12:03:15 +0100
• 3474f08334 Display the body of unknown message types Mark Haines 2015-07-21 12:01:18 +0100
• 13f04f77dc Tidy up power level logic. Add 'Moderator' label to members. Kegan Dougal 2015-07-21 11:43:18 +0100
• 085e07c5b1 Display error on fail Erik Johnston 2015-07-21 11:26:08 +0100
• 2e2cecdd4f Implement kick/ban/[un]mute buttons on member list dialogs. Kegan Dougal 2015-07-21 11:26:02 +0100
• 0e9074b0de Remove console.logs Erik Johnston 2015-07-21 11:22:11 +0100
• 2bec7ec981 Add spinner while uploading state Erik Johnston 2015-07-21 11:02:36 +0100
• 0b1b6057d6 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing Erik Johnston 2015-07-21 10:39:46 +0100
• af190f286c Add event power levels to room settings Erik Johnston 2015-07-21 10:33:41 +0100
• 3657029fc7 apply opacity only to the subelements to avoid breaking hoverover on yosemite Matthew Hodgson 2015-07-20 22:18:29 -0700
• 12c824323d rename DirectoryMenu as BottomLeftMenu and implement a really really really basic RoomDirectory Matthew Hodgson 2015-07-20 20:11:24 -0700
• fe71f69f0a rename EditableText's placeHolder parameter to be 'label' to avoid colliding with the HTML5 placeholder parameter Matthew Hodgson 2015-07-20 16:31:11 -0700
• e0673eee29 Don't go & load the first room if we've already been told to load a different one. David Baker 2015-07-20 14:09:41 -0700
• 36b1280f0c Bookmarkable room URLs David Baker 2015-07-20 12:20:17 -0700
• dcecdc8260 lipstick for hangup button and typing notifs Matthew Hodgson 2015-07-20 12:09:24 -0700
• 813cf0481e Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing Erik Johnston 2015-07-20 18:18:04 +0100
• 0a3cddbd89 Merge pull request #13 from matrix-org/markjh/vector-cleanup-client-peg David Baker 2015-07-20 10:12:16 -0700
• 6ceaee7fc0 Merge pull request #12 from matrix-org/markjh/cleanup-client-peg David Baker 2015-07-20 10:11:24 -0700
• e9b2cd1364 Allow input history to go forwards again to the empty field David Baker 2015-07-20 10:05:53 -0700
• 5d59a5b297 Change opacity of member list entries when their presence changes. Kegan Dougal 2015-07-20 17:42:19 +0100
• 3a7ebf73eb Wire up changing of power levels Erik Johnston 2015-07-20 17:31:40 +0100
• 9d110d58e5 Manage presence of the client (same semantics as angular) Kegan Dougal 2015-07-20 17:14:29 +0100
• bcab2f231a Add error dialogs for invites and call timeouts. Kegan Dougal 2015-07-20 16:40:00 +0100
• 1b6ca2b0ee Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing Erik Johnston 2015-07-20 16:31:02 +0100
• eae0972820 Add files. Add power levels to room settings Erik Johnston 2015-07-20 16:28:23 +0100
• 6fe842e130 Add ErrorDialog class. Use it for VoIP/command errors. Kegan Dougal 2015-07-20 16:26:47 +0100
• bb06484732 fix up MemberInfo behaviour Matthew Hodgson 2015-07-20 08:24:38 -0700
• 05d9afc040 don't depend on google for fonts, given i'm on inflight wifi... Matthew Hodgson 2015-07-20 08:23:55 -0700
• 04f17c963c Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing Erik Johnston 2015-07-20 16:03:35 +0100
• 0039ccf203 Add ability to edit room settings Erik Johnston 2015-07-20 15:07:51 +0100
• f2bd802bdc Wire up invite button on the member list. Kegan Dougal 2015-07-20 15:07:19 +0100
• 28022534f7 Fix the client-peg clean up to match the changes vector has made to the sdk Mark Haines 2015-07-20 14:19:13 +0100
• d8494ff89b Fix syntax Mark Haines 2015-07-20 13:48:40 +0100
• 715db89204 Move all the calls to createClient inside the MatrixClientPeg Mark Haines 2015-07-20 13:19:47 +0100
• b66488a783 Fix syntax Mark Haines 2015-07-20 13:48:40 +0100
• 19ee75577e Actually access state_key when getting target invite names... Kegan Dougal 2015-07-20 13:30:01 +0100
• 0baa2141fc Wire up Start Chat button. Kegan Dougal 2015-07-20 13:22:56 +0100
• 3f5c220993 Move all the calls to createClient inside the MatrixClientPeg Mark Haines 2015-07-20 13:19:47 +0100
• 08c16e0d7a Hook up presence/last active up (live updating; no ticker for last active). Kegan Dougal 2015-07-20 11:37:48 +0100
• 87dd9e8bb4 Unbreak stuff Kegan Dougal 2015-07-20 10:38:29 +0100
• 46764c3614 Don't set room name if it hasn't changed Erik Johnston 2015-07-20 10:23:07 +0100
• 0fa7f6cb63 .click() was what I was looking for... David Baker 2015-07-19 22:54:49 -0700
• 29b4f59982 Basically working upload progress bar. David Baker 2015-07-19 22:02:04 -0400
• a477c8be4c Mostly wire up the send file button, except I can't figure out the js magic to make a file input open the prompt. David Baker 2015-07-19 20:47:50 -0400
• b82d932a51 Logout button David Baker 2015-07-19 20:11:57 -0400
• 2121ddc295 add a MemberInfo list overlay as a mini user-profile page Matthew Hodgson 2015-07-20 01:51:58 +0100
• 6eaba4ff04 title tag Matthew Hodgson 2015-07-19 13:44:36 +0100
• 337e6b329f Don't lose username & password on login failure David Baker 2015-07-19 18:00:46 -0400
• caa7f813eb Bugfix sending of typing events David Baker 2015-07-19 17:29:41 +0100
• e8b944c0e1 Sooner or later I'll get used to this. David Baker 2015-07-19 16:43:45 +0100
• e1f3c80f19 Display who's typing David Baker 2015-07-19 16:38:56 +0100
• 73c8eb7738 Send typing notifs David Baker 2015-07-19 15:29:16 +0100
• 5aa913f201 Fix label in register screen David Baker 2015-07-19 10:56:12 +0100
• 85748c09cf Linkify emote tiles David Baker 2015-07-19 10:43:16 +0100
• 58907e5842 absolute path thinko Matthew Hodgson 2015-07-19 03:39:13 +0100
• 202c155788 absolute path thinko Matthew Hodgson 2015-07-19 03:37:39 +0100
• 2d25414b57 fix up registration page too Matthew Hodgson 2015-07-19 03:30:41 +0100
• d239070adb implement login Matthew Hodgson 2015-07-19 03:19:37 +0100
• 1e1f7492d8 basic skin of incomingCallBox Matthew Hodgson 2015-07-19 01:58:04 +0100
• 919e1cf84f unbreak voice calls Matthew Hodgson 2015-07-19 00:36:23 +0100
• 981bcbe74f disambiguate z-index for remote video Matthew Hodgson 2015-07-18 23:29:38 +0100
• 27d19f2ec8 include the code used to gen these gfx Matthew Hodgson 2015-07-18 19:11:39 +0100
• ea8737d957 POWER Matthew Hodgson 2015-07-18 19:06:58 +0100
• c83ff1c623 hide events with no text equiv Matthew Hodgson 2015-07-18 19:06:36 +0100
• db94a93fde hide events with no text equiv Matthew Hodgson 2015-07-18 19:06:26 +0100
• fc5f9bb70c highlight should imply bold Matthew Hodgson 2015-07-18 19:06:06 +0100
• 5b83974edd try to hide ugly scrollbars on win & lin Matthew Hodgson 2015-07-18 19:05:49 +0100
• 5a12a4a1a3 don't break the layout with unrecognised join events Matthew Hodgson 2015-07-18 02:17:10 +0100
• aa4f9abd5c basic VoIP lipstick Matthew Hodgson 2015-07-18 02:04:58 +0100
• 97981058f0 tweak badge Matthew Hodgson 2015-07-18 01:22:25 +0100
• 00d2d82a14 new style badges, hr, notices Matthew Hodgson 2015-07-18 01:21:56 +0100
• 4ded74765a encore du lipstick Matthew Hodgson 2015-07-18 00:48:22 +0100
• b685e784f1 oops, unbreak selectedRoom. sorry dave Matthew Hodgson 2015-07-18 00:48:17 +0100
• 10cdf46c2c s/that/self/g Matthew Hodgson 2015-07-17 21:59:48 +0100
• 0d34728190 border for bottom left Matthew Hodgson 2015-07-17 21:59:41 +0100
• 15edb9a80b fix up memberlist a bit more Matthew Hodgson 2015-07-17 21:30:25 +0100
• 706abe654a fix up memberlist a bit more Matthew Hodgson 2015-07-17 21:30:12 +0100
• d4541f54a3 fix up memberlist a bit more Matthew Hodgson 2015-07-17 21:29:54 +0100