Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SYWEB-136: Send m.images according to the spec. | Kegan Dougal | 2014-11-04 | 2 | -4/+6 |
| | |||||
* | Factor out notification logic. | Kegan Dougal | 2014-10-31 | 2 | -18/+29 |
| | |||||
* | Add notification-service.js to handle binging/notifications. Shift logic to ↵ | Kegan Dougal | 2014-10-31 | 2 | -68/+94 |
| | | | | this service. | ||||
* | SYWEB-63: Fix desktop notification message when notifying for an image. | Kegan Dougal | 2014-10-31 | 1 | -0/+3 |
| | |||||
* | SYWEB-12: Store unknown state events so they are displayed in the Room Info ↵ | Kegan Dougal | 2014-10-30 | 1 | -0/+7 |
| | | | | dialog. | ||||
* | SYWEB-112: Use the right user ID when determining invites for display on the ↵ | Kegan Dougal | 2014-10-30 | 1 | -2/+9 |
| | | | | recents list. | ||||
* | SYWEB-48: Better regex for binging on usernames. | Kegan Dougal | 2014-10-29 | 1 | -1/+28 |
| | | | | | | This uses /\blocalpart\b|\bdisplayname\b/i which is overall a lot better than before. This specifically gets @localpart references which the bug was originally for. | ||||
* | SYWEB-98: Handle incoming m.room.redaction events. | Kegan Dougal | 2014-10-29 | 1 | -0/+39 |
| | | | | UI for redactions is now complete. | ||||
* | SYWEB-98: Add redactEvent matrix API call. | Kegan Dougal | 2014-10-29 | 1 | -0/+8 |
| | |||||
* | Implement SYWEB-58: Clicking a notification now takes you to that room. | Kegan Dougal | 2014-10-29 | 1 | -0/+6 |
| | |||||
* | Fix SYWEB-110 : Prevent room ID leaking by looking for an m.room.name | Kegan Dougal | 2014-10-27 | 1 | -1/+11 |
| | |||||
* | HandleRoomMember: handle correctly prev_content | giomfo | 2014-10-27 | 1 | -1/+1 |
| | |||||
* | switch from the deprecated msg.content.prev to msg.prev_content.membership, ↵ | Matthew Hodgson | 2014-10-24 | 1 | -1/+1 |
| | | | | and fix the bug where kicks of unjoined users aren't displayed sensibly in the history | ||||
* | more timestamp fixes | Matthew Hodgson | 2014-10-17 | 1 | -2/+2 |
| | |||||
* | Remove org.matrix.custom.text.html event type and replace it with 'format' ↵ | Kegan Dougal | 2014-10-15 | 1 | -1/+0 |
| | | | | and 'formatted_body' keys on m.text messages | ||||
* | Add support for org.matrix.custom.text.html | Kegan Dougal | 2014-10-15 | 1 | -0/+1 |
| | | | | | This format will remain undocumented as it is not yet suitable for introduction into the specification. | ||||
* | Merge branch 'turn' into develop | David Baker | 2014-09-25 | 2 | -3/+59 |
|\ | |||||
| * | Add stun server fallback and I-told-you-so message if we get no TURN server ↵ | David Baker | 2014-09-25 | 1 | -17/+33 |
| | | | | | | | | and the connection fails. | ||||
| * | Refresh turn server before the ttl runs out. Support firefox. | David Baker | 2014-09-24 | 1 | -14/+23 |
| | | |||||
| * | The REST API spec only alows for returning a single server so name the | David Baker | 2014-09-24 | 1 | -1/+1 |
| | | | | | | | | endpoint appropriately. | ||||
| * | Hopefully implement turn in the web client (probably wrong for Firefox ↵ | David Baker | 2014-09-24 | 2 | -3/+34 |
| | | | | | | | | because Firefox is a special snowflake) | ||||
* | | getUserDisplayName: Disambiguate users who have the same displayname in the ↵ | Emmanuel ROHEE | 2014-09-25 | 1 | -0/+15 |
| | | | | | | | | | | | | room. Displayname are then disambiguate where it is necessary | ||||
* | | Fixed getUserDisplayname when the user has a null displayname | Emmanuel ROHEE | 2014-09-24 | 1 | -1/+1 |
| | | |||||
* | | Fixed SYWEB-74: Emote desktop notifications sometimes lack a name: ↵ | Emmanuel ROHEE | 2014-09-24 | 1 | -32/+49 |
| | | | | | | | | "undefined waves" | ||||
* | | SYWEB-27: Public rooms with 2 users must not considered as 1:1 chat room and ↵ | Emmanuel ROHEE | 2014-09-24 | 1 | -2/+9 |
| | | | | | | | | so, they must no be renamed | ||||
* | | Added hasOwnProperty tests when required to be robust to random properties ↵ | Emmanuel ROHEE | 2014-09-24 | 2 | -1/+6 |
| | | | | | | | | added to he Object prototype | ||||
* | | State data now provides up-to-date users displaynames. So use it first. | Emmanuel ROHEE | 2014-09-24 | 2 | -50/+36 |
| | | | | | | | | | | Continue to use presence data as fallback solution which is required when users do not join the room yet. Created eventHandlerService.getUserDisplayName() as a single point to compute display name. | ||||
* | | fix yet more room id leak disasters | Matthew Hodgson | 2014-09-23 | 1 | -5/+12 |
| | | |||||
* | | manu: what's going on here? | Matthew Hodgson | 2014-09-23 | 1 | -3/+4 |
| | | |||||
* | | use all new /rooms/<room id>/state to actually gather the state for rooms ↵ | Matthew Hodgson | 2014-09-23 | 1 | -1/+7 |
| | | | | | | | | whenever join them. a bit ugly, as we don't currently have a nice place to gather housekeeping after joining a room, so horrible code duplication... | ||||
* | | patch over another scenario whe we leak room IDs. i have *zero* idea why or ↵ | Matthew Hodgson | 2014-09-23 | 1 | -1/+1 |
| | | | | | | | | where the webclient is overriding message.membership to be "join" though, when it comes down the events pipe as "invite" (which was causing this failure mode) | ||||
* | | fix a case of rampaging SYWEB-78 | Matthew Hodgson | 2014-09-23 | 1 | -0/+5 |
| | | |||||
* | | remove old commented-out code | Matthew Hodgson | 2014-09-23 | 1 | -2/+1 |
| | | |||||
* | | fix one cause of SYWEB-53 | Matthew Hodgson | 2014-09-23 | 1 | -7/+4 |
|/ | |||||
* | fix NPE | Matthew Hodgson | 2014-09-23 | 1 | -2/+1 |
| | |||||
* | Show display name changes in the message list. | Kegan Dougal | 2014-09-22 | 1 | -5/+23 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-22 | 1 | -1/+1 |
|\ | |||||
| * | Fix undefined variable error | David Baker | 2014-09-19 | 1 | -1/+1 |
| | | |||||
* | | Propagate failure reason to the other party. | David Baker | 2014-09-22 | 2 | -7/+8 |
| | | |||||
* | | Better logging of ICE candidates and fail the call when ICE fails. | David Baker | 2014-09-22 | 1 | -2/+5 |
| | | |||||
* | | go back to the original behaviour of only notifying if we think the app is ↵ | Matthew Hodgson | 2014-09-20 | 1 | -8/+14 |
| | | | | | | | | backgrounded or idle... | ||||
* | | remove insanely busy logging which is killing CPU | Matthew Hodgson | 2014-09-20 | 1 | -2/+6 |
| | | |||||
* | | Notify a callee that their browser doesn't support VoIP too. | David Baker | 2014-09-19 | 2 | -1/+13 |
| | | | | | | | | SYWEB-14 #resolved | ||||
* | | Join rooms if we're not already in them when accepting a call coming from ↵ | David Baker | 2014-09-19 | 1 | -0/+15 |
| | | | | | | | | | | | | that room. SYWEB-55 #resolve | ||||
* | | Merge branch 'videocalls' into develop | David Baker | 2014-09-19 | 1 | -12/+94 |
|\ \ | | | | | | | | | | | | | Conflicts: webclient/room/room.html | ||||
| * | | Prettier and stabler video with basic support for viewing mode. For now, ↵ | David Baker | 2014-09-18 | 1 | -3/+19 |
| | | | | | | | | | | | | transition into 'large' mode is disabled. | ||||
| * | | WIP video chat layout | David Baker | 2014-09-18 | 1 | -0/+2 |
| | | | |||||
| * | | Video calling (in a tiny box at the moment) | David Baker | 2014-09-17 | 1 | -11/+75 |
| | | | |||||
* | | | SYWEB-13 SYWEB-14: disabled "Call" button if the browser does not support ↵ | Emmanuel ROHEE | 2014-09-19 | 1 | -0/+5 |
| | | | | | | | | | | | | all required WebRTC features | ||||
* | | | SYWEB-13: disabled "Send image" button if the browser does not support HTML5 ↵ | Emmanuel ROHEE | 2014-09-19 | 1 | -6/+16 |
| | | | | | | | | | | | | file API | ||||
* | | | A kind of the typo in the fix of SYWEB-44 | Emmanuel ROHEE | 2014-09-19 | 1 | -2/+2 |
| | | | |||||
* | | | Room id leaks: log them when then happens. Plus log the conditions that made ↵ | Emmanuel ROHEE | 2014-09-19 | 1 | -0/+4 |
| | | | | | | | | | | | | them happen | ||||
* | | | Fixed SYWEB-16: When sending an invite over federation, the remote user sees ↵ | Emmanuel ROHEE | 2014-09-19 | 1 | -22/+38 |
| |/ |/| | | | | | the name of the resulting invite room as *their* name rather than the inviters | ||||
* | | Oops. Removed dev logs | Emmanuel ROHEE | 2014-09-18 | 1 | -1/+0 |
| | | |||||
* | | SYWEB-14: BF: rooms invitations were not visible in recents after ↵ | Emmanuel ROHEE | 2014-09-18 | 2 | -3/+18 |
| | | | | | | | | launching/refreshing the web page | ||||
* | | undefined is empty. Fixed bug where empty bingWords with old accounts which ↵ | Kegan Dougal | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | hadn't logged in didn't send notifications. | ||||
* | | SYWEB-40: Only local rooms are shown in the recents list. | Emmanuel ROHEE | 2014-09-18 | 1 | -7/+0 |
| | | | | | | | | Removed an old patch that deduplicated join events. This patch is now useless. Plus it is buggy since it compared event.content and event.prev_content only on the membership field whereas these objects contain more data now like displayname... | ||||
* | | Reverted patches done for SYWEB-40 | Emmanuel ROHEE | 2014-09-18 | 1 | -8/+2 |
| | | |||||
* | | Patch for SYWEB-40 : isStateEvent is not being set correctly, and really ↵ | Kegan Dougal | 2014-09-18 | 1 | -2/+8 |
| | | | | | | | | shouldn't be a configurable arg in the first place. As a result of being undefined, the events.rooms[rid].members object was not being updated in some cases, which combined with the recents-filter bug (32808e4), caused federated rooms to not appear in the recents list. | ||||
* | | unbreak calls in firefox | David Baker | 2014-09-18 | 1 | -1/+1 |
| | | |||||
* | | Create room entries for public rooms too so their public state is ↵ | Kegan Dougal | 2014-09-17 | 1 | -0/+1 |
| | | | | | | | | transferred over correctly when you join it. | ||||
* | | webclient SYWEB-3 : Public rooms are bold. Can't think of a nicer way which ↵ | Kegan Dougal | 2014-09-17 | 2 | -0/+13 |
| | | | | | | | | doesn't clutter the recents list. | ||||
* | | SYWEB-22: Format emote('/me') messages correctly in desktop notification | Emmanuel ROHEE | 2014-09-17 | 1 | -1/+7 |
| | | |||||
* | | SYWEB-15: Always show the room alias as well as its name in the UI | Emmanuel ROHEE | 2014-09-17 | 1 | -54/+56 |
| | | |||||
* | | Bugfix when content isn't a string. | Kegan Dougal | 2014-09-16 | 1 | -1/+1 |
| | | |||||
* | | Don't bing for sent messages. Handle cases where the member is unknown ↵ | Kegan Dougal | 2014-09-16 | 1 | -3/+8 |
| | | | | | | | | rather than erroring out. | ||||
* | | Added basic RegExp support. | Kegan Dougal | 2014-09-16 | 1 | -4/+2 |
| | | |||||
* | | Bing on all the things if there are 0 bing words. | Kegan Dougal | 2014-09-16 | 1 | -0/+6 |
| | | |||||
* | | hidden/minimise/focus disaster disclaimer with the TODO | Kegan Dougal | 2014-09-16 | 1 | -0/+4 |
| | | |||||
* | | Added utility function containsBingWord and hook up some css to it. | Kegan Dougal | 2014-09-16 | 1 | -30/+41 |
| | | |||||
* | | Added bing detection logic. Persist the display name of the user in ↵ | Kegan Dougal | 2014-09-16 | 1 | -2/+35 |
| | | | | | | | | localstorage for use when binging. | ||||
* | | Move the notification logic out of an individual room controller and into ↵ | Kegan Dougal | 2014-09-16 | 1 | -1/+19 |
|/ | | | | the general event handler, so we can notify for >1 room. | ||||
* | Time out calls from both ends properly. | David Baker | 2014-09-16 | 2 | -8/+20 |
| | |||||
* | WEB-29: Improve room page content loading | Emmanuel ROHEE | 2014-09-16 | 2 | -7/+25 |
| | | | | InitialSync: load the 30 last messages of each room so that a full page of messages can be displayed without additionnal request | ||||
* | Use event age to recognise which calls are current and which aren't and ↵ | David Baker | 2014-09-16 | 2 | -15/+73 |
| | | | | hence support answering calls that were placed before we loaded the page. | ||||
* | Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation | Emmanuel ROHEE | 2014-09-16 | 1 | -23/+140 |
|\ | |||||
| * | Be consistent when associating keys with login types for registration/login. | Kegan Dougal | 2014-09-15 | 1 | -1/+1 |
| | | |||||
| * | Make captcha work again with the new registration logic. | Kegan Dougal | 2014-09-15 | 1 | -1/+21 |
| | | |||||
| * | Updated webclient to support the new registration logic. | Kegan Dougal | 2014-09-15 | 1 | -23/+120 |
| | | |||||
* | | Filter room where the user has been banned | Emmanuel ROHEE | 2014-09-15 | 1 | -0/+16 |
| | | |||||
* | | Recents must not show temporary fake messages | Emmanuel ROHEE | 2014-09-15 | 1 | -0/+24 |
| | | |||||
* | | Recents uses data directly from $rootscope.events | Emmanuel ROHEE | 2014-09-15 | 1 | -8/+35 |
|/ | |||||
* | BF: presence and eventMap were not reset at logout. | Emmanuel ROHEE | 2014-09-15 | 1 | -10/+14 |
| | |||||
* | Send multiple candidates at once instead of all individually. Changes spec ↵ | David Baker | 2014-09-12 | 2 | -9/+58 |
| | | | | to include multiple candidates in a candidate(s) message. | ||||
* | Clean data when user logs out | Emmanuel ROHEE | 2014-09-12 | 1 | -6/+18 |
| | |||||
* | Retry sending events that fail to send. | David Baker | 2014-09-12 | 1 | -11/+28 |
| | |||||
* | Always pick the incoming call if we've not yet sent out our invite, ↵ | David Baker | 2014-09-12 | 2 | -5/+14 |
| | | | | otherwise the remorte party will see their call get rejected and our call won't come in until our user clicks allow. | ||||
* | Remove the local AV stream from ourselves when handing it off to a new call ↵ | David Baker | 2014-09-12 | 1 | -0/+6 |
| | | | | or we'll close it when we hang up. | ||||
* | Added edition of room name | Emmanuel ROHEE | 2014-09-12 | 1 | -0/+7 |
| | |||||
* | Show room name updates in room history and recents. | Emmanuel ROHEE | 2014-09-12 | 2 | -38/+42 |
| | | | | Update it with the latest value | ||||
* | BF: temp workaround while /initialSync on a particular room is not available | Emmanuel ROHEE | 2014-09-12 | 1 | -0/+5 |
| | | | | initRoom on a new room is not called. Call it for any received events | ||||
* | few fixes for errors in glare conditions. still seem to end up with no audio ↵ | David Baker | 2014-09-11 | 1 | -4/+3 |
| | | | | if both calls are placed at the same time. | ||||
* | Put back the line that adds the stream to the invite, otherwise ↵ | David Baker | 2014-09-11 | 1 | -0/+1 |
| | | | | caller->callee audio won't work... | ||||
* | Fix bug where web client wold break trying to add the earliest token without ↵ | David Baker | 2014-09-11 | 1 | -12/+1 |
| | | | | having initialised the room if your first page of history contained only events which didn't call initRoom. Just call initRoom in handleMessages since we use it there rather than leaving it to the individual event handling methods. | ||||
* | start towards glare support (currently not much better but no worse than ↵ | David Baker | 2014-09-11 | 2 | -57/+106 |
| | | | | before) including fixing a lot of self/var self/this fails that caused chaos when we started to have more than one call in play. | ||||
* | Show room topic change in the chat history and in the recents | Emmanuel ROHEE | 2014-09-11 | 1 | -4/+21 |
| | |||||
* | getRoomEventIndex: improved speed for what it is used | Emmanuel ROHEE | 2014-09-11 | 1 | -3/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/develop' into webclient_initialSync | Emmanuel ROHEE | 2014-09-10 | 1 | -5/+9 |
|\ | |||||
| * | Less buggy rejection of calls when busy | David Baker | 2014-09-10 | 1 | -5/+9 |
| | | |||||
* | | Reenabled transparent echo message. It turns to opaque without flickering now. | Emmanuel ROHEE | 2014-09-10 | 1 | -2/+32 |
| | | |||||
* | | Member event: store use the the latest one | Emmanuel ROHEE | 2014-09-10 | 1 | -2/+7 |
| | | |||||
* | | Removed wrong comments about recents-controller.js: it uses $rootScope.rooms ↵ | Emmanuel ROHEE | 2014-09-10 | 1 | -3/+2 |
| | | | | | | | | not $rootScope.events.rooms managed by event-handler-service.js and used by other controllers | ||||
* | | dedup events: state events conflict with messages events. Do not consider ↵ | Emmanuel ROHEE | 2014-09-10 | 1 | -7/+9 |
| | | | | | | | | them in deduplication | ||||
* | | Reenabled handle of room states events in initialSync but do not add them to ↵ | Emmanuel ROHEE | 2014-09-10 | 2 | -13/+13 |
| | | | | | | | | | | | | the displayed messages in the room page. Show the m.room.member events only when they come from room.messages (from initialSync of pagination) not from room.state. | ||||
* | | Presence events do not have event id. Do not discard them | Emmanuel ROHEE | 2014-09-10 | 1 | -2/+2 |
| | | |||||
* | | Improved requests: pagination is done from the data received in initialSync | Emmanuel ROHEE | 2014-09-10 | 2 | -6/+31 |
|/ | |||||
* | Hangup call if user denies media access. | David Baker | 2014-09-09 | 1 | -0/+2 |
| | |||||
* | Don't try setting up the call if the user has canceled it before allowing ↵ | David Baker | 2014-09-09 | 1 | -0/+4 |
| | | | | permission. | ||||
* | Don't break if you press the hangup button before allowing media permission. | David Baker | 2014-09-09 | 1 | -1/+1 |
| | |||||
* | Don't play an engaged tone if we hang up locally. | David Baker | 2014-09-09 | 1 | -3/+8 |
| | |||||
* | make calls work in Firefox | David Baker | 2014-09-09 | 1 | -8/+21 |
| | |||||
* | Show call invites in the message table | David Baker | 2014-09-09 | 1 | -0/+3 |
| | |||||
* | Add ability to set topic by double-clicking on the topic text then hitting ↵ | Kegan Dougal | 2014-09-08 | 2 | -0/+20 |
| | | | | enter. | ||||
* | Fixed bug which displayed an older room topic because it was being returned ↵ | Kegan Dougal | 2014-09-08 | 1 | -1/+13 |
| | | | | from /initialSync messages key. Check the ts of the event before clobbering state. | ||||
* | Display the room topic in the room, underneath the name of the room. | Kegan Dougal | 2014-09-08 | 1 | -0/+11 |
| | |||||
* | Added big massive TODOs on a huge design problem with initial sync | Kegan Dougal | 2014-09-08 | 1 | -0/+2 |
| | |||||
* | matrixService.rooms must be renamed matrixService.initialSync now | Emmanuel ROHEE | 2014-09-08 | 2 | -3/+4 |
| | |||||
* | App startup improvements: | Emmanuel ROHEE | 2014-09-08 | 2 | -6/+6 |
| | | | | | | | - do one and only one initialSync when the app starts. (recents-controller does not do its own anymore) - initialSync: get only the last message per room instead of default number of messages (10) Prevent recents-controller from loosing its data each time the page URL changes | ||||
* | add sounds to the calling interface | David Baker | 2014-09-08 | 1 | -12/+34 |
| | |||||
* | fix desktop notifs, which were broken in eab463fd | Matthew Hodgson | 2014-09-08 | 1 | -1/+1 |
| | |||||
* | disable broken event dup suppression, and fix echo for /me | Matthew Hodgson | 2014-09-08 | 1 | -2/+9 |
| | |||||
* | Set the room_alias field when we encounter a new one, rather than only from ↵ | Kegan Dougal | 2014-09-08 | 1 | -2/+1 |
| | | | | local storage. | ||||
* | dedup all events | Matthew Hodgson | 2014-09-06 | 1 | -31/+42 |
| | |||||
* | handle m.room.aliases for id<->alias mapping; remove local_storage map; stop ↵ | Matthew Hodgson | 2014-09-06 | 3 | -3/+40 |
| | | | | local echo flickering by removing opacity transition for now; implement /join | ||||
* | Added captcha support on both the HS and web client. | Kegan Dougal | 2014-09-05 | 1 | -4/+21 |
|\ | | | | | | | Merge branch 'captcha' of github.com:matrix-org/synapse into develop | ||||
| * | Added a captcha config to the HS, to enable registration captcha checking ↵ | Kegan Dougal | 2014-09-05 | 1 | -1/+0 |
| | | | | | | | | and for the recaptcha private key. | ||||
| * | Modified matrixService.register to specify if captcha results should be sent ↵ | Kegan Dougal | 2014-09-05 | 1 | -4/+22 |
| | | | | | | | | with the registration request. This is toggleable via useCaptcha in register-controller. | ||||
* | | Better call bar (visually: still lacks ring[back] tones). | David Baker | 2014-09-06 | 2 | -2/+12 |
|/ | |||||
* | Created kick & unban methods in matrixService. Made some factorisation. | Emmanuel ROHEE | 2014-09-05 | 1 | -11/+21 |
| | |||||
* | BF: Make /unban work again | Emmanuel ROHEE | 2014-09-05 | 1 | -1/+1 |
| | |||||
* | Fixed empty display name (content.displayname in a room member can be null) | Emmanuel ROHEE | 2014-09-05 | 1 | -1/+3 |
| | |||||
* | Revert "Fixed empty display name (content.displayname in a room member can ↵ | Emmanuel ROHEE | 2014-09-05 | 1 | -6/+0 |
| | | | | | | be null)" This reverts commit f286a4fcd46ff6c2c42a8732d004d8188aaa65f8. | ||||
* | Fixed empty display name (content.displayname in a room member can be null) | Emmanuel ROHEE | 2014-09-05 | 1 | -0/+6 |
| | |||||
* | switch IRC-style command parser to use regexps rather than split(" ") so ↵ | Matthew Hodgson | 2014-09-04 | 1 | -3/+8 |
| | | | | | | | | that it doesn't choke on consecutive whitespaces yield better errors for invalid commands don't pass invalid commands through as messages support kick reasons | ||||
* | BF: presence PUT requests stopped to work with old "state" param yesterday ↵ | Emmanuel ROHEE | 2014-09-04 | 1 | -1/+1 |
| | | | | evening :( -https://github.com/matrix-org/synapse/commit/cda31fb7553ba3d880de09a464ae3b62ea6632fc?diff=unified | ||||
* | Added mUserDisplayName, a filter to resolve a user display name from a user_id | Emmanuel ROHEE | 2014-09-04 | 1 | -0/+33 |
| | |||||
* | Moved mRoomName filter into matrix-filter.js, a place for all generic ↵ | Emmanuel ROHEE | 2014-09-04 | 1 | -0/+100 |
| | | | | filters using Matrix data. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2014-09-03 | 9 | -17/+86 |
|\ | | | | | | | | | Conflicts: synapse/http/client.py | ||||
| * | Fix ban path | Erik Johnston | 2014-09-03 | 1 | -1/+1 |
| | | |||||
| * | Fix a few cases where we used user_id instead of state_key | Erik Johnston | 2014-09-03 | 1 | -1/+1 |
| | | |||||
| * | Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of ↵ | Emmanuel ROHEE | 2014-09-03 | 1 | -1/+13 |
| | | | | | | | | another user | ||||
| * | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 9 | -9/+9 |
| | | | | | | | | hasn't been incorporated in time for launch. | ||||
| * | Add support for room names | Erik Johnston | 2014-09-03 | 1 | -1/+14 |
| | | |||||
| * | Do not define power level limits in setUserPowerLevel. Update the function ↵ | Emmanuel ROHEE | 2014-09-03 | 1 | -34/+2 |
| | | | | | | | | to be used as a resetUserPowerLevel | ||||
| * | Added /deop $user_id | Emmanuel ROHEE | 2014-09-03 | 1 | -2/+27 |
| | | |||||
| * | BF: Do not be polluted by ops events that come when paginating back | Emmanuel ROHEE | 2014-09-03 | 1 | -2/+5 |
| | | |||||
| * | Added /op $user_id $powerLevel | Emmanuel ROHEE | 2014-09-03 | 2 | -6/+42 |
| | | |||||
| * | Added /ban command | Emmanuel ROHEE | 2014-09-03 | 1 | -1/+13 |
| | | |||||
* | | Make registering and logging in with a threepid work in the webclient. | David Baker | 2014-09-03 | 1 | -4/+10 |
|/ | |||||
* | Handle "m.room.create" in order to inform controllers about new rooms | Emmanuel ROHEE | 2014-09-02 | 1 | -2/+14 |
| | |||||
* | Represent user power level in a room by a red bar at the bottom of his ↵ | Emmanuel ROHEE | 2014-09-02 | 2 | -0/+42 |
| | | | | avatar image. The width of this bar depends on the power level. | ||||
* | change the world: make the default matrix API URL prefix /_matrix rather ↵ | Matthew Hodgson | 2014-08-31 | 2 | -7/+7 |
| | | | | | | than /matrix to make it easier for existing websites to mount a HS in their namespace without collisions. perl -pi -e 's#/matrix#/_matrix#g' ./cmdclient/console.py ./docs/client-server/howto.rst ./docs/client-server/specification.rst ./docs/client-server/swagger_matrix/directory ./docs/client-server/swagger_matrix/events ./docs/client-server/swagger_matrix/login ./docs/client-server/swagger_matrix/presence ./docs/client-server/swagger_matrix/profile ./docs/client-server/swagger_matrix/registration ./docs/client-server/swagger_matrix/rooms ./docs/server-server/specification.rst ./graph/graph.py ./jsfiddles/create_room_send_msg/demo.js ./jsfiddles/event_stream/demo.js ./jsfiddles/example_app/demo.js ./jsfiddles/register_login/demo.js ./jsfiddles/room_memberships/demo.js ./synapse/api/urls.py ./tests/federation/test_federation.py ./tests/handlers/test_presence.py ./tests/handlers/test_typing.py ./tests/rest/test_events.py ./tests/rest/test_presence.py ./tests/rest/test_profile.py ./tests/rest/test_rooms.py ./webclient/components/fileUpload/file-upload-service.js ./webclient/components/matrix/matrix-service.js | ||||
* | nasty big monolithic commit of a whole bunch of UI/UX improvements: | Matthew Hodgson | 2014-08-31 | 1 | -5/+9 |
| | | | | | | | | - add a simple CSS template across the app for navigation & cosmetics - split login into login & register, and totally reskin it - restructure room CSS to play nicely with it - implement basis 1:1 chat from user pages - disable autofocus on iOS to improve UX | ||||
* | Give basic feedback on the state of VoIP calls in the UI. | David Baker | 2014-08-29 | 1 | -1/+2 |
| | |||||
* | better support for call hangups | David Baker | 2014-08-29 | 1 | -16/+16 |
| | |||||
* | The away state is unavailable not offline | Emmanuel ROHEE | 2014-08-29 | 1 | -7/+7 |
| | |||||
* | Oops, forgot a s/sendObject/sendEvent/ - make messages work again! | David Baker | 2014-08-29 | 1 | -1/+1 |
| | |||||
* | Don't break if the call ends before it connects | David Baker | 2014-08-29 | 1 | -12/+20 |
| | |||||
* | Change call signalling messages to be their own types of room events rather ↵ | David Baker | 2014-08-29 | 4 | -17/+26 |
| | | | | than room messages with different msgtypes: room messages should be things that the client can display as a unit message to the user. | ||||
* | Merge branch 'voip' into develop | David Baker | 2014-08-29 | 3 | -1/+332 |
|\ | | | | | | | | | Conflicts: webclient/room/room-controller.js | ||||
| * | More basic functionality for voip calls (like hanging up) | David Baker | 2014-08-29 | 2 | -4/+68 |
| | | |||||
| * | First basic working VoIP call support | David Baker | 2014-08-28 | 2 | -15/+134 |
| | | |||||
| * | WIP voip support on web client | David Baker | 2014-08-27 | 3 | -1/+149 |
| | | |||||
* | | Added a timeout(40s) to $http stream requests (/events) in order to be ↵ | Emmanuel ROHEE | 2014-08-29 | 2 | -10/+27 |
| | | | | | | | | notified by an error when there is a network issue. Thus, we can retry with a new request. | ||||
* | | Renamed matrixService.assignRoomAliases into getRoomAliasAndDisplayName | Emmanuel ROHEE | 2014-08-29 | 1 | -26/+30 |
| | | |||||
* | | Added waitForInitialSyncCompletion so that clients can know when they can ↵ | Emmanuel ROHEE | 2014-08-28 | 2 | -9/+24 |
| | | | | | | | | access to the data retrieved by the initialSync Request | ||||
* | | BF: Made member events parsing work (handleEvents expects an array of events) | Emmanuel ROHEE | 2014-08-28 | 1 | -8/+4 |
|/ | |||||
* | Moved assignRoomAliases into a central piece: matrixService for now | Emmanuel ROHEE | 2014-08-27 | 1 | -0/+34 |
| | |||||
* | Support limit and feedback param of initialSync | Emmanuel ROHEE | 2014-08-27 | 1 | -2/+11 |
| | |||||
* | Renamed /ds to /directory | Kegan Dougal | 2014-08-27 | 1 | -1/+1 |
| | |||||
* | Renamed /public/rooms to /publicRooms | Kegan Dougal | 2014-08-27 | 1 | -1/+1 |
| | |||||
* | fix joining rooms on webclient | David Baker | 2014-08-27 | 1 | -1/+2 |
| | |||||
* | Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and ↵ | Kegan Dougal | 2014-08-27 | 1 | -1/+1 |
| | | | | removed tests which tested that. Updated cmdclient and webclient. | ||||
* | Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated ↵ | Kegan Dougal | 2014-08-26 | 1 | -6/+5 |
| | | | | cmdclient, tests and webclient. All appears to work. | ||||
* | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> ↵ | Kegan Dougal | 2014-08-26 | 1 | -3/+3 |
| | | | | /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient. | ||||
* | Determine and send user presence state | Emmanuel ROHEE | 2014-08-26 | 2 | -0/+130 |
| | |||||
* | webclient: Updated to use /rooms/$roomid/[invite|join|leave] | Kegan Dougal | 2014-08-26 | 1 | -7/+11 |
| | |||||
* | Adjusted webclient to use new state paths. Updated membership msg template ↵ | Kegan Dougal | 2014-08-26 | 2 | -39/+12 |
| | | | | to actually show the person invited. Factored out common membership functions in matrix service. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1 | Erik Johnston | 2014-08-22 | 1 | -5/+13 |
|\ | |||||
| * | Update web client to use new IS API. | David Baker | 2014-08-22 | 1 | -5/+13 |
| | | |||||
* | | Keep track of people's presence and query that when we update the members list. | Erik Johnston | 2014-08-22 | 1 | -0/+3 |
| | | |||||
* | | Reinitialize room when creating a RoomController so that we start off with a ↵ | Erik Johnston | 2014-08-22 | 1 | -1/+11 |
| | | | | | | | | clean slate, as it expects/ | ||||
* | | Make the content repo work with in daemon mode. Return the full url on ↵ | Erik Johnston | 2014-08-22 | 1 | -1/+1 |
| | | | | | | | | upload. Update the webclient to use new content repo api. | ||||
* | | resizeImage: generate an image in the format of the original image. (Tested ↵ | Emmanuel ROHEE | 2014-08-22 | 1 | -1/+3 |
| | | | | | | | | with tranparent PNG, transparent GIF, BMP, JPEG) | ||||
* | | Safari needs the img.onload event before actually working on the img | Emmanuel ROHEE | 2014-08-22 | 2 | -27/+39 |
| | | |||||
* | | actually display room metadata based on m.room.membe events | Matthew Hodgson | 2014-08-21 | 1 | -0/+11 |
| | | |||||
* | | Only start event streaming after having set up the controllers. | Erik Johnston | 2014-08-21 | 1 | -0/+10 |
| | | |||||
* | | Change webclient to always hit the im sync api before streaming so we get ↵ | Erik Johnston | 2014-08-21 | 1 | -6/+35 |
|/ | | | | current presence state | ||||
* | Generate thumbnail client side and send its URL and info with the image ↵ | Emmanuel ROHEE | 2014-08-21 | 2 | -6/+137 |
| | | | | message body | ||||
* | Made uploadContent compatible for sending Blob objects | Emmanuel ROHEE | 2014-08-21 | 1 | -4/+22 |
| | |||||
* | Added resizeImage() | Emmanuel ROHEE | 2014-08-21 | 1 | -1/+86 |
| | |||||
* | Send images with their imageInfo (size, mymetype, width & height) | Emmanuel ROHEE | 2014-08-20 | 3 | -4/+57 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 1 | -3/+1 |
|\ | |||||
| * | Cleaned dead code | Emmanuel ROHEE | 2014-08-19 | 1 | -3/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 3 | -19/+44 |
|\| | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | Change mouse cursor to pointer on elements user can click on | Emmanuel ROHEE | 2014-08-19 | 1 | -1/+4 |
| | | |||||
| * | Implemented GETs for the ContentRepoResource. It all actually appears to be ↵ | Kegan Dougal | 2014-08-18 | 1 | -2/+3 |
| | | | | | | | | working. | ||||
| * | Auth content uploads. Added a mapping function from request > filename. ↵ | Kegan Dougal | 2014-08-18 | 2 | -18/+29 |
| | | | | | | | | Added exception handling for content uploads. webclient: Only prefix the client API path on doRequest, not doBaseRequest (this would've broken the identity server auth too). Added matrixService.uploadContent. May not require mFileUpload anymore. | ||||
| * | Support room alias in rooms URL (ex: ↵ | Emmanuel ROHEE | 2014-08-18 | 1 | -0/+10 |
| | | | | | | | | http://127.0.0.1:8000/#/room/#public:localhost:8080) | ||||
* | | Change the way pagination works to support out of order events. | Erik Johnston | 2014-08-19 | 2 | -3/+2 |
|/ | |||||
* | Increase /events timeout to 30 secs. We don't need it so low anymore to get ↵ | Kegan Dougal | 2014-08-18 | 1 | -1/+1 |
| | | | | around request suppression when changing rooms, since there is just a single event stream now. | ||||
* | Do not start the event stream if the user is not logged in (=if he does not ↵ | Emmanuel ROHEE | 2014-08-18 | 1 | -5/+14 |
| | | | | | | has an access token yet) Add isUserLoggedIn to check this. | ||||
* | When new invites come down, update the My Rooms list. Added hacks to make ↵ | Kegan Dougal | 2014-08-15 | 1 | -8/+11 |
| | | | | the display name a bit nicer (/im/sync needs to return room aliases / membership events better) | ||||
* | Remove old polling stuff from RoomController. Added service comments. Do not ↵ | Kegan Dougal | 2014-08-15 | 2 | -4/+17 |
| | | | | start the event stream on startup unless you have credentials. | ||||
* | Event streaming now happens on an app level, rather than a per-room level. ↵ | Kegan Dougal | 2014-08-15 | 1 | -5/+57 |
| | | | | Make eventStreamService manage it's own repolling provided no one calls stop() on it. Couple the stream with eventHandlerService so any controller can just blithely call eventStreamService.resume() and expect to 'get stuff' without having to handle promises (though resume() still returns a promise for that request and proxies it through $q). Kill and reset the stream if you logout. | ||||
* | Store messages in $rootScope so they can be accessed from multiple ↵ | Kegan Dougal | 2014-08-15 | 1 | -2/+24 |
| | | | | controllers without duplicated storage for each. This also gives updates. | ||||
* | Added event handler service which.. handles events. More specifically, it ↵ | Kegan Dougal | 2014-08-15 | 2 | -4/+100 |
| | | | | $broadcasts events depending on their type, and does processing on events (shuffling keys, adding events to $rootScope so displays will automatically update, sending delivery receipts, and so on). Some of this logic was previously contained in the RoomController, which fails the moment you add >1 room into the mix, hence requiring a Service to handle events, rather than having each individual controller maintain their part of the world. | ||||
* | Added event stream service which neatly blobs together requests / state for ↵ | Kegan Dougal | 2014-08-15 | 2 | -0/+78 |
| | | | | the event stream. This depends on matrix service to do the actual hit. Currently this has exactly the same behaviour as before. | ||||
* | Create a temporary upload service server side (by hacking ↵ | Emmanuel ROHEE | 2014-08-14 | 1 | -0/+47 |
| | | | | demos/webserver.py) and client side with an angularjs service component. | ||||
* | webclient: You can now paginate in rooms. Defaults to 10 messages, with a ↵ | Kegan Dougal | 2014-08-14 | 1 | -0/+11 |
| | | | | button to get more (needs to be hooked into infini-scrolling). | ||||
* | Move the unknown token broadcast to the interceptor. Return the $http ↵ | Kegan Dougal | 2014-08-14 | 1 | -20/+1 |
| | | | | promise and not a wrapped one via $q. Everything now needs a level deeper nesting. Fixed registration and login. | ||||
* | Detect when the user access token is no more valid and log the user out in ↵ | Emmanuel ROHEE | 2014-08-14 | 1 | -2/+12 |
| | | | | this case | ||||
* | Created m-file-input. A directive to open a file selection dialog on ↵ | Emmanuel ROHEE | 2014-08-14 | 1 | -0/+43 |
| | | | | whatever HTML element | ||||
* | Room: Added a text input to type an image URL in order to send an image message | Emmanuel ROHEE | 2014-08-13 | 1 | -0/+11 |
| | |||||
* | add in copyrights to everything, not just the synapse subdir, and add a ↵ | Matthew Hodgson | 2014-08-13 | 1 | -0/+16 |
| | | | | copyrighter.pl whilst we're at it | ||||
* | Fix the 'Go to room' button to use the correct room alias api | Erik Johnston | 2014-08-12 | 1 | -0/+9 |
| | |||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 1 | -0/+307 |