Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11 from matrix-org/webclient-room-data-restructure | Kegsay | 2014-11-04 | 15 | -480/+542 |
|\ | | | | | Webclient room data restructure | ||||
| * | SYWEB-116: Implement historical display name support. | Kegan Dougal | 2014-11-04 | 4 | -9/+12 |
| | | | | | | | | | | | | | | | | | | This works for both live and paginated events. Each 'message' event has an associated '__room_member' key which points to the state of the sender at that point in time. Invites have an additional key '__target_room_member' which point to the state of the invitee at that point in time. This obviates the need for mapping user_ids to *current* displaynames in the message list, though this is still required for the user/presence list. | ||||
| * | Rejig display names when paginating to lie less. | Kegan Dougal | 2014-11-04 | 3 | -13/+24 |
| | | |||||
| * | Rejig order of checks/state updates/message insertions for m.room.member. ↵ | Kegan Dougal | 2014-11-03 | 1 | -26/+23 |
| | | | | | | | | Mark known issue. | ||||
| * | Fix off-by-one bug when displaying display names / avatar urls when paginating. | Kegan Dougal | 2014-11-03 | 1 | -0/+7 |
| | | |||||
| * | Backwards compat for old-style avatar_urls | Kegan Dougal | 2014-11-03 | 1 | -1/+2 |
| | | |||||
| * | Reference the room_member key on messages which adjusts for current vs ↵ | Kegan Dougal | 2014-11-03 | 2 | -8/+18 |
| | | | | | | | | old_room_state. This displays names for historical users correctly, but is off by one (referencing content not prev_content). | ||||
| * | Variable renaming, general cleanup. Don't feed state events from ↵ | Kegan Dougal | 2014-11-03 | 2 | -38/+29 |
| | | | | | | | | /initialSync twice. | ||||
| * | Fix broken redact enable logic. | Kegan Dougal | 2014-11-03 | 1 | -1/+1 |
| | | |||||
| * | Fix hidden event keys being incorrectly shown in the even info dialog. | Kegan Dougal | 2014-11-03 | 1 | -1/+5 |
| | | |||||
| * | Fix bug which prevented pagination from bumping the list down, causing ↵ | Kegan Dougal | 2014-11-03 | 1 | -1/+1 |
| | | | | | | | | infini-pagination. | ||||
| * | Fix bug which prevented room name invites appearing correctly. | Kegan Dougal | 2014-11-03 | 3 | -86/+47 |
| | | |||||
| * | Fix bug which prevented the number of users being visible on the recents view. | Kegan Dougal | 2014-11-03 | 3 | -5/+4 |
| | | |||||
| * | Remove events.rooms[room_id] entirely from event-handler-service. | Kegan Dougal | 2014-11-03 | 4 | -232/+59 |
| | | | | | | | | | | Everything now uses modelService, but there are still one or two minor teething problems to fix. | ||||
| * | Make recents[controller/filter/html] use modelService. | Kegan Dougal | 2014-11-03 | 5 | -25/+66 |
| | | | | | | | | | | This breaks functionality whilst both events.rooms and modelService are in use. | ||||
| * | Make call stuff use modelService. | Kegan Dougal | 2014-11-03 | 2 | -5/+5 |
| | | |||||
| * | Keep matrixService stateless and make matrixFilter use modelService. | Kegan Dougal | 2014-11-03 | 5 | -53/+53 |
| | | |||||
| * | Prevent EventStreamService from knowing too much about the ↵ | Kegan Dougal | 2014-11-03 | 2 | -21/+20 |
| | | | | | | | | EventHandlerService by changing the contract to just be a single initialSync response callback. Leave it up the handler to deal with splitting out information from /initialSync. | ||||
| * | Replace lots of .events.rooms[room_id] with .room | Kegan Dougal | 2014-10-31 | 4 | -16/+22 |
| | | |||||
| * | room.html now displays messages from model-service. Add debugging fields. ↵ | Kegan Dougal | 2014-10-31 | 5 | -17/+31 |
| | | | | | | | | Hook up the room member *at the time* to the message so it can display the right historical member info. | ||||
| * | Hook into more of event-handler-service and mimic its functions for now. | Kegan Dougal | 2014-10-31 | 2 | -68/+130 |
| | | |||||
| * | Parse /initialSync data and populate the new data structures. | Kegan Dougal | 2014-10-31 | 2 | -4/+33 |
| | | |||||
| * | Added model-service.js to store model data. | Kegan Dougal | 2014-10-31 | 4 | -2/+102 |
| | | |||||
* | | Don't need this; should be on -g path. | Kegan Dougal | 2014-11-04 | 1 | -1/+0 |
| | | |||||
* | | Use phantomjs as the default browser and not chrome. | Kegan Dougal | 2014-11-04 | 2 | -7/+25 |
| | | |||||
* | | Update karma.conf.js to A: actually run the tests, and B: generate JUnit XML. | Kegan Dougal | 2014-11-04 | 1 | -3/+13 |
| | | |||||
* | | SYWEB-136: Send m.images according to the spec. | Kegan Dougal | 2014-11-04 | 2 | -4/+6 |
| | | |||||
* | | SYWEB-133: JSON dialog now appears on dblclick to allow users to highlight text. | Kegan Dougal | 2014-11-04 | 1 | -1/+1 |
|/ | |||||
* | SYWEB-102: Fix desktop notification msg when a user with no display name ↵ | Kegan Dougal | 2014-10-31 | 1 | -3/+6 |
| | | | | joins a room. | ||||
* | Factor out notification logic. | Kegan Dougal | 2014-10-31 | 3 | -27/+39 |
| | |||||
* | Add notification-service.js to handle binging/notifications. Shift logic to ↵ | Kegan Dougal | 2014-10-31 | 5 | -70/+108 |
| | | | | this service. | ||||
* | SYWEB-45: Display the user_id of a user when hovering over their avatar next ↵ | Kegan Dougal | 2014-10-31 | 1 | -1/+1 |
| | | | | to their messages. | ||||
* | SYWEB-63: Fix desktop notification message when notifying for an image. | Kegan Dougal | 2014-10-31 | 1 | -0/+3 |
| | |||||
* | SYWEB-12: You'll be needing this. | Kegan Dougal | 2014-10-30 | 1 | -0/+216 |
| | |||||
* | SYWEB-12: Minor layout tweaks. | Kegan Dougal | 2014-10-30 | 1 | -1/+1 |
| | |||||
* | SYWEB-12: UX tweaks. | Kegan Dougal | 2014-10-30 | 1 | -1/+2 |
| | |||||
* | SYWEB-12: Add ability to add new state events. | Kegan Dougal | 2014-10-30 | 2 | -2/+21 |
| | |||||
* | SYWEB-12: Allow edited state events to be submitted. | Kegan Dougal | 2014-10-30 | 2 | -3/+10 |
| | |||||
* | SYWEB-12: More formatting and tweaking of state event JSON. | Kegan Dougal | 2014-10-30 | 5 | -16/+53 |
| | | | | | | | | Use a proper elastic directive to make the <textarea> resize dynamically. Use an 'asjson' directive to turn an ngModel of a JSON object into a formatted JSON string so it can be displayed on the textarea. Also, deep copy the state events being displayed, else it actually alters the underlying data structures when playing around with the JSON in the textarea! | ||||
* | SYWEB-12: More formatting. | Kegan Dougal | 2014-10-30 | 4 | -7/+32 |
| | |||||
* | SYWEB-12: Format room info dialog better. | Kegan Dougal | 2014-10-30 | 2 | -17/+38 |
| | |||||
* | SYWEB-12: Store unknown state events so they are displayed in the Room Info ↵ | Kegan Dougal | 2014-10-30 | 1 | -0/+7 |
| | | | | dialog. | ||||
* | SYWEB-12: Add a 'Room Info' button which displays all state content. | Kegan Dougal | 2014-10-30 | 3 | -0/+61 |
| | | | | Content displayed in a modal dialog. Currently only read-only. | ||||
* | 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-127: Open event info modal dialog when the bubble is clicked. | Kegan Dougal | 2014-10-29 | 1 | -12/+11 |
| | | | | | | This allows images to be clicked by clicking on the edge with the bubble. This is important since Redactions are only visible on the event info screen. | ||||
* | oops - fix css on desktop | Matthew Hodgson | 2014-10-29 | 1 | -1/+0 |
| | |||||
* | 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 | 3 | -2/+30 |
| | |||||
* | SYWEB-98: Add a 'Redact' button to the event info modal dialog. | Kegan Dougal | 2014-10-29 | 2 | -3/+31 |
| | | | | | I think this is better than overriding the right-click contextual menu. Currently clicking this button does nothing. | ||||
* | Implement SYWEB-58: Clicking a notification now takes you to that room. | Kegan Dougal | 2014-10-29 | 2 | -1/+7 |
| | |||||
* | Fix SYWEB-128 : Auto-scroll broken if not exactly at bottom of list. | Kegan Dougal | 2014-10-29 | 1 | -1/+3 |
| | | | | | Added a small 10px buffer so if the list isn't quite at the bottom it still actually scrolls. | ||||
* | fix mobile CSS layout | Matthew Hodgson | 2014-10-28 | 2 | -4/+9 |
| | |||||
* | Fix SYWEB-110 : Prevent room ID leaking by looking for an m.room.name | Kegan Dougal | 2014-10-27 | 1 | -1/+11 |
| | |||||
* | Fix SYWEB-114 : Error message when trying to invite a user already in the room. | Kegan Dougal | 2014-10-27 | 1 | -1/+1 |
| | |||||
* | Don't clobber existing css | Kegan Dougal | 2014-10-27 | 1 | -209/+0 |
| | |||||
* | SYWEB-121: Have some bootstrap files. | Kegan Dougal | 2014-10-27 | 2 | -0/+9457 |
| | |||||
* | Implement SYWEB-121 : Display JSON when clicking messages. | Kegan Dougal | 2014-10-27 | 4 | -12/+24 |
| | | | | | JSON is displayed as a modal dialog via AngularJS' bootstrap module, "ui.bootstrap". | ||||
* | HandleRoomMember: handle correctly prev_content | giomfo | 2014-10-27 | 1 | -1/+1 |
| | |||||
* | Fix SYWEB-109 : No error if HS rejects the username in registration. | Kegan Dougal | 2014-10-27 | 1 | -0/+3 |
| | | | | | Display all error messages from the server when registering, rather than just the types of errors the client recognises. | ||||
* | switch from the deprecated msg.content.prev to msg.prev_content.membership, ↵ | Matthew Hodgson | 2014-10-24 | 3 | -9/+9 |
| | | | | and fix the bug where kicks of unjoined users aren't displayed sensibly in the history | ||||
* | more timestamp fixes | Matthew Hodgson | 2014-10-17 | 3 | -5/+5 |
| | |||||
* | fix webclient to know about right timestamps | Matthew Hodgson | 2014-10-17 | 2 | -4/+3 |
| | |||||
* | Remove warning since the end result is still $sanitize'd | Kegan Dougal | 2014-10-15 | 1 | -3/+1 |
| | |||||
* | Add unsanitizedLinky filter to fix links in formatted messages. | Kegan Dougal | 2014-10-15 | 2 | -5/+57 |
| | | | | | | This filter is identical to ngSanitize's linky but instead of sanitizing text which isn't linkified in the addText function, it doesn't. | ||||
* | Remove org.matrix.custom.text.html event type and replace it with 'format' ↵ | Kegan Dougal | 2014-10-15 | 2 | -3/+2 |
| | | | | and 'formatted_body' keys on m.text messages | ||||
* | Add support for org.matrix.custom.text.html | Kegan Dougal | 2014-10-15 | 2 | -1/+3 |
| | | | | | This format will remain undocumented as it is not yet suitable for introduction into the specification. | ||||
* | BF: Do a pagination when opening a room from an invitation | Emmanuel ROHEE | 2014-09-25 | 1 | -5/+8 |
| | |||||
* | Merge branch 'turn' into develop | David Baker | 2014-09-25 | 3 | -4/+60 |
|\ | |||||
| * | Add stun server fallback and I-told-you-so message if we get no TURN server ↵ | David Baker | 2014-09-25 | 2 | -18/+34 |
| | | | | | | | | 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) | ||||
* | | Fixed SYWEB-36: use getUserDisplayName for disambiguating display name in ↵ | Emmanuel ROHEE | 2014-09-25 | 2 | -24/+10 |
| | | | | | | | | member list and message sender name. This method is robust when disambiguation is no more required | ||||
* | | 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 | ||||
* | | Fixed SYWEB-28: show displayname changes in recents | Emmanuel ROHEE | 2014-09-24 | 1 | -21/+28 |
| | | |||||
* | | Added hasOwnProperty tests when required to be robust to random properties ↵ | Emmanuel ROHEE | 2014-09-24 | 3 | -1/+12 |
| | | | | | | | | 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. | ||||
* | | close buttons on recents (SYWEB-68) | Matthew Hodgson | 2014-09-24 | 3 | -2/+14 |
| | | |||||
* | | close buttons on recents (SYWEB-68) | Matthew Hodgson | 2014-09-24 | 1 | -0/+0 |
| | | |||||
* | | on safari at least keypress's event.which returns ASCII rather than ↵ | Matthew Hodgson | 2014-09-23 | 1 | -1/+1 |
| | | | | | | | | keycodes, so 38 & 40 was swallowing ( and & rather than up-arrow and down-arrow(!) | ||||
* | | comment-convo with kegan | Matthew Hodgson | 2014-09-23 | 1 | -1/+10 |
| | | |||||
* | | fix yet more room id leak disasters | Matthew Hodgson | 2014-09-23 | 1 | -5/+12 |
| | | |||||
* | | oops, stupid bug on room/$room/state | Matthew Hodgson | 2014-09-23 | 2 | -4/+4 |
| | | |||||
* | | 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 | 3 | -8/+49 |
| | | | | | | | | 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 |
| | | |||||
* | | Fix SYWEB-72 : Improve performance when typing. | Kegan Dougal | 2014-09-23 | 2 | -2/+16 |
| | | | | | | | | | | | | Swapped ng-keydown to a directive, which does the same thing (check if up/down arrow then call history.goUp/goDown). This has *dramatically* improved performance when typing in rooms which have lots (>100) of messages loaded. | ||||
* | | SYWEB-28: Fixed weird members list ordering: sort members on their last ↵ | Emmanuel ROHEE | 2014-09-23 | 1 | -3/+10 |
| | | | | | | | | activity absolute time | ||||
* | | 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 |
|/ | |||||
* | Partial fix of SYWEB-28: If members do not have last_active_ago, compare ↵ | Emmanuel ROHEE | 2014-09-23 | 1 | -1/+17 |
| | | | | their presence state to order them | ||||
* | send messages to users from the home page (SYWEB-19) | Matthew Hodgson | 2014-09-23 | 3 | -4/+42 |
| | |||||
* | fix NPE | Matthew Hodgson | 2014-09-23 | 1 | -2/+1 |
| | |||||
* | Fix SYWEB-8 : Buggy tab-complete. | Kegan Dougal | 2014-09-23 | 1 | -19/+40 |
| | | | | | | | The first red blink was caused by an uninitialised search index. There is no caching of entries, since this then wouldn't update if someone joined/left during the tab. Instead, set to search index to MAX_VALUE then fix it to a valid index AFTER the search is complete. Also ditched trailing space on ": ". | ||||
* | Show display name changes in the message list. | Kegan Dougal | 2014-09-22 | 2 | -8/+30 |
| | |||||
* | Add working protractor e2e test. | Kegan Dougal | 2014-09-22 | 4 | -8/+26 |
| | | | | | | | | This uses the ignoreSynchronization flag because of the longpoll on the event stream. It would be better to use $interval, but couldn't get that to *reliably* work when testing. I suspect that $interval won't help us here, since there is genuinely an open $http connection, as we're doing a long poll. https://github.com/angular/protractor/issues/49 for more info. | ||||
* | Set required environment variables for e2e testing. | Kegan Dougal | 2014-09-22 | 3 | -6/+15 |
| | | | | | Added an 'id' to the login button so it can be automatically triggered. Also, added an onPrepare section to protractor.conf to do the login. | ||||
* | Updated test README to include a section on environment-protractor.js | Kegan Dougal | 2014-09-22 | 1 | -0/+6 |
| | | | | The environment file is .gitignored so random selenium servers aren't accidentally pushed. | ||||
* | Added boilerplate for running end-to-end tests.\nThis is done using ↵ | Kegan Dougal | 2014-09-22 | 4 | -6/+29 |
| | | | | Protractor, which looks for a .gitignored file environment-protractor.js which contains the selenium endpoint url. | ||||
* | 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 | 2 | -8/+12 |
| | | |||||
* | | Fixed unit test; it all actually works. Added a README for running the tests ↵ | Kegan Dougal | 2014-09-22 | 1 | -0/+9 |
| | | | | | | | | with karma/jasmine. | ||||
* | | 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 |
| | | |||||
* | | remove the ng-model attribute from mainInput textarea to stop the digest ↵ | Matthew Hodgson | 2014-09-20 | 2 | -16/+16 |
| | | | | | | | | being run every time you press a key (SYWEB-4) | ||||
* | | Notify a callee that their browser doesn't support VoIP too. | David Baker | 2014-09-19 | 5 | -9/+20 |
| | | | | | | | | SYWEB-14 #resolved | ||||
* | | Move video background element up as it was causing the page to scroll. | David Baker | 2014-09-19 | 1 | -1/+3 |
| | | |||||
* | | 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 | ||||
* | | SYWEB-32: made all input/textearea inherit the font of their parent | Emmanuel ROHEE | 2014-09-19 | 1 | -0/+5 |
| | | |||||
* | | Fix the "is webrtc supported" titles on buttons and make the video / voice ↵ | David Baker | 2014-09-19 | 1 | -6/+6 |
| | | | | | | | | call buttons appear in multi-user rooms but be greyed out with approriate titles. | ||||
* | | Merge branch 'videocalls' into develop | David Baker | 2014-09-19 | 6 | -19/+224 |
|\ \ | | | | | | | | | | | | | Conflicts: webclient/room/room.html | ||||
| * | | First working version of UI chrome for video calls. | David Baker | 2014-09-19 | 3 | -14/+35 |
| | | | |||||
| * | | add unprefixed filter css as well | David Baker | 2014-09-18 | 1 | -0/+2 |
| | | | |||||
| * | | Prettier and stabler video with basic support for viewing mode. For now, ↵ | David Baker | 2014-09-18 | 4 | -19/+70 |
| | | | | | | | | | | | | transition into 'large' mode is disabled. | ||||
| * | | WIP video chat layout | David Baker | 2014-09-18 | 4 | -4/+38 |
| | | | |||||
| * | | Video calling (in a tiny box at the moment) | David Baker | 2014-09-17 | 6 | -15/+106 |
| | | | |||||
* | | | SYWEB-13 SYWEB-14: disabled "Call" button if the browser does not support ↵ | Emmanuel ROHEE | 2014-09-19 | 3 | -2/+14 |
| | | | | | | | | | | | | 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 | ||||
* | | | SYWEB-13: Do not start the app if the browser does not support WEBStorage. | Emmanuel ROHEE | 2014-09-19 | 3 | -4/+37 |
| | | | | | | | | | | | | Internet Explorer case: Launch the app only for versions 9 and higher. | ||||
* | | | 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 | ||||
* | | fix SYWEB-41 (hopefully) | Matthew Hodgson | 2014-09-18 | 1 | -1/+7 |
| | | |||||
* | | Fixed missing component dependency which created a crash | Emmanuel ROHEE | 2014-09-18 | 1 | -3/+2 |
| | | |||||
* | | Added test directory, karma conf, and angular-mocks. Expect it to work? Pah, ↵ | Kegan Dougal | 2014-09-18 | 3 | -0/+2314 |
| | | | | | | | | not yet. | ||||
* | | 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 | 3 | -3/+22 |
| | | | | | | | | launching/refreshing the web page | ||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-18 | 1 | -1/+1 |
|\ \ | |||||
| * | | 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. | ||||
* | | | fix wordwrap | Matthew Hodgson | 2014-09-18 | 1 | -2/+2 |
| | | | |||||
* | | | fix binger description | Matthew Hodgson | 2014-09-18 | 1 | -3/+3 |
|/ / | |||||
* | | 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 | 2 | -12/+6 |
| | | |||||
* | | SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it ↵ | Kegan Dougal | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | plays nicer with federation. | ||||
* | | 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. | ||||
* | | Still add the room to the filtered list even if you can't work out the ↵ | Kegan Dougal | 2014-09-18 | 1 | -3/+2 |
| | | | | | | | | number of users in the room. | ||||
* | | 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 | 2 | -0/+3 |
| | | | | | | | | 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 | 4 | -1/+18 |
| | | | | | | | | doesn't clutter the recents list. | ||||
* | | SYWEB-30: BF: When switching between rooms, pagination flickered between the ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -2/+13 |
| | | | | | | | | top of the room before jumping to the bottom of the page | ||||
* | | SYWEB-22: Format emote('/me') messages correctly in desktop notification | Emmanuel ROHEE | 2014-09-17 | 1 | -1/+7 |
| | | |||||
* | | BF: edit the actual room name not the displayed room name (which has been ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -4/+9 |
| | | | | | | | | computed) | ||||
* | | SYWEB-15: Always show the room alias as well as its name in the UI | Emmanuel ROHEE | 2014-09-17 | 1 | -54/+56 |
| | | |||||
* | | SYWEB-7: Use sessionStorage to make per-room history survives when the user ↵ | Emmanuel ROHEE | 2014-09-17 | 1 | -1/+17 |
| | | | | | | | | navigates through rooms | ||||
* | | SYWEB-7: Up & down keys let user step through the history as per readline or ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -3/+72 |
| | | | | | | | | xchat | ||||
* | | WEB-35: joins/parts should trigger desktop notifications | Emmanuel ROHEE | 2014-09-17 | 1 | -4/+18 |
| | | |||||
* | | 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 | 2 | -4/+9 |
| | | | | | | | | rather than erroring out. | ||||
* | | Added basic RegExp support. | Kegan Dougal | 2014-09-16 | 2 | -5/+3 |
| | | |||||
* | | WEB-27: We don't need to show the user-count in Recents in the room ↵ | Emmanuel ROHEE | 2014-09-16 | 2 | -2/+7 |
| | | | | | | | | sidepanel - takes up too much room | ||||
* | | Bing on all the things if there are 0 bing words. | Kegan Dougal | 2014-09-16 | 2 | -0/+7 |
| | | |||||
* | | 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 | 3 | -31/+46 |
| | | |||||
* | | Added bing detection logic. Persist the display name of the user in ↵ | Kegan Dougal | 2014-09-16 | 4 | -7/+44 |
| | | | | | | | | localstorage for use when binging. | ||||
* | | Move the notification logic out of an individual room controller and into ↵ | Kegan Dougal | 2014-09-16 | 2 | -17/+19 |
| | | | | | | | | the general event handler, so we can notify for >1 room. | ||||
* | | Added a section on bing words if you enable desktop notifications. | Kegan Dougal | 2014-09-16 | 3 | -2/+19 |
|/ | |||||
* | Time out calls from both ends properly. | David Baker | 2014-09-16 | 2 | -8/+20 |
| | |||||
* | Fixed scroll flickering when opening the room | Emmanuel ROHEE | 2014-09-16 | 1 | -0/+4 |
| | |||||
* | If an initialSync has been already done on a room, we do not need to ↵ | Emmanuel ROHEE | 2014-09-16 | 1 | -2/+15 |
| | | | | paginate back to get more messages | ||||
* | WEB-29: Improve room page content loading | Emmanuel ROHEE | 2014-09-16 | 3 | -8/+26 |
| | | | | 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 | 4 | -16/+79 |
| | | | | 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 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-09-15 | 1 | -1/+1 |
| |\ | | | | | | | | | | registration-api-changes in preparation for re-merge to develop. | ||||
| * | | 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 | 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. |