summary refs log tree commit diff
path: root/webclient (follow)
Commit message (Expand)AuthorAgeFilesLines
* Create room entries for public rooms too so their public state is transferred...Kegan Dougal2014-09-172-0/+3
* webclient SYWEB-3 : Public rooms are bold. Can't think of a nicer way which d...Kegan Dougal2014-09-174-1/+18
* SYWEB-30: BF: When switching between rooms, pagination flickered between the ...Emmanuel ROHEE2014-09-172-2/+13
* SYWEB-22: Format emote('/me') messages correctly in desktop notificationEmmanuel ROHEE2014-09-171-1/+7
* BF: edit the actual room name not the displayed room name (which has been com...Emmanuel ROHEE2014-09-172-4/+9
* SYWEB-15: Always show the room alias as well as its name in the UIEmmanuel ROHEE2014-09-171-54/+56
* SYWEB-7: Use sessionStorage to make per-room history survives when the user n...Emmanuel ROHEE2014-09-171-1/+17
* SYWEB-7: Up & down keys let user step through the history as per readline or ...Emmanuel ROHEE2014-09-172-3/+72
* WEB-35: joins/parts should trigger desktop notificationsEmmanuel ROHEE2014-09-171-4/+18
* Bugfix when content isn't a string.Kegan Dougal2014-09-161-1/+1
* Don't bing for sent messages. Handle cases where the member is unknown rather...Kegan Dougal2014-09-162-4/+9
* Added basic RegExp support.Kegan Dougal2014-09-162-5/+3
* WEB-27: We don't need to show the user-count in Recents in the room sidepanel...Emmanuel ROHEE2014-09-162-2/+7
* Bing on all the things if there are 0 bing words.Kegan Dougal2014-09-162-0/+7
* hidden/minimise/focus disaster disclaimer with the TODOKegan Dougal2014-09-161-0/+4
* Added utility function containsBingWord and hook up some css to it.Kegan Dougal2014-09-163-31/+46
* Added bing detection logic. Persist the display name of the user in localstor...Kegan Dougal2014-09-164-7/+44
* Move the notification logic out of an individual room controller and into the...Kegan Dougal2014-09-162-17/+19
* Added a section on bing words if you enable desktop notifications.Kegan Dougal2014-09-163-2/+19
* Time out calls from both ends properly.David Baker2014-09-162-8/+20
* Fixed scroll flickering when opening the roomEmmanuel ROHEE2014-09-161-0/+4
* If an initialSync has been already done on a room, we do not need to paginate...Emmanuel ROHEE2014-09-161-2/+15
* WEB-29: Improve room page content loadingEmmanuel ROHEE2014-09-163-8/+26
* Use event age to recognise which calls are current and which aren't and hence...David Baker2014-09-164-16/+79
* Merge remote-tracking branch 'origin/develop' into webclient_data_centralisationEmmanuel ROHEE2014-09-161-23/+140
|\
| * Be consistent when associating keys with login types for registration/login.Kegan Dougal2014-09-151-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into registration-api...Kegan Dougal2014-09-151-1/+1
| |\
| * | Make captcha work again with the new registration logic.Kegan Dougal2014-09-151-1/+21
| * | Updated webclient to support the new registration logic.Kegan Dougal2014-09-151-23/+120
* | | Filter room where the user has been bannedEmmanuel ROHEE2014-09-152-5/+29
* | | Recents must not show temporary fake messagesEmmanuel ROHEE2014-09-154-10/+32
* | | Recents uses data directly from $rootscope.eventsEmmanuel ROHEE2014-09-154-171/+95
| |/ |/|
* | BF: inviter field has moved to the room root objectEmmanuel ROHEE2014-09-151-1/+1
|/
* BF: presence and eventMap were not reset at logout.Emmanuel ROHEE2014-09-151-10/+14
* Use "white-space: pre-wrap" for "Text will wrap when necessary, and on line b...Emmanuel ROHEE2014-09-151-3/+2
* Merge remote-tracking branch 'origin/master' into developEmmanuel ROHEE2014-09-152-3/+4
|\
| * unbreak wordwrapping by breaking multiline paste for nowMatthew Hodgson2014-09-131-1/+2
| * always scroll to bottom when entering a roomMatthew Hodgson2014-09-131-2/+2
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-121-0/+1
|\|
| * Merge branch 'release-v0.2.3' of github.com:matrix-org/synapseErik Johnston2014-09-1234-3671/+7371
| |\
| * | fix embarassing bug where in-progress messages get vaped when the previous on...Matthew Hodgson2014-09-061-1/+3
| * | fix desktop notifs, which were broken in eab463fdMatthew Hodgson2014-09-062-3/+3
| * | Center recaptcha dialog.Kegan Dougal2014-09-061-0/+4
| * | disable broken event dup suppression, and fix echo for /meMatthew Hodgson2014-09-062-16/+25
| * | Set the room_alias field when we encounter a new one, rather than only from l...Kegan Dougal2014-09-061-2/+1
| * | Use the room_display_name when presenting on the home page, and not the room_...Kegan Dougal2014-09-061-1/+1
| * | https when loading recaptcha jsKegan Dougal2014-09-061-1/+1
* | | Send multiple candidates at once instead of all individually. Changes spec to...David Baker2014-09-122-9/+58
| |/ |/|
* | Clean data when user logs outEmmanuel ROHEE2014-09-124-11/+36
* | Retry sending events that fail to send.David Baker2014-09-121-11/+28
* | Fixed displayname resolution of emote senderEmmanuel ROHEE2014-09-121-1/+1
* | Fixed public room name and users count alignementEmmanuel ROHEE2014-09-122-25/+46
* | Always pick the incoming call if we've not yet sent out our invite, otherwise...David Baker2014-09-122-5/+14
* | Remove the local AV stream from ourselves when handing it off to a new call o...David Baker2014-09-121-0/+6
* | CSS m.room.topic and m.room.name events in the historyEmmanuel ROHEE2014-09-121-1/+1
* | Handle NAME_EVENT to get room name update eventEmmanuel ROHEE2014-09-121-0/+5
* | Added edition of room nameEmmanuel ROHEE2014-09-124-12/+61
* | Show room name updates in room history and recents.Emmanuel ROHEE2014-09-124-38/+50
* | BF: temp workaround while /initialSync on a particular room is not availableEmmanuel ROHEE2014-09-121-0/+5
* | few fixes for errors in glare conditions. still seem to end up with no audio ...David Baker2014-09-112-5/+4
* | Put back the line that adds the stream to the invite, otherwise caller->calle...David Baker2014-09-111-0/+1
* | Fix bug where web client wold break trying to add the earliest token without ...David Baker2014-09-111-12/+1
* | Clearly show when an user cannot join a room.Emmanuel ROHEE2014-09-112-10/+39
* | start towards glare support (currently not much better but no worse than befo...David Baker2014-09-113-60/+116
* | Added support of copy/paste of multi lines contentEmmanuel ROHEE2014-09-112-1/+7
* | Use autofill-event.js to workaround browsers issue: Form model doesn't update...Emmanuel ROHEE2014-09-112-0/+118
* | Invite: reset the input when the invitation has been doneEmmanuel ROHEE2014-09-112-5/+6
* | Enable enter key in the invite inputEmmanuel ROHEE2014-09-111-1/+1
* | On member avatar mouseover, show user_id and power levelEmmanuel ROHEE2014-09-111-1/+1
* | Room topic: if the request fails, show the error in the feedbackEmmanuel ROHEE2014-09-111-1/+8
* | BF: made input autofocus work when opening the room topic inputEmmanuel ROHEE2014-09-112-2/+6
* | Show room topic change in the chat history and in the recentsEmmanuel ROHEE2014-09-114-4/+35
* | getRoomEventIndex: improved speed for what it is usedEmmanuel ROHEE2014-09-111-3/+4
* | Merge remote-tracking branch 'origin/develop' into webclient_initialSyncEmmanuel ROHEE2014-09-1013-3434/+6381
|\ \
| * | Animation on call end icon.David Baker2014-09-104-16/+14
| * | Upgrade angularjs to 1.3.0-rc1 since this is new developmentDavid Baker2014-09-108-3414/+6346
| * | Add text for incoming callsDavid Baker2014-09-101-0/+1
| * | Show mxid in call bar for users with no displaynameDavid Baker2014-09-101-1/+6
| * | Less buggy rejection of calls when busyDavid Baker2014-09-102-13/+20
| * | reject calls if there's already a call in progressDavid Baker2014-09-101-0/+4
* | | Show echoed emote with transparencyEmmanuel ROHEE2014-09-101-1/+4
* | | Reenabled transparent echo message. It turns to opaque without flickering now.Emmanuel ROHEE2014-09-102-19/+40
* | | Clean previous request feedback when doing a new requestEmmanuel ROHEE2014-09-101-0/+3
* | | BF: Made /op work when providing no power value. 50 is used as default in thi...Emmanuel ROHEE2014-09-101-1/+1
* | | Made users count auto updating. Do show it if the info is not available (ex:u...Emmanuel ROHEE2014-09-102-12/+30
* | | Member event: store use the the latest oneEmmanuel ROHEE2014-09-101-2/+7
* | | Removed wrong comments about recents-controller.js: it uses $rootScope.rooms ...Emmanuel ROHEE2014-09-102-25/+2
* | | dedup events: state events conflict with messages events. Do not consider the...Emmanuel ROHEE2014-09-101-7/+9
* | | Reenabled handle of room states events in initialSync but do not add them to ...Emmanuel ROHEE2014-09-102-13/+13
* | | Presence events do not have event id. Do not discard themEmmanuel ROHEE2014-09-101-2/+2
* | | Improved requests: pagination is done from the data received in initialSyncEmmanuel ROHEE2014-09-103-15/+38
|/ /
* | Hangup call if user denies media access.David Baker2014-09-092-8/+2
* | Don't try setting up the call if the user has canceled it before allowing per...David Baker2014-09-091-0/+4
* | Don't break if you press the hangup button before allowing media permission.David Baker2014-09-092-2/+3
* | Don't play an engaged tone if we hang up locally.David Baker2014-09-093-5/+18
* | Improved room page loading flow: do pagination only when the members list is ...Emmanuel ROHEE2014-09-091-3/+5
* | When the user has been kicked or banned from a room, remove the room from his...Emmanuel ROHEE2014-09-091-1/+8
* | Made recents list display something when joining a room which we do not have ...Emmanuel ROHEE2014-09-091-0/+8
* | BF: prevent joined messages to be displayed twice when joining a room.Emmanuel ROHEE2014-09-091-4/+16
* | make calls work in FirefoxDavid Baker2014-09-091-8/+21
* | Removed historical code: recents does not need to manage presences. It is alr...Emmanuel ROHEE2014-09-091-6/+0
* | BF: Made the grey background of the current room cover all the cell widthEmmanuel ROHEE2014-09-091-1/+1
* | Show call invites in the message tableDavid Baker2014-09-092-0/+7
* | CSS tweakageKegan Dougal2014-09-081-0/+3
* | Display a 'Set Topic' button if there is no topic or it's a 0-len string.Kegan Dougal2014-09-083-11/+30
* | Add ability to set topic by double-clicking on the topic text then hitting en...Kegan Dougal2014-09-085-1/+59
* | Fixed bug which displayed an older room topic because it was being returned f...Kegan Dougal2014-09-081-1/+13
* | long topic is long. CSS support itKegan Dougal2014-09-081-0/+4
* | Display public room topics if they exist on the public room list.Kegan Dougal2014-09-082-0/+10
* | Display the room topic in the room, underneath the name of the room.Kegan Dougal2014-09-083-8/+33
* | Bodge to default to '1 users' when you create a room, which is better than bl...Kegan Dougal2014-09-082-1/+6
* | Added big massive TODOs on a huge design problem with initial syncKegan Dougal2014-09-082-1/+20
* | Float right the num users, apply room highlight to user count.Kegan Dougal2014-09-082-1/+7
* | Better checks are better.Kegan Dougal2014-09-081-1/+1
* | Added num_joined_users key to /publicRooms for each room. Show this informati...Kegan Dougal2014-09-083-2/+9
* | Added number of users in recent rooms.Kegan Dougal2014-09-082-0/+16
* | Make #matrix public rooms bold to make them stand out from the other public r...Kegan Dougal2014-09-082-1/+8
* | Sort the public room list by display name.Kegan Dougal2014-09-081-1/+1
* | Added /join descriptionEmmanuel ROHEE2014-09-081-0/+1
* | matrixService.rooms must be renamed matrixService.initialSync nowEmmanuel ROHEE2014-09-082-3/+4
* | App startup improvements:Emmanuel ROHEE2014-09-083-39/+39
* | add sounds to the calling interfaceDavid Baker2014-09-0811-14/+75
* | fix embarassing bug where in-progress messages get vaped when the previous on...Matthew Hodgson2014-09-081-1/+3
* | fix desktop notifs, which were broken in eab463fdMatthew Hodgson2014-09-082-3/+3
* | Center recaptcha dialog.Kegan Dougal2014-09-081-0/+4
* | disable broken event dup suppression, and fix echo for /meMatthew Hodgson2014-09-082-16/+25
* | Set the room_alias field when we encounter a new one, rather than only from l...Kegan Dougal2014-09-081-2/+1
* | Use the room_display_name when presenting on the home page, and not the room_...Kegan Dougal2014-09-081-1/+1
* | https when loading recaptcha jsKegan Dougal2014-09-081-1/+1
* | Revert "BF: Made notification work again (forgot to renamed "offline" to "una...Emmanuel ROHEE2014-09-081-1/+1
* | BF: Made notification work again (forgot to renamed "offline" to "unavailable")Emmanuel ROHEE2014-09-081-1/+1
|/
* dedup all eventsMatthew Hodgson2014-09-061-31/+42
* handle m.room.aliases for id<->alias mapping; remove local_storage map; stop ...Matthew Hodgson2014-09-064-10/+85
* Added captcha support on both the HS and web client.Kegan Dougal2014-09-056-11/+125
|\
| * Added instructions for setting up captcha in an obviously named file.Kegan Dougal2014-09-053-11/+54
| * Reload captchas when they fail. Cleanup on success.Kegan Dougal2014-09-051-0/+9
| * Added a captcha config to the HS, to enable registration captcha checking and...Kegan Dougal2014-09-051-1/+0
| * Added webclient config.js for storing recaptcha public key.Kegan Dougal2014-09-053-5/+29
| * Modified matrixService.register to specify if captcha results should be sent ...Kegan Dougal2014-09-052-6/+28
| * Added basic captcha, not hooked upKegan Dougal2014-09-053-3/+20
* | Better call bar (visually: still lacks ring[back] tones).David Baker2014-09-067-18/+112
|/
* BF: tab completion did not work with commands. $scope.input contained only th...Emmanuel ROHEE2014-09-051-1/+10
* BF: Update the members list on banned & kicked "events"Emmanuel ROHEE2014-09-051-4/+13
* autoscroll down(if the scroller was already at the bottom) when receiving mem...Emmanuel ROHEE2014-09-051-13/+18
* doc: kick can take a reason argEmmanuel ROHEE2014-09-051-1/+1
* Created kick & unban methods in matrixService. Made some factorisation.Emmanuel ROHEE2014-09-052-23/+24
* Added sanity checks in commandsEmmanuel ROHEE2014-09-051-34/+55
* BF: Make /unban work againEmmanuel ROHEE2014-09-052-2/+2
* Display ban & kick reasonEmmanuel ROHEE2014-09-052-1/+14
* Fixed empty display name (content.displayname in a room member can be null)Emmanuel ROHEE2014-09-051-1/+3
* Revert "Fixed empty display name (content.displayname in a room member can be...Emmanuel ROHEE2014-09-051-6/+0
* Fixed empty display name (content.displayname in a room member can be null)Emmanuel ROHEE2014-09-051-0/+6
* BF: Fixed members list layout when the scrollbar appearsEmmanuel ROHEE2014-09-051-1/+3
* BF: Show "Bob invited you" in recents when Bob invites the userEmmanuel ROHEE2014-09-051-1/+5
* hide the forgot password link until it worksDavid Baker2014-09-051-2/+2
* Fixed duplicated messages sending in slow network condition.Emmanuel ROHEE2014-09-053-5/+55
* Cleaned all sending references as it not usedEmmanuel ROHEE2014-09-051-22/+4
* Do not systematically scroll to the bottom on new events in the roomEmmanuel ROHEE2014-09-051-2/+8
* switch IRC-style command parser to use regexps rather than split(" ") so that...Matthew Hodgson2014-09-042-55/+96
* BF: presence PUT requests stopped to work with old "state" param yesterday ev...Emmanuel ROHEE2014-09-041-1/+1
* Fixed registration flow when registering with matrixID & password and no emailEmmanuel ROHEE2014-09-041-1/+1
* Added mUserDisplayName, a filter to resolve a user display name from a user_idEmmanuel ROHEE2014-09-042-9/+42
* Moved mRoomName filter into matrix-filter.js, a place for all generic filters...Emmanuel ROHEE2014-09-047-86/+106
* Re-apply fixes to the link-email screen to make it work again (in a somewhat ...David Baker2014-09-042-27/+54
* BF: Do not filter incoming member events. Before, only invitations to the cur...Emmanuel ROHEE2014-09-041-7/+2
* Report ban/unban messages to recents listsEmmanuel ROHEE2014-09-041-8/+19
* Hide email link UI from the settings because it doesn't work.David Baker2014-09-031-2/+2
* Added more ng-if to make nice sentences like "Bob kicked Alice" or "Bob unba...Emmanuel ROHEE2014-09-031-4/+13
* better error msgsMatthew Hodgson2014-09-031-3/+3
* Ignore leave members in the list tooEmmanuel ROHEE2014-09-031-2/+2
* Fixed used of state_key instead of user_id in member events.Emmanuel ROHEE2014-09-031-4/+7
* Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2014-09-0325-53/+245
|\
| * Fix ban pathErik Johnston2014-09-031-1/+1
| * Fix a few cases where we used user_id instead of state_keyErik Johnston2014-09-032-6/+6
| * Normalise users power levels so that the user with the higher power level wil...Emmanuel ROHEE2014-09-032-1/+24
| * Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of ...Emmanuel ROHEE2014-09-032-3/+15
| * fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org has...Matthew Hodgson2014-09-0322-22/+22
| * List commands and their usage in the settings pageEmmanuel ROHEE2014-09-031-0/+15
| * Added /kick $user_idEmmanuel ROHEE2014-09-031-4/+14
| * Added /unban $user_idEmmanuel ROHEE2014-09-031-0/+10
| * Add support for room namesErik Johnston2014-09-032-2/+20
| * Send unrecognized commands as text message (as before)Emmanuel ROHEE2014-09-031-1/+2
| * Do not define power level limits in setUserPowerLevel. Update the function to...Emmanuel ROHEE2014-09-032-35/+3
| * Added /deop $user_idEmmanuel ROHEE2014-09-032-3/+36
| * BF: Do not be polluted by ops events that come when paginating backEmmanuel ROHEE2014-09-031-2/+5
| * Added /op $user_id $powerLevelEmmanuel ROHEE2014-09-033-7/+59
| * Better indicate in the page feedback section that a user can't join a room (b...Emmanuel ROHEE2014-09-031-1/+2
| * Do not show banned people in member list. Format ban events strings in room a...Emmanuel ROHEE2014-09-033-4/+10
| * Added /ban commandEmmanuel ROHEE2014-09-032-1/+29
| * Made IRC style command easier to handle specifically for possible argumentsEmmanuel ROHEE2014-09-031-10/+22
* | Make registering and logging in with a threepid work in the webclient.David Baker2014-09-035-27/+113
|/
* Merge branch 'master' into developErik Johnston2014-09-031-2/+2
|\
| * Hide the email textbox during registeration has it has not been wired up yet.Erik Johnston2014-09-021-2/+2
* | roomName directive: Take into account invited users.Emmanuel ROHEE2014-09-021-1/+38
* | make power level more visibleMatthew Hodgson2014-09-021-3/+3
* | Attempt to make avatar change clearerEmmanuel ROHEE2014-09-022-4/+15
* | BF: Reset base timer time ($scope.now) everytime last_active_ago is touchedEmmanuel ROHEE2014-09-021-7/+6
|/
* BF: Prevent controllers from being instantiated twice.Emmanuel ROHEE2014-09-021-14/+7
* Handle "m.room.create" in order to inform controllers about new roomsEmmanuel ROHEE2014-09-023-5/+29
* Represent user power level in a room by a red bar at the bottom of his avatar...Emmanuel ROHEE2014-09-025-0/+60
* BF: Armed updateMemberListPresenceAge only onceEmmanuel ROHEE2014-09-021-1/+3
* BF: Take into account MEMBER_EVENT and PRESENCE_EVENT events only after the i...Emmanuel ROHEE2014-09-021-2/+6
* Follow API renaming. state -> presence. mtime_ago -> last_active_agoEmmanuel ROHEE2014-09-013-16/+15
* Added roomName, a directive to compute a room name based on its alias (not al...Emmanuel ROHEE2014-09-014-5/+45
* Oops, show the voice call button once a call has endedDavid Baker2014-09-011-1/+1
* Fairly simple move of the call status widget to the header bar (and therefore...David Baker2014-09-015-40/+44
* BF: Check config exists (=defined in the localstorage) before using itEmmanuel ROHEE2014-09-011-2/+6
* missing semicolonDavid Baker2014-09-011-1/+1
* Handle call events in the recents view as well to get consistency with what i...David Baker2014-09-011-0/+5
* Just show 'Call' for call events. Don't just splat out the content of the eve...David Baker2014-09-011-1/+3
* Fixed presence change that occurs -Xs agoEmmanuel ROHEE2014-09-011-0/+5
* Fixed presence state update. Specifically, the current user was sometimes ind...Emmanuel ROHEE2014-09-011-5/+23
* Don't show the hang up button once tha call has endedDavid Baker2014-09-011-1/+1
* make the little logos clickable for ErikMatthew Hodgson2014-09-016-7/+7
* BF: Pass desired_user_id to register API. And update the app header to avoid ...Emmanuel ROHEE2014-09-012-2/+10
* licenses, please...Matthew Hodgson2014-09-012-2/+32
* fix footer on non-room pagesMatthew Hodgson2014-09-011-1/+0
* don't make HS ports explicit if it's the default for the protocolMatthew Hodgson2014-08-312-2/+8
* change the world: make the default matrix API URL prefix /_matrix rather than...Matthew Hodgson2014-08-312-7/+7
* make lightbox a bit less uglyMatthew Hodgson2014-08-311-2/+6
* only show presence timings if we know themMatthew Hodgson2014-08-311-1/+1
* nasty big monolithic commit of a whole bunch of UI/UX improvements:Matthew Hodgson2014-08-3115-310/+356
* factor out mobile css into its own fileMatthew Hodgson2014-08-311-0/+92
* factor out the signup process into its own controllerMatthew Hodgson2014-08-312-0/+127
* moar logos!Matthew Hodgson2014-08-312-0/+0
* switch default profile image to one of our own devising (dating back to commu...Matthew Hodgson2014-08-312-0/+0
* tweaks to settings pageMatthew Hodgson2014-08-302-28/+16
* actually add a 'home' buttonMatthew Hodgson2014-08-301-0/+1
* shrink text bubble font a bit; make image thumbnails always fit in their bubblesMatthew Hodgson2014-08-301-1/+6
* Give basic feedback on the state of VoIP calls in the UI.David Baker2014-08-293-3/+6
* todoMatthew Hodgson2014-08-291-1/+1
* fix mobile skin by hiding recents LHS in /roomsMatthew Hodgson2014-08-291-0/+2
* oops. Should not have c+p all linesEmmanuel ROHEE2014-08-291-2/+0
* Implemented /nickEmmanuel ROHEE2014-08-291-0/+4
* Get user display name and avatar from the server rather than storing them in ...Emmanuel ROHEE2014-08-294-21/+68
* update presence times in realtime through the magic of two-way bindingMatthew Hodgson2014-08-292-35/+15
* Show desktop notification state. Provide help if the user has previously deni...Emmanuel ROHEE2014-08-293-14/+39
* better support for call hangupsDavid Baker2014-08-291-16/+16
* The away state is unavailable not offlineEmmanuel ROHEE2014-08-291-7/+7
* Only show voice call button if there are exactly 2 members in the room. Also ...David Baker2014-08-292-3/+7
* Oops, forgot a s/sendObject/sendEvent/ - make messages work again!David Baker2014-08-291-1/+1
* Don't break if the call ends before it connectsDavid Baker2014-08-291-12/+20
* Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2014-08-291-10/+9
|\
| * Show notifications only when the user is detected as idleEmmanuel ROHEE2014-08-291-10/+9
* | Change call signalling messages to be their own types of room events rather t...David Baker2014-08-295-18/+27
|/
* Merge branch 'voip' into developDavid Baker2014-08-297-3/+379
|\
| * More basic functionality for voip calls (like hanging up)David Baker2014-08-293-5/+69
| * First basic working VoIP call supportDavid Baker2014-08-284-16/+161
| * WIP voip support on web clientDavid Baker2014-08-277-3/+170
* | Cleaned up ng deps. By convention, angular modules must be listed at firstEmmanuel ROHEE2014-08-291-3/+3