summary refs log tree commit diff
path: root/webclient (follow)
Commit message (Expand)AuthorAgeFilesLines
* Reenabled handle of room states events in initialSync but do not add them to ...Emmanuel ROHEE2014-09-102-13/+13
* Presence events do not have event id. Do not discard themEmmanuel ROHEE2014-09-101-2/+2
* Improved requests: pagination is done from the data received in initialSyncEmmanuel ROHEE2014-09-103-15/+38
* Hangup call if user denies media access.David Baker2014-09-092-8/+2
* Don't try setting up the call if the user has canceled it before allowing per...David Baker2014-09-091-0/+4
* Don't break if you press the hangup button before allowing media permission.David Baker2014-09-092-2/+3
* Don't play an engaged tone if we hang up locally.David Baker2014-09-093-5/+18
* Improved room page loading flow: do pagination only when the members list is ...Emmanuel ROHEE2014-09-091-3/+5
* When the user has been kicked or banned from a room, remove the room from his...Emmanuel ROHEE2014-09-091-1/+8
* Made recents list display something when joining a room which we do not have ...Emmanuel ROHEE2014-09-091-0/+8
* BF: prevent joined messages to be displayed twice when joining a room.Emmanuel ROHEE2014-09-091-4/+16
* make calls work in FirefoxDavid Baker2014-09-091-8/+21
* Removed historical code: recents does not need to manage presences. It is alr...Emmanuel ROHEE2014-09-091-6/+0
* BF: Made the grey background of the current room cover all the cell widthEmmanuel ROHEE2014-09-091-1/+1
* Show call invites in the message tableDavid Baker2014-09-092-0/+7
* CSS tweakageKegan Dougal2014-09-081-0/+3
* Display a 'Set Topic' button if there is no topic or it's a 0-len string.Kegan Dougal2014-09-083-11/+30
* Add ability to set topic by double-clicking on the topic text then hitting en...Kegan Dougal2014-09-085-1/+59
* Fixed bug which displayed an older room topic because it was being returned f...Kegan Dougal2014-09-081-1/+13
* long topic is long. CSS support itKegan Dougal2014-09-081-0/+4
* Display public room topics if they exist on the public room list.Kegan Dougal2014-09-082-0/+10
* Display the room topic in the room, underneath the name of the room.Kegan Dougal2014-09-083-8/+33
* Bodge to default to '1 users' when you create a room, which is better than bl...Kegan Dougal2014-09-082-1/+6
* Added big massive TODOs on a huge design problem with initial syncKegan Dougal2014-09-082-1/+20
* Float right the num users, apply room highlight to user count.Kegan Dougal2014-09-082-1/+7
* Better checks are better.Kegan Dougal2014-09-081-1/+1
* Added num_joined_users key to /publicRooms for each room. Show this informati...Kegan Dougal2014-09-083-2/+9
* Added number of users in recent rooms.Kegan Dougal2014-09-082-0/+16
* Make #matrix public rooms bold to make them stand out from the other public r...Kegan Dougal2014-09-082-1/+8
* Sort the public room list by display name.Kegan Dougal2014-09-081-1/+1
* Added /join descriptionEmmanuel ROHEE2014-09-081-0/+1
* matrixService.rooms must be renamed matrixService.initialSync nowEmmanuel ROHEE2014-09-082-3/+4
* App startup improvements:Emmanuel ROHEE2014-09-083-39/+39
* add sounds to the calling interfaceDavid Baker2014-09-0811-14/+75
* fix embarassing bug where in-progress messages get vaped when the previous on...Matthew Hodgson2014-09-081-1/+3
* fix desktop notifs, which were broken in eab463fdMatthew Hodgson2014-09-082-3/+3
* Center recaptcha dialog.Kegan Dougal2014-09-081-0/+4
* disable broken event dup suppression, and fix echo for /meMatthew Hodgson2014-09-082-16/+25
* Set the room_alias field when we encounter a new one, rather than only from l...Kegan Dougal2014-09-081-2/+1
* Use the room_display_name when presenting on the home page, and not the room_...Kegan Dougal2014-09-081-1/+1
* https when loading recaptcha jsKegan Dougal2014-09-081-1/+1
* Revert "BF: Made notification work again (forgot to renamed "offline" to "una...Emmanuel ROHEE2014-09-081-1/+1
* BF: Made notification work again (forgot to renamed "offline" to "unavailable")Emmanuel ROHEE2014-09-081-1/+1
* dedup all eventsMatthew Hodgson2014-09-061-31/+42
* handle m.room.aliases for id<->alias mapping; remove local_storage map; stop ...Matthew Hodgson2014-09-064-10/+85
* Added captcha support on both the HS and web client.Kegan Dougal2014-09-056-11/+125
|\
| * Added instructions for setting up captcha in an obviously named file.Kegan Dougal2014-09-053-11/+54
| * Reload captchas when they fail. Cleanup on success.Kegan Dougal2014-09-051-0/+9
| * Added a captcha config to the HS, to enable registration captcha checking and...Kegan Dougal2014-09-051-1/+0
| * Added webclient config.js for storing recaptcha public key.Kegan Dougal2014-09-053-5/+29
| * Modified matrixService.register to specify if captcha results should be sent ...Kegan Dougal2014-09-052-6/+28
| * Added basic captcha, not hooked upKegan Dougal2014-09-053-3/+20
* | Better call bar (visually: still lacks ring[back] tones).David Baker2014-09-067-18/+112
|/
* BF: tab completion did not work with commands. $scope.input contained only th...Emmanuel ROHEE2014-09-051-1/+10
* BF: Update the members list on banned & kicked "events"Emmanuel ROHEE2014-09-051-4/+13
* autoscroll down(if the scroller was already at the bottom) when receiving mem...Emmanuel ROHEE2014-09-051-13/+18
* doc: kick can take a reason argEmmanuel ROHEE2014-09-051-1/+1
* Created kick & unban methods in matrixService. Made some factorisation.Emmanuel ROHEE2014-09-052-23/+24
* Added sanity checks in commandsEmmanuel ROHEE2014-09-051-34/+55
* BF: Make /unban work againEmmanuel ROHEE2014-09-052-2/+2
* Display ban & kick reasonEmmanuel ROHEE2014-09-052-1/+14
* Fixed empty display name (content.displayname in a room member can be null)Emmanuel ROHEE2014-09-051-1/+3
* Revert "Fixed empty display name (content.displayname in a room member can be...Emmanuel ROHEE2014-09-051-6/+0
* Fixed empty display name (content.displayname in a room member can be null)Emmanuel ROHEE2014-09-051-0/+6
* BF: Fixed members list layout when the scrollbar appearsEmmanuel ROHEE2014-09-051-1/+3
* BF: Show "Bob invited you" in recents when Bob invites the userEmmanuel ROHEE2014-09-051-1/+5
* hide the forgot password link until it worksDavid Baker2014-09-051-2/+2
* Fixed duplicated messages sending in slow network condition.Emmanuel ROHEE2014-09-053-5/+55
* Cleaned all sending references as it not usedEmmanuel ROHEE2014-09-051-22/+4
* Do not systematically scroll to the bottom on new events in the roomEmmanuel ROHEE2014-09-051-2/+8
* switch IRC-style command parser to use regexps rather than split(" ") so that...Matthew Hodgson2014-09-042-55/+96
* BF: presence PUT requests stopped to work with old "state" param yesterday ev...Emmanuel ROHEE2014-09-041-1/+1
* Fixed registration flow when registering with matrixID & password and no emailEmmanuel ROHEE2014-09-041-1/+1
* Added mUserDisplayName, a filter to resolve a user display name from a user_idEmmanuel ROHEE2014-09-042-9/+42
* Moved mRoomName filter into matrix-filter.js, a place for all generic filters...Emmanuel ROHEE2014-09-047-86/+106
* Re-apply fixes to the link-email screen to make it work again (in a somewhat ...David Baker2014-09-042-27/+54
* BF: Do not filter incoming member events. Before, only invitations to the cur...Emmanuel ROHEE2014-09-041-7/+2
* Report ban/unban messages to recents listsEmmanuel ROHEE2014-09-041-8/+19
* Hide email link UI from the settings because it doesn't work.David Baker2014-09-031-2/+2
* Added more ng-if to make nice sentences like "Bob kicked Alice" or "Bob unba...Emmanuel ROHEE2014-09-031-4/+13
* better error msgsMatthew Hodgson2014-09-031-3/+3
* Ignore leave members in the list tooEmmanuel ROHEE2014-09-031-2/+2
* Fixed used of state_key instead of user_id in member events.Emmanuel ROHEE2014-09-031-4/+7
* Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2014-09-0325-53/+245
|\
| * Fix ban pathErik Johnston2014-09-031-1/+1
| * Fix a few cases where we used user_id instead of state_keyErik Johnston2014-09-032-6/+6
| * Normalise users power levels so that the user with the higher power level wil...Emmanuel ROHEE2014-09-032-1/+24
| * Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of ...Emmanuel ROHEE2014-09-032-3/+15
| * fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org has...Matthew Hodgson2014-09-0322-22/+22
| * List commands and their usage in the settings pageEmmanuel ROHEE2014-09-031-0/+15
| * Added /kick $user_idEmmanuel ROHEE2014-09-031-4/+14
| * Added /unban $user_idEmmanuel ROHEE2014-09-031-0/+10
| * Add support for room namesErik Johnston2014-09-032-2/+20
| * Send unrecognized commands as text message (as before)Emmanuel ROHEE2014-09-031-1/+2
| * Do not define power level limits in setUserPowerLevel. Update the function to...Emmanuel ROHEE2014-09-032-35/+3
| * Added /deop $user_idEmmanuel ROHEE2014-09-032-3/+36
| * BF: Do not be polluted by ops events that come when paginating backEmmanuel ROHEE2014-09-031-2/+5
| * Added /op $user_id $powerLevelEmmanuel ROHEE2014-09-033-7/+59
| * Better indicate in the page feedback section that a user can't join a room (b...Emmanuel ROHEE2014-09-031-1/+2
| * Do not show banned people in member list. Format ban events strings in room a...Emmanuel ROHEE2014-09-033-4/+10
| * Added /ban commandEmmanuel ROHEE2014-09-032-1/+29
| * Made IRC style command easier to handle specifically for possible argumentsEmmanuel ROHEE2014-09-031-10/+22
* | Make registering and logging in with a threepid work in the webclient.David Baker2014-09-035-27/+113
|/
* Merge branch 'master' into developErik Johnston2014-09-031-2/+2
|\
| * Hide the email textbox during registeration has it has not been wired up yet.Erik Johnston2014-09-021-2/+2
* | roomName directive: Take into account invited users.Emmanuel ROHEE2014-09-021-1/+38
* | make power level more visibleMatthew Hodgson2014-09-021-3/+3
* | Attempt to make avatar change clearerEmmanuel ROHEE2014-09-022-4/+15
* | BF: Reset base timer time ($scope.now) everytime last_active_ago is touchedEmmanuel ROHEE2014-09-021-7/+6
|/
* BF: Prevent controllers from being instantiated twice.Emmanuel ROHEE2014-09-021-14/+7
* Handle "m.room.create" in order to inform controllers about new roomsEmmanuel ROHEE2014-09-023-5/+29
* Represent user power level in a room by a red bar at the bottom of his avatar...Emmanuel ROHEE2014-09-025-0/+60
* BF: Armed updateMemberListPresenceAge only onceEmmanuel ROHEE2014-09-021-1/+3
* BF: Take into account MEMBER_EVENT and PRESENCE_EVENT events only after the i...Emmanuel ROHEE2014-09-021-2/+6
* Follow API renaming. state -> presence. mtime_ago -> last_active_agoEmmanuel ROHEE2014-09-013-16/+15
* Added roomName, a directive to compute a room name based on its alias (not al...Emmanuel ROHEE2014-09-014-5/+45
* Oops, show the voice call button once a call has endedDavid Baker2014-09-011-1/+1
* Fairly simple move of the call status widget to the header bar (and therefore...David Baker2014-09-015-40/+44
* BF: Check config exists (=defined in the localstorage) before using itEmmanuel ROHEE2014-09-011-2/+6
* missing semicolonDavid Baker2014-09-011-1/+1
* Handle call events in the recents view as well to get consistency with what i...David Baker2014-09-011-0/+5
* Just show 'Call' for call events. Don't just splat out the content of the eve...David Baker2014-09-011-1/+3
* Fixed presence change that occurs -Xs agoEmmanuel ROHEE2014-09-011-0/+5
* Fixed presence state update. Specifically, the current user was sometimes ind...Emmanuel ROHEE2014-09-011-5/+23
* Don't show the hang up button once tha call has endedDavid Baker2014-09-011-1/+1
* make the little logos clickable for ErikMatthew Hodgson2014-09-016-7/+7
* BF: Pass desired_user_id to register API. And update the app header to avoid ...Emmanuel ROHEE2014-09-012-2/+10
* licenses, please...Matthew Hodgson2014-09-012-2/+32
* fix footer on non-room pagesMatthew Hodgson2014-09-011-1/+0
* don't make HS ports explicit if it's the default for the protocolMatthew Hodgson2014-08-312-2/+8
* change the world: make the default matrix API URL prefix /_matrix rather than...Matthew Hodgson2014-08-312-7/+7
* make lightbox a bit less uglyMatthew Hodgson2014-08-311-2/+6
* only show presence timings if we know themMatthew Hodgson2014-08-311-1/+1
* nasty big monolithic commit of a whole bunch of UI/UX improvements:Matthew Hodgson2014-08-3115-310/+356
* factor out mobile css into its own fileMatthew Hodgson2014-08-311-0/+92
* factor out the signup process into its own controllerMatthew Hodgson2014-08-312-0/+127
* moar logos!Matthew Hodgson2014-08-312-0/+0
* switch default profile image to one of our own devising (dating back to commu...Matthew Hodgson2014-08-312-0/+0
* tweaks to settings pageMatthew Hodgson2014-08-302-28/+16
* actually add a 'home' buttonMatthew Hodgson2014-08-301-0/+1
* shrink text bubble font a bit; make image thumbnails always fit in their bubblesMatthew Hodgson2014-08-301-1/+6
* Give basic feedback on the state of VoIP calls in the UI.David Baker2014-08-293-3/+6
* todoMatthew Hodgson2014-08-291-1/+1
* fix mobile skin by hiding recents LHS in /roomsMatthew Hodgson2014-08-291-0/+2
* oops. Should not have c+p all linesEmmanuel ROHEE2014-08-291-2/+0
* Implemented /nickEmmanuel ROHEE2014-08-291-0/+4
* Get user display name and avatar from the server rather than storing them in ...Emmanuel ROHEE2014-08-294-21/+68
* update presence times in realtime through the magic of two-way bindingMatthew Hodgson2014-08-292-35/+15
* Show desktop notification state. Provide help if the user has previously deni...Emmanuel ROHEE2014-08-293-14/+39
* better support for call hangupsDavid Baker2014-08-291-16/+16
* The away state is unavailable not offlineEmmanuel ROHEE2014-08-291-7/+7
* Only show voice call button if there are exactly 2 members in the room. Also ...David Baker2014-08-292-3/+7
* Oops, forgot a s/sendObject/sendEvent/ - make messages work again!David Baker2014-08-291-1/+1
* Don't break if the call ends before it connectsDavid Baker2014-08-291-12/+20
* Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2014-08-291-10/+9
|\
| * Show notifications only when the user is detected as idleEmmanuel ROHEE2014-08-291-10/+9
* | Change call signalling messages to be their own types of room events rather t...David Baker2014-08-295-18/+27
|/
* Merge branch 'voip' into developDavid Baker2014-08-297-3/+379
|\
| * More basic functionality for voip calls (like hanging up)David Baker2014-08-293-5/+69
| * First basic working VoIP call supportDavid Baker2014-08-284-16/+161
| * WIP voip support on web clientDavid Baker2014-08-277-3/+170
* | Cleaned up ng deps. By convention, angular modules must be listed at firstEmmanuel ROHEE2014-08-291-3/+3
* | Added a timeout(40s) to $http stream requests (/events) in order to be notifi...Emmanuel ROHEE2014-08-292-10/+27
* | Recents update: do not care of events coming from the past (they are fired wh...Emmanuel ROHEE2014-08-291-2/+4
* | Display emotes in the recents listEmmanuel ROHEE2014-08-291-0/+5
* | ng-show exists. So, for clarity, avoid to use ng-hide and double negation test.Emmanuel ROHEE2014-08-291-4/+4
* | Renamed matrixService.assignRoomAliases into getRoomAliasAndDisplayNameEmmanuel ROHEE2014-08-293-32/+45
* | Do a smart update of the recents from the events stream rather than hammering...Emmanuel ROHEE2014-08-281-7/+21
* | When opening this page, do not join a room already joinedEmmanuel ROHEE2014-08-281-26/+51
* | Added waitForInitialSyncCompletion so that clients can know when they can acc...Emmanuel ROHEE2014-08-282-9/+24
* | BF: Made member events parsing work (handleEvents expects an array of events)Emmanuel ROHEE2014-08-281-8/+4
* | Cleaned up depsEmmanuel ROHEE2014-08-283-6/+6
* | Start the events stream once the app starts (if credentials are in cache) or ...Emmanuel ROHEE2014-08-284-9/+4
|/
* Wired the recents list with the stream events for realtime updateEmmanuel ROHEE2014-08-271-9/+10
* improve iOS layout a bitMatthew Hodgson2014-08-271-0/+10
* BF: mFileInput dependency got lost somewhere and upload buttons did not work ...Emmanuel ROHEE2014-08-272-2/+2
* Highlight the current room in the recents listEmmanuel ROHEE2014-08-274-2/+16
* Added the recents component at the left hand side of the room pageEmmanuel ROHEE2014-08-272-1/+14
* BF: use room_id if there is no aliasEmmanuel ROHEE2014-08-271-1/+1
* Sort recents in anti-chronological orderEmmanuel ROHEE2014-08-273-1/+49
* Moved recents things into a separate (and reusable) controlerEmmanuel ROHEE2014-08-276-117/+126
* Moved assignRoomAliases into a central piece: matrixService for nowEmmanuel ROHEE2014-08-271-0/+34
* Cleaned ng dependenciesEmmanuel ROHEE2014-08-271-3/+3
* home/recents: show the last message of each messageEmmanuel ROHEE2014-08-273-8/+102
* Rename go() into goToPage() which is available from everywhere thanks to the ...Emmanuel ROHEE2014-08-272-2/+6
* Support limit and feedback param of initialSyncEmmanuel ROHEE2014-08-272-3/+15
* Renamed /ds to /directoryKegan Dougal2014-08-271-1/+1
* Renamed /public/rooms to /publicRoomsKegan Dougal2014-08-271-1/+1
* fix joining rooms on webclientDavid Baker2014-08-271-1/+2
* Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and remov...Kegan Dougal2014-08-271-1/+1
* Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmd...Kegan Dougal2014-08-261-6/+5
* Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro...Kegan Dougal2014-08-261-3/+3
* Avoid double call of refresh at app startupEmmanuel ROHEE2014-08-262-5/+7
* Determine and send user presence stateEmmanuel ROHEE2014-08-264-5/+140
* webclient: Updated to use /rooms/$roomid/[invite|join|leave]Kegan Dougal2014-08-261-7/+11
* Adjusted webclient to use new state paths. Updated membership msg template to...Kegan Dougal2014-08-265-46/+22
* The landing URL is now '#/' which actually points to homeControllerEmmanuel ROHEE2014-08-251-2/+2
* Merge remote-tracking branch 'origin/hotfixes-0.0.1' into developEmmanuel ROHEE2014-08-255-30/+109
|\
| * oopsMatthew Hodgson2014-08-231-1/+1
| * very quick and dirty responsive design for iPhonesMatthew Hodgson2014-08-236-30/+110
| * avatar urlroot2014-08-221-1/+1
* | Oops. Removed my NetBeans private foldersEmmanuel ROHEE2014-08-253-39/+0
* | Added "Your name" as placeholder to help user understand what is this alone i...Emmanuel ROHEE2014-08-221-1/+1
* | Merge branch 'settings-page' into developEmmanuel ROHEE2014-08-2215-452/+503
|\ \ | |/ |/|
| * Use /home everywhereEmmanuel ROHEE2014-08-226-12/+12
| * renamed rooms to home - renamed filesEmmanuel ROHEE2014-08-224-0/+23
| * renamed rooms to homeEmmanuel ROHEE2014-08-223-0/+16
| * Move profile parts of the rooms page and the config content into a new page: ...Emmanuel ROHEE2014-08-228-201/+237
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1Erik Johnston2014-08-223-24/+58
|\ \
| * | Update web client to use new IS API.David Baker2014-08-223-24/+58
* | | Check if the membership message was for the room we were in before updating t...Erik Johnston2014-08-221-0/+2
* | | Keep track of people's presence and query that when we update the members list.Erik Johnston2014-08-222-3/+10
* | | Reinitialize room when creating a RoomController so that we start off with a ...Erik Johnston2014-08-222-1/+13
| |/ |/|
* | Use $location.url instead of $location.path to get clean page URL without has...Emmanuel ROHEE2014-08-224-10/+10
* | Make the content repo work with in daemon mode. Return the full url on upload...Erik Johnston2014-08-221-1/+1
* | resizeImage: generate an image in the format of the original image. (Tested w...Emmanuel ROHEE2014-08-221-1/+3
* | Safari needs the img.onload event before actually working on the imgEmmanuel ROHEE2014-08-222-27/+39
* | improve leftBlock cssMatthew Hodgson2014-08-221-1/+6
* | fix mainInput retaining focus between sending consecutive messages by disabli...Matthew Hodgson2014-08-222-4/+4
* | fix weird fontsizes on iOSMatthew Hodgson2014-08-221-0/+1
* | sacrifice a goat or two to make wordwrap actually work properlyMatthew Hodgson2014-08-222-28/+21
* | rename autoComplete directive as tabComplete to avoid confusion with the auto...Matthew Hodgson2014-08-221-15/+15
* | add fixme pointing out name disambiguation is a bit flakeyMatthew Hodgson2014-08-221-1/+4
* | actually display room metadata based on m.room.membe eventsMatthew Hodgson2014-08-213-2/+23
* | Add a var.Erik Johnston2014-08-211-1/+1
* | Only start event streaming after having set up the controllers.Erik Johnston2014-08-215-4/+17
* | Change webclient to always hit the im sync api before streaming so we get cur...Erik Johnston2014-08-212-7/+41
* | stop hammering the HS for displayname and avatar URLsMatthew Hodgson2014-08-211-3/+5
* | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1Erik Johnston2014-08-216-38/+294
|\|
| * Show image fullscreen when clicking on the thumbnailEmmanuel ROHEE2014-08-212-3/+31
| * If there are available, show image thumbnails in the messages listEmmanuel ROHEE2014-08-211-3/+7
| * Generate thumbnail client side and send its URL and info with the image messa...Emmanuel ROHEE2014-08-213-28/+149
| * Made uploadContent compatible for sending Blob objectsEmmanuel ROHEE2014-08-211-4/+22
| * Added resizeImage()Emmanuel ROHEE2014-08-211-1/+86
* | Use the new 'inviter' key from im sync for room display names.Erik Johnston2014-08-212-3/+8
* | Fixed first pagination detectionEmmanuel ROHEE2014-08-211-2/+3
* | cheer up erik and remove the double-horizontal-border between adjacent text p...Matthew Hodgson2014-08-211-0/+1
|/
* Quick fix to support array of room aliasesEmmanuel ROHEE2014-08-201-2/+3
* BF: Apply image place holder only if the image message has the height informa...Emmanuel ROHEE2014-08-201-1/+1
* BF: Wait for the room_id being resolved before starting paginationEmmanuel ROHEE2014-08-201-2/+2
* Create a placeholder for each image of the chat thread. The height of this pl...Emmanuel ROHEE2014-08-201-1/+4
* Send images with their imageInfo (size, mymetype, width & height)Emmanuel ROHEE2014-08-205-17/+89
* Sanitize message text content only if the type of current message in the ng-r...Emmanuel ROHEE2014-08-201-2/+2
* Replaced the image URL text input by a file selector button: "Send Image"Emmanuel ROHEE2014-08-202-18/+5
* Disabled sending buttons while a message is being sent. Useful on bad Interne...Emmanuel ROHEE2014-08-202-6/+18
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-08-206-170/+254
|\
| * File organisation sanity: put directives and filters into dedicated filesEmmanuel ROHEE2014-08-206-197/+254
| * keepScroll: a directive to anchor the scroller position at the bottom when th...Emmanuel ROHEE2014-08-191-0/+27
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-192-4/+2
|\|
| * BF: The enter key in the image URL box called sendImage() with no argumentEmmanuel ROHEE2014-08-191-1/+1