Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Filter room where the user has been banned | Emmanuel ROHEE | 2014-09-15 | 2 | -5/+29 |
| | |||||
* | Recents must not show temporary fake messages | Emmanuel ROHEE | 2014-09-15 | 4 | -10/+32 |
| | |||||
* | Recents uses data directly from $rootscope.events | Emmanuel ROHEE | 2014-09-15 | 4 | -171/+95 |
| | |||||
* | BF: inviter field has moved to the room root object | Emmanuel ROHEE | 2014-09-15 | 1 | -1/+1 |
| | |||||
* | BF: presence and eventMap were not reset at logout. | Emmanuel ROHEE | 2014-09-15 | 1 | -10/+14 |
| | |||||
* | Use "white-space: pre-wrap" for "Text will wrap when necessary, and on line ↵ | Emmanuel ROHEE | 2014-09-15 | 1 | -3/+2 |
| | | | | breaks" | ||||
* | Merge remote-tracking branch 'origin/master' into develop | Emmanuel ROHEE | 2014-09-15 | 2 | -3/+4 |
|\ | |||||
| * | unbreak wordwrapping by breaking multiline paste for now | Matthew Hodgson | 2014-09-13 | 1 | -1/+2 |
| | | |||||
| * | always scroll to bottom when entering a room | Matthew Hodgson | 2014-09-13 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-12 | 1 | -0/+1 |
|\| | |||||
| * | Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse | Erik Johnston | 2014-09-12 | 34 | -3671/+7371 |
| |\ | | | | | | | | | | | | | Conflicts: webclient/room/room-controller.js | ||||
| * | | fix embarassing bug where in-progress messages get vaped when the previous ↵ | Matthew Hodgson | 2014-09-06 | 1 | -1/+3 |
| | | | | | | | | | | | | one gets delivered | ||||
| * | | fix desktop notifs, which were broken in eab463fd | Matthew Hodgson | 2014-09-06 | 2 | -3/+3 |
| | | | |||||
| * | | Center recaptcha dialog. | Kegan Dougal | 2014-09-06 | 1 | -0/+4 |
| | | | |||||
| * | | disable broken event dup suppression, and fix echo for /me | Matthew Hodgson | 2014-09-06 | 2 | -16/+25 |
| | | | |||||
| * | | Set the room_alias field when we encounter a new one, rather than only from ↵ | Kegan Dougal | 2014-09-06 | 1 | -2/+1 |
| | | | | | | | | | | | | local storage. | ||||
| * | | Use the room_display_name when presenting on the home page, and not the ↵ | Kegan Dougal | 2014-09-06 | 1 | -1/+1 |
| | | | | | | | | | | | | room_alias which may not be set. | ||||
| * | | https when loading recaptcha js | Kegan Dougal | 2014-09-06 | 1 | -1/+1 |
| | | | |||||
* | | | 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 | 4 | -11/+36 |
| | | |||||
* | | Retry sending events that fail to send. | David Baker | 2014-09-12 | 1 | -11/+28 |
| | | |||||
* | | Fixed displayname resolution of emote sender | Emmanuel ROHEE | 2014-09-12 | 1 | -1/+1 |
| | | |||||
* | | Fixed public room name and users count alignement | Emmanuel ROHEE | 2014-09-12 | 2 | -25/+46 |
| | | | | | | | | Put data into a table to ease layout and manage long strings | ||||
* | | 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. | ||||
* | | CSS m.room.topic and m.room.name events in the history | Emmanuel ROHEE | 2014-09-12 | 1 | -1/+1 |
| | | |||||
* | | Handle NAME_EVENT to get room name update event | Emmanuel ROHEE | 2014-09-12 | 1 | -0/+5 |
| | | | | | | | | (TODO: recents needs to be directly plugged to $rootScope.events.rooms) | ||||
* | | Added edition of room name | Emmanuel ROHEE | 2014-09-12 | 4 | -12/+61 |
| | | |||||
* | | Show room name updates in room history and recents. | Emmanuel ROHEE | 2014-09-12 | 4 | -38/+50 |
| | | | | | | | | 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 | 2 | -5/+4 |
| | | | | | | | | 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. | ||||
* | | Clearly show when an user cannot join a room. | Emmanuel ROHEE | 2014-09-11 | 2 | -10/+39 |
| | | | | | | | | In realtime show who kicked or banned him. | ||||
* | | start towards glare support (currently not much better but no worse than ↵ | David Baker | 2014-09-11 | 3 | -60/+116 |
| | | | | | | | | 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. | ||||
* | | Added support of copy/paste of multi lines content | Emmanuel ROHEE | 2014-09-11 | 2 | -1/+7 |
| | | |||||
* | | Use autofill-event.js to workaround browsers issue: Form model doesn't ↵ | Emmanuel ROHEE | 2014-09-11 | 2 | -0/+118 |
| | | | | | | | | | | | | update on autocomplete https://github.com/angular/angular.js/issues/1460 | ||||
* | | Invite: reset the input when the invitation has been done | Emmanuel ROHEE | 2014-09-11 | 2 | -5/+6 |
| | | |||||
* | | Enable enter key in the invite input | Emmanuel ROHEE | 2014-09-11 | 1 | -1/+1 |
| | | |||||
* | | On member avatar mouseover, show user_id and power level | Emmanuel ROHEE | 2014-09-11 | 1 | -1/+1 |
| | | |||||
* | | Room topic: if the request fails, show the error in the feedback | Emmanuel ROHEE | 2014-09-11 | 1 | -1/+8 |
| | | |||||
* | | BF: made input autofocus work when opening the room topic input | Emmanuel ROHEE | 2014-09-11 | 2 | -2/+6 |
| | | |||||
* | | Show room topic change in the chat history and in the recents | Emmanuel ROHEE | 2014-09-11 | 4 | -4/+35 |
| | | |||||
* | | 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 | 13 | -3434/+6381 |
|\ \ | |||||
| * | | Animation on call end icon. | David Baker | 2014-09-10 | 4 | -16/+14 |
| | | | |||||
| * | | Upgrade angularjs to 1.3.0-rc1 since this is new development | David Baker | 2014-09-10 | 8 | -3414/+6346 |
| | | | |||||
| * | | Add text for incoming calls | David Baker | 2014-09-10 | 1 | -0/+1 |
| | | | |||||
| * | | Show mxid in call bar for users with no displayname | David Baker | 2014-09-10 | 1 | -1/+6 |
| | | | |||||
| * | | Less buggy rejection of calls when busy | David Baker | 2014-09-10 | 2 | -13/+20 |
| | | | |||||
| * | | reject calls if there's already a call in progress | David Baker | 2014-09-10 | 1 | -0/+4 |
| | | | |||||
* | | | Show echoed emote with transparency | Emmanuel ROHEE | 2014-09-10 | 1 | -1/+4 |
| | | | |||||
* | | | Reenabled transparent echo message. It turns to opaque without flickering now. | Emmanuel ROHEE | 2014-09-10 | 2 | -19/+40 |
| | | | |||||
* | | | Clean previous request feedback when doing a new request | Emmanuel ROHEE | 2014-09-10 | 1 | -0/+3 |
| | | | |||||
* | | | BF: Made /op work when providing no power value. 50 is used as default in ↵ | Emmanuel ROHEE | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | this case | ||||
* | | | Made users count auto updating. Do show it if the info is not available ↵ | Emmanuel ROHEE | 2014-09-10 | 2 | -12/+30 |
| | | | | | | | | | | | | (ex:user has not joined the room yet) | ||||
* | | | 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 | 2 | -25/+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 | 3 | -15/+38 |
|/ / | |||||
* | | Hangup call if user denies media access. | David Baker | 2014-09-09 | 2 | -8/+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 | 2 | -2/+3 |
| | | |||||
* | | Don't play an engaged tone if we hang up locally. | David Baker | 2014-09-09 | 3 | -5/+18 |
| | | |||||
* | | Improved room page loading flow: do pagination only when the members list is ↵ | Emmanuel ROHEE | 2014-09-09 | 1 | -3/+5 |
| | | | | | | | | | | | | available. Killed an unexpected pagination trigger when the page load: paginateMore | ||||
* | | When the user has been kicked or banned from a room, remove the room from ↵ | Emmanuel ROHEE | 2014-09-09 | 1 | -1/+8 |
| | | | | | | | | his recents list | ||||
* | | Made recents list display something when joining a room which we do not have ↵ | Emmanuel ROHEE | 2014-09-09 | 1 | -0/+8 |
| | | | | | | | | state data yet | ||||
* | | BF: prevent joined messages to be displayed twice when joining a room. | Emmanuel ROHEE | 2014-09-09 | 1 | -4/+16 |
| | | | | | | | | Do this by synchronizing the m.room.member joined event from the events stream and the start of the pagination | ||||
* | | make calls work in Firefox | David Baker | 2014-09-09 | 1 | -8/+21 |
| | | |||||
* | | Removed historical code: recents does not need to manage presences. It is ↵ | Emmanuel ROHEE | 2014-09-09 | 1 | -6/+0 |
| | | | | | | | | already done by initialSync in eventStreamService | ||||
* | | BF: Made the grey background of the current room cover all the cell width | Emmanuel ROHEE | 2014-09-09 | 1 | -1/+1 |
| | | |||||
* | | Show call invites in the message table | David Baker | 2014-09-09 | 2 | -0/+7 |
| | | |||||
* | | CSS tweakage | Kegan Dougal | 2014-09-08 | 1 | -0/+3 |
| | | |||||
* | | Display a 'Set Topic' button if there is no topic or it's a 0-len string. | Kegan Dougal | 2014-09-08 | 3 | -11/+30 |
| | | |||||
* | | Add ability to set topic by double-clicking on the topic text then hitting ↵ | Kegan Dougal | 2014-09-08 | 5 | -1/+59 |
| | | | | | | | | 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. | ||||
* | | long topic is long. CSS support it | Kegan Dougal | 2014-09-08 | 1 | -0/+4 |
| | | |||||
* | | Display public room topics if they exist on the public room list. | Kegan Dougal | 2014-09-08 | 2 | -0/+10 |
| | | |||||
* | | Display the room topic in the room, underneath the name of the room. | Kegan Dougal | 2014-09-08 | 3 | -8/+33 |
| | | |||||
* | | Bodge to default to '1 users' when you create a room, which is better than ↵ | Kegan Dougal | 2014-09-08 | 2 | -1/+6 |
| | | | | | | | | blindly assuming a recents controller is writing to rootScope.rooms and setting numUsersInRoom there. | ||||
* | | Added big massive TODOs on a huge design problem with initial sync | Kegan Dougal | 2014-09-08 | 2 | -1/+20 |
| | | |||||
* | | Float right the num users, apply room highlight to user count. | Kegan Dougal | 2014-09-08 | 2 | -1/+7 |
| | | |||||
* | | Better checks are better. | Kegan Dougal | 2014-09-08 | 1 | -1/+1 |
| | | |||||
* | | Added num_joined_users key to /publicRooms for each room. Show this ↵ | Kegan Dougal | 2014-09-08 | 3 | -2/+9 |
| | | | | | | | | information in the webclient. | ||||
* | | Added number of users in recent rooms. | Kegan Dougal | 2014-09-08 | 2 | -0/+16 |
| | | |||||
* | | Make #matrix public rooms bold to make them stand out from the other public ↵ | Kegan Dougal | 2014-09-08 | 2 | -1/+8 |
| | | | | | | | | rooms. Ideally this would be metadata in /publicRooms to say something like 'featured channel', but for now, just make it a client side check. | ||||
* | | Sort the public room list by display name. | Kegan Dougal | 2014-09-08 | 1 | -1/+1 |
| | | |||||
* | | Added /join description | Emmanuel ROHEE | 2014-09-08 | 1 | -0/+1 |
| | | |||||
* | | matrixService.rooms must be renamed matrixService.initialSync now | Emmanuel ROHEE | 2014-09-08 | 2 | -3/+4 |
| | | |||||
* | | App startup improvements: | Emmanuel ROHEE | 2014-09-08 | 3 | -39/+39 |
| | | | | | | | | | | | | | | - 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 | 11 | -14/+75 |
| | | |||||
* | | fix embarassing bug where in-progress messages get vaped when the previous ↵ | Matthew Hodgson | 2014-09-08 | 1 | -1/+3 |
| | | | | | | | | one gets delivered | ||||
* | | fix desktop notifs, which were broken in eab463fd | Matthew Hodgson | 2014-09-08 | 2 | -3/+3 |
| | | |||||
* | | Center recaptcha dialog. | Kegan Dougal | 2014-09-08 | 1 | -0/+4 |
| | | |||||
* | | disable broken event dup suppression, and fix echo for /me | Matthew Hodgson | 2014-09-08 | 2 | -16/+25 |
| | | |||||
* | | 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. | ||||
* | | Use the room_display_name when presenting on the home page, and not the ↵ | Kegan Dougal | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | | room_alias which may not be set. | ||||
* | | https when loading recaptcha js | Kegan Dougal | 2014-09-08 | 1 | -1/+1 |
| | | |||||
* | | Revert "BF: Made notification work again (forgot to renamed "offline" to ↵ | Emmanuel ROHEE | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | "unavailable")" This reverts commit c3f9d8e41bf2d23f676a10ec4579434a94b1fc39. | ||||
* | | BF: Made notification work again (forgot to renamed "offline" to "unavailable") | Emmanuel ROHEE | 2014-09-08 | 1 | -1/+1 |
|/ | |||||
* | 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 | 4 | -10/+85 |
| | | | | 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 | 6 | -11/+125 |
|\ | | | | | | | Merge branch 'captcha' of github.com:matrix-org/synapse into develop | ||||
| * | Added instructions for setting up captcha in an obviously named file. | Kegan Dougal | 2014-09-05 | 3 | -11/+54 |
| | | |||||
| * | Reload captchas when they fail. Cleanup on success. | Kegan Dougal | 2014-09-05 | 1 | -0/+9 |
| | | |||||
| * | 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. | ||||
| * | Added webclient config.js for storing recaptcha public key. | Kegan Dougal | 2014-09-05 | 3 | -5/+29 |
| | | |||||
| * | Modified matrixService.register to specify if captcha results should be sent ↵ | Kegan Dougal | 2014-09-05 | 2 | -6/+28 |
| | | | | | | | | with the registration request. This is toggleable via useCaptcha in register-controller. | ||||
| * | Added basic captcha, not hooked up | Kegan Dougal | 2014-09-05 | 3 | -3/+20 |
| | | |||||
* | | Better call bar (visually: still lacks ring[back] tones). | David Baker | 2014-09-06 | 7 | -18/+112 |
|/ | |||||
* | BF: tab completion did not work with commands. $scope.input contained only ↵ | Emmanuel ROHEE | 2014-09-05 | 1 | -1/+10 |
| | | | | | | the typed chars not the result of the completion. Needed to fire an event so that ng update the input model | ||||
* | BF: Update the members list on banned & kicked "events" | Emmanuel ROHEE | 2014-09-05 | 1 | -4/+13 |
| | |||||
* | autoscroll down(if the scroller was already at the bottom) when receiving ↵ | Emmanuel ROHEE | 2014-09-05 | 1 | -13/+18 |
| | | | | member events | ||||
* | doc: kick can take a reason arg | Emmanuel ROHEE | 2014-09-05 | 1 | -1/+1 |
| | |||||
* | Created kick & unban methods in matrixService. Made some factorisation. | Emmanuel ROHEE | 2014-09-05 | 2 | -23/+24 |
| | |||||
* | Added sanity checks in commands | Emmanuel ROHEE | 2014-09-05 | 1 | -34/+55 |
| | |||||
* | BF: Make /unban work again | Emmanuel ROHEE | 2014-09-05 | 2 | -2/+2 |
| | |||||
* | Display ban & kick reason | Emmanuel ROHEE | 2014-09-05 | 2 | -1/+14 |
| | |||||
* | 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 |
| | |||||
* | BF: Fixed members list layout when the scrollbar appears | Emmanuel ROHEE | 2014-09-05 | 1 | -1/+3 |
| | |||||
* | BF: Show "Bob invited you" in recents when Bob invites the user | Emmanuel ROHEE | 2014-09-05 | 1 | -1/+5 |
| | |||||
* | hide the forgot password link until it works | David Baker | 2014-09-05 | 1 | -2/+2 |
| | |||||
* | Fixed duplicated messages sending in slow network condition. | Emmanuel ROHEE | 2014-09-05 | 3 | -5/+55 |
| | | | | | | | Show the message sending flow state in the messages list: - While sending, the message appears semi transparent in the chat. - If successfully sent, it appears as before, ie normal - In case of failure, it appears in red with an Unsent text. | ||||
* | Cleaned all sending references as it not used | Emmanuel ROHEE | 2014-09-05 | 1 | -22/+4 |
| | |||||
* | Do not systematically scroll to the bottom on new events in the room | Emmanuel ROHEE | 2014-09-05 | 1 | -2/+8 |
| | |||||
* | switch IRC-style command parser to use regexps rather than split(" ") so ↵ | Matthew Hodgson | 2014-09-04 | 2 | -55/+96 |
| | | | | | | | | 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 | ||||
* | Fixed registration flow when registering with matrixID & password and no email | Emmanuel ROHEE | 2014-09-04 | 1 | -1/+1 |
| | |||||
* | Added mUserDisplayName, a filter to resolve a user display name from a user_id | Emmanuel ROHEE | 2014-09-04 | 2 | -9/+42 |
| | |||||
* | Moved mRoomName filter into matrix-filter.js, a place for all generic ↵ | Emmanuel ROHEE | 2014-09-04 | 7 | -86/+106 |
| | | | | filters using Matrix data. | ||||
* | Re-apply fixes to the link-email screen to make it work again (in a somewhat ↵ | David Baker | 2014-09-04 | 2 | -27/+54 |
| | | | | temporary way until home servers sign associations). Unhide the linked emails box. | ||||
* | BF: Do not filter incoming member events. Before, only invitations to the ↵ | Emmanuel ROHEE | 2014-09-04 | 1 | -7/+2 |
| | | | | current user were showned in the recents. | ||||
* | Report ban/unban messages to recents lists | Emmanuel ROHEE | 2014-09-04 | 1 | -8/+19 |
| | |||||
* | Hide email link UI from the settings because it doesn't work. | David Baker | 2014-09-03 | 1 | -2/+2 |
| | |||||
* | Added more ng-if to make nice sentences like "Bob kicked Alice" or "Bob ↵ | Emmanuel ROHEE | 2014-09-03 | 1 | -4/+13 |
| | | | | unbanned Alice" | ||||
* | better error msgs | Matthew Hodgson | 2014-09-03 | 1 | -3/+3 |
| | |||||
* | Ignore leave members in the list too | Emmanuel ROHEE | 2014-09-03 | 1 | -2/+2 |
| | |||||
* | Fixed used of state_key instead of user_id in member events. | Emmanuel ROHEE | 2014-09-03 | 1 | -4/+7 |
| | | | | Needed to split into 2 conditional spans for grammar reason | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2014-09-03 | 25 | -53/+245 |
|\ | | | | | | | | | 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 | 2 | -6/+6 |
| | | |||||
| * | Normalise users power levels so that the user with the higher power level ↵ | Emmanuel ROHEE | 2014-09-03 | 2 | -1/+24 |
| | | | | | | | | will have a bar covering 100% of the width of his avatar | ||||
| * | Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of ↵ | Emmanuel ROHEE | 2014-09-03 | 2 | -3/+15 |
| | | | | | | | | another user | ||||
| * | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 22 | -22/+22 |
| | | | | | | | | hasn't been incorporated in time for launch. | ||||
| * | List commands and their usage in the settings page | Emmanuel ROHEE | 2014-09-03 | 1 | -0/+15 |
| | | |||||
| * | Added /kick $user_id | Emmanuel ROHEE | 2014-09-03 | 1 | -4/+14 |
| | | |||||
| * | Added /unban $user_id | Emmanuel ROHEE | 2014-09-03 | 1 | -0/+10 |
| | | |||||
| * | Add support for room names | Erik Johnston | 2014-09-03 | 2 | -2/+20 |
| | | |||||
| * | Send unrecognized commands as text message (as before) | Emmanuel ROHEE | 2014-09-03 | 1 | -1/+2 |
| | | |||||
| * | Do not define power level limits in setUserPowerLevel. Update the function ↵ | Emmanuel ROHEE | 2014-09-03 | 2 | -35/+3 |
| | | | | | | | | to be used as a resetUserPowerLevel | ||||
| * | Added /deop $user_id | Emmanuel ROHEE | 2014-09-03 | 2 | -3/+36 |
| | | |||||
| * | 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 | 3 | -7/+59 |
| | | |||||
| * | Better indicate in the page feedback section that a user can't join a room ↵ | Emmanuel ROHEE | 2014-09-03 | 1 | -1/+2 |
| | | | | | | | | (because he has been banned for ex). May be worth to be put in the middle of screen | ||||
| * | Do not show banned people in member list. Format ban events strings in room ↵ | Emmanuel ROHEE | 2014-09-03 | 3 | -4/+10 |
| | | | | | | | | and recent flows | ||||
| * | Added /ban command | Emmanuel ROHEE | 2014-09-03 | 2 | -1/+29 |
| | | |||||
| * | Made IRC style command easier to handle specifically for possible arguments | Emmanuel ROHEE | 2014-09-03 | 1 | -10/+22 |
| | | |||||
* | | Make registering and logging in with a threepid work in the webclient. | David Baker | 2014-09-03 | 5 | -27/+113 |
|/ | |||||
* | Merge branch 'master' into develop | Erik Johnston | 2014-09-03 | 1 | -2/+2 |
|\ | |||||
| * | Hide the email textbox during registeration has it has not been wired up yet. | Erik Johnston | 2014-09-02 | 1 | -2/+2 |
| | | |||||
* | | roomName directive: Take into account invited users. | Emmanuel ROHEE | 2014-09-02 | 1 | -1/+38 |
| | | | | | | | | Use the last user display name | ||||
* | | make power level more visible | Matthew Hodgson | 2014-09-02 | 1 | -3/+3 |
| | | |||||
* | | Attempt to make avatar change clearer | Emmanuel ROHEE | 2014-09-02 | 2 | -4/+15 |
| | | |||||
* | | BF: Reset base timer time ($scope.now) everytime last_active_ago is touched | Emmanuel ROHEE | 2014-09-02 | 1 | -7/+6 |
|/ | |||||
* | BF: Prevent controllers from being instantiated twice. | Emmanuel ROHEE | 2014-09-02 | 1 | -14/+7 |
| | | | | AngularJS will instantiate it when discovering ng-controller in their respective html files | ||||
* | Handle "m.room.create" in order to inform controllers about new rooms | Emmanuel ROHEE | 2014-09-02 | 3 | -5/+29 |
| | |||||
* | Represent user power level in a room by a red bar at the bottom of his ↵ | Emmanuel ROHEE | 2014-09-02 | 5 | -0/+60 |
| | | | | avatar image. The width of this bar depends on the power level. | ||||
* | BF: Armed updateMemberListPresenceAge only once | Emmanuel ROHEE | 2014-09-02 | 1 | -1/+3 |
| | |||||
* | BF: Take into account MEMBER_EVENT and PRESENCE_EVENT events only after the ↵ | Emmanuel ROHEE | 2014-09-02 | 1 | -2/+6 |
| | | | | initialSync is done | ||||
* | Follow API renaming. state -> presence. mtime_ago -> last_active_ago | Emmanuel ROHEE | 2014-09-01 | 3 | -16/+15 |
| | |||||
* | Added roomName, a directive to compute a room name based on its alias (not ↵ | Emmanuel ROHEE | 2014-09-01 | 4 | -5/+45 |
| | | | | aliases for now) and its users displaynames or ids | ||||
* | Oops, show the voice call button once a call has ended | David Baker | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | Fairly simple move of the call status widget to the header bar (and ↵ | David Baker | 2014-09-01 | 5 | -40/+44 |
| | | | | therefore into the index page rather than the rooms page). | ||||
* | BF: Check config exists (=defined in the localstorage) before using it | Emmanuel ROHEE | 2014-09-01 | 1 | -2/+6 |
| | |||||
* | missing semicolon | David Baker | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | Handle call events in the recents view as well to get consistency with what ↵ | David Baker | 2014-09-01 | 1 | -0/+5 |
| | | | | it displays when refreshed. | ||||
* | Just show 'Call' for call events. Don't just splat out the content of the ↵ | David Baker | 2014-09-01 | 1 | -1/+3 |
| | | | | event for other events: it's rarely going to be sesnible. | ||||
* | Fixed presence change that occurs -Xs ago | Emmanuel ROHEE | 2014-09-01 | 1 | -0/+5 |
| | |||||
* | Fixed presence state update. Specifically, the current user was sometimes ↵ | Emmanuel ROHEE | 2014-09-01 | 1 | -5/+23 |
| | | | | indicated as offline | ||||
* | Don't show the hang up button once tha call has ended | David Baker | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | make the little logos clickable for Erik | Matthew Hodgson | 2014-09-01 | 6 | -7/+7 |
| | |||||
* | BF: Pass desired_user_id to register API. And update the app header to avoid ↵ | Emmanuel ROHEE | 2014-09-01 | 2 | -2/+10 |
| | | | | to display the previous matrix id | ||||
* | licenses, please... | Matthew Hodgson | 2014-09-01 | 2 | -2/+32 |
| | |||||
* | fix footer on non-room pages | Matthew Hodgson | 2014-09-01 | 1 | -1/+0 |
| | |||||
* | don't make HS ports explicit if it's the default for the protocol | Matthew Hodgson | 2014-08-31 | 2 | -2/+8 |
| | |||||
* | 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 | ||||
* | make lightbox a bit less ugly | Matthew Hodgson | 2014-08-31 | 1 | -2/+6 |
| | |||||
* | only show presence timings if we know them | Matthew Hodgson | 2014-08-31 | 1 | -1/+1 |
| | |||||
* | nasty big monolithic commit of a whole bunch of UI/UX improvements: | Matthew Hodgson | 2014-08-31 | 15 | -310/+356 |
| | | | | | | | | - 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 | ||||
* | factor out mobile css into its own file | Matthew Hodgson | 2014-08-31 | 1 | -0/+92 |
| | |||||
* | factor out the signup process into its own controller | Matthew Hodgson | 2014-08-31 | 2 | -0/+127 |
| | |||||
* | moar logos! | Matthew Hodgson | 2014-08-31 | 2 | -0/+0 |
| | |||||
* | switch default profile image to one of our own devising (dating back to ↵ | Matthew Hodgson | 2014-08-31 | 2 | -0/+0 |
| | | | | communicator(!)) | ||||
* | tweaks to settings page | Matthew Hodgson | 2014-08-30 | 2 | -28/+16 |
| | |||||
* | actually add a 'home' button | Matthew Hodgson | 2014-08-30 | 1 | -0/+1 |
| | |||||
* | shrink text bubble font a bit; make image thumbnails always fit in their bubbles | Matthew Hodgson | 2014-08-30 | 1 | -1/+6 |
| | |||||
* | Give basic feedback on the state of VoIP calls in the UI. | David Baker | 2014-08-29 | 3 | -3/+6 |
| | |||||
* | todo | Matthew Hodgson | 2014-08-29 | 1 | -1/+1 |
| | |||||
* | fix mobile skin by hiding recents LHS in /rooms | Matthew Hodgson | 2014-08-29 | 1 | -0/+2 |
| | |||||
* | oops. Should not have c+p all lines | Emmanuel ROHEE | 2014-08-29 | 1 | -2/+0 |
| | |||||
* | Implemented /nick | Emmanuel ROHEE | 2014-08-29 | 1 | -0/+4 |
| | |||||
* | Get user display name and avatar from the server rather than storing them in ↵ | Emmanuel ROHEE | 2014-08-29 | 4 | -21/+68 |
| | | | | the local storage | ||||
* | update presence times in realtime through the magic of two-way binding | Matthew Hodgson | 2014-08-29 | 2 | -35/+15 |
| | |||||
* | Show desktop notification state. Provide help if the user has previously ↵ | Emmanuel ROHEE | 2014-08-29 | 3 | -14/+39 |
| | | | | denied permission to display them. | ||||
* | 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 |
| | |||||
* | Only show voice call button if there are exactly 2 members in the room. Also ↵ | David Baker | 2014-08-29 | 2 | -3/+7 |
| | | | | hide the somewhat user unfriendly call state. | ||||
* | 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 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2014-08-29 | 1 | -10/+9 |
|\ | |||||
| * | Show notifications only when the user is detected as idle | Emmanuel ROHEE | 2014-08-29 | 1 | -10/+9 |
| | | |||||
* | | Change call signalling messages to be their own types of room events rather ↵ | David Baker | 2014-08-29 | 5 | -18/+27 |
|/ | | | | 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 | 7 | -3/+379 |
|\ | | | | | | | | | Conflicts: webclient/room/room-controller.js | ||||
| * | More basic functionality for voip calls (like hanging up) | David Baker | 2014-08-29 | 3 | -5/+69 |
| | | |||||
| * | First basic working VoIP call support | David Baker | 2014-08-28 | 4 | -16/+161 |
| | | |||||
| * | WIP voip support on web client | David Baker | 2014-08-27 | 7 | -3/+170 |
| | | |||||
* | | Cleaned up ng deps. By convention, angular modules must be listed at first | Emmanuel ROHEE | 2014-08-29 | 1 | -3/+3 |
| | | |||||
* | | 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. | ||||
* | | Recents update: do not care of events coming from the past (they are fired ↵ | Emmanuel ROHEE | 2014-08-29 | 1 | -2/+4 |
| | | | | | | | | when doing pagination of room messages in the past) | ||||
* | | Display emotes in the recents list | Emmanuel ROHEE | 2014-08-29 | 1 | -0/+5 |
| | | |||||
* | | ng-show exists. So, for clarity, avoid to use ng-hide and double negation test. | Emmanuel ROHEE | 2014-08-29 | 1 | -4/+4 |
| | | |||||
* | | Renamed matrixService.assignRoomAliases into getRoomAliasAndDisplayName | Emmanuel ROHEE | 2014-08-29 | 3 | -32/+45 |
| | | |||||
* | | Do a smart update of the recents from the events stream rather than ↵ | Emmanuel ROHEE | 2014-08-28 | 1 | -7/+21 |
| | | | | | | | | hammering initialSync each time | ||||
* | | When opening this page, do not join a room already joined | Emmanuel ROHEE | 2014-08-28 | 1 | -26/+51 |
| | | |||||
* | | 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 |
| | | |||||
* | | Cleaned up deps | Emmanuel ROHEE | 2014-08-28 | 3 | -6/+6 |
| | | |||||
* | | Start the events stream once the app starts (if credentials are in cache) or ↵ | Emmanuel ROHEE | 2014-08-28 | 4 | -9/+4 |
|/ | | | | once the user gets logged in | ||||
* | Wired the recents list with the stream events for realtime update | Emmanuel ROHEE | 2014-08-27 | 1 | -9/+10 |
| | |||||
* | improve iOS layout a bit | Matthew Hodgson | 2014-08-27 | 1 | -0/+10 |
| | |||||
* | BF: mFileInput dependency got lost somewhere and upload buttons did not work ↵ | Emmanuel ROHEE | 2014-08-27 | 2 | -2/+2 |
| | | | | anymore | ||||
* | Highlight the current room in the recents list | Emmanuel ROHEE | 2014-08-27 | 4 | -2/+16 |
| | |||||
* | Added the recents component at the left hand side of the room page | Emmanuel ROHEE | 2014-08-27 | 2 | -1/+14 |
| | |||||
* | BF: use room_id if there is no alias | Emmanuel ROHEE | 2014-08-27 | 1 | -1/+1 |
| | |||||
* | Sort recents in anti-chronological order | Emmanuel ROHEE | 2014-08-27 | 3 | -1/+49 |
| | |||||
* | Moved recents things into a separate (and reusable) controler | Emmanuel ROHEE | 2014-08-27 | 6 | -117/+126 |
| | |||||
* | Moved assignRoomAliases into a central piece: matrixService for now | Emmanuel ROHEE | 2014-08-27 | 1 | -0/+34 |
| | |||||
* | Cleaned ng dependencies | Emmanuel ROHEE | 2014-08-27 | 1 | -3/+3 |
| | |||||
* | home/recents: show the last message of each message | Emmanuel ROHEE | 2014-08-27 | 3 | -8/+102 |
| | |||||
* | Rename go() into goToPage() which is available from everywhere thanks to the ↵ | Emmanuel ROHEE | 2014-08-27 | 2 | -2/+6 |
| | | | | inheritance of $scope | ||||
* | Support limit and feedback param of initialSync | Emmanuel ROHEE | 2014-08-27 | 2 | -3/+15 |
| | |||||
* | 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. |