summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Update spec with the lifetime field.David Baker2014-09-161-2/+8
* Use event age to recognise which calls are current and which aren't and hence...David Baker2014-09-164-16/+79
* Comment out password reset for now, until the mechanism is fully discussed (I...Kegan Dougal2014-09-161-1/+1
* Added support for the HS to send emails. Use it to send password resets. Adde...Kegan Dougal2014-09-164-2/+130
* Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need to...Kegan Dougal2014-09-162-1/+50
* Merge remote-tracking branch 'origin/develop' into webclient_data_centralisationEmmanuel ROHEE2014-09-1628-233/+709
|\
| * Fix bug where we didn't always get 'prev_content' keyErik Johnston2014-09-151-4/+1
| * Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than t...Erik Johnston2014-09-152-2/+4
| * Correctly handle receiving 'missing' Pdus from federation, rather than just d...Erik Johnston2014-09-153-13/+18
| * Improve logging in federation handler.Erik Johnston2014-09-151-1/+3
| * Fix unit tests after adding extra argument on put_jsonErik Johnston2014-09-153-10/+28
| * Fix 'age' key to update on retriesErik Johnston2014-09-153-8/+41
| * More helpful 400 error messages.Kegan Dougal2014-09-151-1/+5
| * Updated CHANGES and UPGRADE to reflect registration API changes.Kegan Dougal2014-09-152-0/+34
| * Be consistent when associating keys with login types for registration/login.Kegan Dougal2014-09-154-4/+4
| * Merge branch 'develop' of github.com:matrix-org/synapse into registration-api...Kegan Dougal2014-09-1511-16/+52
| |\
| | * Correctly handle the 'age' key in events and pdusErik Johnston2014-09-1510-15/+51
| * | Update spec to include m.login.email.identityKegan Dougal2014-09-151-1/+26
| * | Fix unit tests.Kegan Dougal2014-09-151-2/+8
| * | Updated cmdclient to use new registration logic.Kegan Dougal2014-09-151-11/+26
| * | Make captcha work again with the new registration logic.Kegan Dougal2014-09-152-1/+22
| * | Updated webclient to support the new registration logic.Kegan Dougal2014-09-151-23/+120
| * | Split out password/captcha/email logic.Kegan Dougal2014-09-152-140/+217
| * | Added LoginType constants. Created general structure for processing registrat...Kegan Dougal2014-09-152-20/+84
| * | Merge branch 'develop' of github.com:matrix-org/synapse into registration-api...Kegan Dougal2014-09-1573-3922/+8162
| |\ \
| * | | Updated spec and api docs to desired new format.Kegan Dougal2014-09-082-33/+73
* | | | Filter room where the user has been bannedEmmanuel ROHEE2014-09-152-5/+29
* | | | Recents must not show temporary fake messagesEmmanuel ROHEE2014-09-154-10/+32
* | | | Recents uses data directly from $rootscope.eventsEmmanuel ROHEE2014-09-154-171/+95
| |_|/ |/| |
* | | BF: inviter field has moved to the room root objectEmmanuel ROHEE2014-09-151-1/+1
| |/ |/|
* | BF: presence and eventMap were not reset at logout.Emmanuel ROHEE2014-09-151-10/+14
* | Use "white-space: pre-wrap" for "Text will wrap when necessary, and on line b...Emmanuel ROHEE2014-09-151-3/+2
* | Merge remote-tracking branch 'origin/master' into developEmmanuel ROHEE2014-09-153-3/+6
|\ \
| * | unbreak wordwrapping by breaking multiline paste for nowMatthew Hodgson2014-09-131-1/+2
| * | always scroll to bottom when entering a roomMatthew Hodgson2014-09-131-2/+2
| * | more wishlistMatthew Hodgson2014-09-131-0/+2
* | | Define a CLOS-like 'around' modifier as a decorator, to neaten up the 'orig_*...Paul "LeoNerd" Evans2014-09-121-10/+23
* | | Add some docstringsPaul "LeoNerd" Evans2014-09-121-0/+6
* | | Additionally look first for a 'loglevel' attribute on the running test method...Paul "LeoNerd" Evans2014-09-121-3/+7
* | | Define a (class) decorator for easily setting a DEBUG logging level on a Test...Paul "LeoNerd" Evans2014-09-121-0/+5
* | | Allow a TestCase to set a 'loglevel' attribute, which overrides the logging l...Paul "LeoNerd" Evans2014-09-121-1/+22
* | | Have all unit tests import from our own subclass of trial's unittest TestCase...Paul "LeoNerd" Evans2014-09-1221-61/+52
* | | Update CHANGES.rst v0.2.3Erik Johnston2014-09-121-0/+3
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-124-2/+23
|\| |
| * | SpellcheckErik Johnston2014-09-121-1/+1
| * | Add note about glare supportErik Johnston2014-09-121-0/+1
| * | Merge branch 'release-v0.2.3' of github.com:matrix-org/synapseErik Johnston2014-09-1261-3887/+8091
| |\ \
| | * | Bump version and change logErik Johnston2014-09-123-2/+21
| * | | fix embarassing bug where in-progress messages get vaped when the previous on...Matthew Hodgson2014-09-061-1/+3
| * | | Merge branch 'release-v0.2.2' of github.com:matrix-org/synapseErik Johnston2014-09-062-3/+3
| |\ \ \
| * \ \ \ Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse v0.2.2Erik Johnston2014-09-0658-373/+1473
| |\ \ \ \
| * | | | | Minor spec tweaks.Kegan Dougal2014-09-051-3/+5
* | | | | | Update the spec document to replace the candidate message with the candidates...David Baker2014-09-121-3/+3
* | | | | | Send multiple candidates at once instead of all individually. Changes spec to...David Baker2014-09-122-9/+58
| |_|_|/ / |/| | | |
* | | | | Fix bug where we relied on the current_state_events being updated when we are...Erik Johnston2014-09-121-2/+2
* | | | | Fix bug where we no longer stored user_id on PdusErik Johnston2014-09-121-1/+7
* | | | | Make the state resolution use actual power levels rather than taking them fro...Erik Johnston2014-09-125-127/+194
* | | | | Fix bug where we incorrectly removed a remote host from the list of hosts in ...Erik Johnston2014-09-121-12/+45
* | | | | Fix bug where we didn't return a tuple when expected.Erik Johnston2014-09-121-1/+1
* | | | | Clean data when user logs outEmmanuel ROHEE2014-09-124-11/+36
* | | | | Retry sending events that fail to send.David Baker2014-09-121-11/+28
* | | | | Fixed displayname resolution of emote senderEmmanuel ROHEE2014-09-121-1/+1
* | | | | Fixed public room name and users count alignementEmmanuel ROHEE2014-09-122-25/+46
* | | | | Some words about glareDavid Baker2014-09-121-1/+27
* | | | | Always pick the incoming call if we've not yet sent out our invite, otherwise...David Baker2014-09-122-5/+14
* | | | | Remove the local AV stream from ourselves when handing it off to a new call o...David Baker2014-09-121-0/+6
* | | | | CSS m.room.topic and m.room.name events in the historyEmmanuel ROHEE2014-09-121-1/+1
* | | | | Handle NAME_EVENT to get room name update eventEmmanuel ROHEE2014-09-121-0/+5
* | | | | Added edition of room nameEmmanuel ROHEE2014-09-124-12/+61
* | | | | Show room name updates in room history and recents.Emmanuel ROHEE2014-09-124-38/+50
* | | | | BF: temp workaround while /initialSync on a particular room is not availableEmmanuel ROHEE2014-09-121-0/+5
* | | | | few fixes for errors in glare conditions. still seem to end up with no audio ...David Baker2014-09-112-5/+4
* | | | | Put back the line that adds the stream to the invite, otherwise caller->calle...David Baker2014-09-111-0/+1
* | | | | Fix bug where web client wold break trying to add the earliest token without ...David Baker2014-09-111-12/+1
* | | | | Clearly show when an user cannot join a room.Emmanuel ROHEE2014-09-112-10/+39
* | | | | start towards glare support (currently not much better but no worse than befo...David Baker2014-09-113-60/+116
* | | | | Added support of copy/paste of multi lines contentEmmanuel ROHEE2014-09-112-1/+7
* | | | | Use autofill-event.js to workaround browsers issue: Form model doesn't update...Emmanuel ROHEE2014-09-112-0/+118
* | | | | Invite: reset the input when the invitation has been doneEmmanuel ROHEE2014-09-112-5/+6
* | | | | Enable enter key in the invite inputEmmanuel ROHEE2014-09-111-1/+1
* | | | | On member avatar mouseover, show user_id and power levelEmmanuel ROHEE2014-09-111-1/+1
* | | | | Room topic: if the request fails, show the error in the feedbackEmmanuel ROHEE2014-09-111-1/+8
* | | | | BF: made input autofocus work when opening the room topic inputEmmanuel ROHEE2014-09-112-2/+6
* | | | | Show room topic change in the chat history and in the recentsEmmanuel ROHEE2014-09-114-4/+35
* | | | | getRoomEventIndex: improved speed for what it is usedEmmanuel ROHEE2014-09-111-3/+4
* | | | | Merge remote-tracking branch 'origin/develop' into webclient_initialSyncEmmanuel ROHEE2014-09-1013-3434/+6381
|\ \ \ \ \
| * | | | | Animation on call end icon.David Baker2014-09-104-16/+14
| * | | | | Upgrade angularjs to 1.3.0-rc1 since this is new developmentDavid Baker2014-09-108-3414/+6346
| * | | | | Add text for incoming callsDavid Baker2014-09-101-0/+1
| * | | | | Show mxid in call bar for users with no displaynameDavid Baker2014-09-101-1/+6
| * | | | | Less buggy rejection of calls when busyDavid Baker2014-09-102-13/+20
| * | | | | reject calls if there's already a call in progressDavid Baker2014-09-101-0/+4
* | | | | | Show echoed emote with transparencyEmmanuel ROHEE2014-09-101-1/+4
* | | | | | Reenabled transparent echo message. It turns to opaque without flickering now.Emmanuel ROHEE2014-09-102-19/+40
* | | | | | Clean previous request feedback when doing a new requestEmmanuel ROHEE2014-09-101-0/+3
* | | | | | BF: Made /op work when providing no power value. 50 is used as default in thi...Emmanuel ROHEE2014-09-101-1/+1
* | | | | | Made users count auto updating. Do show it if the info is not available (ex:u...Emmanuel ROHEE2014-09-102-12/+30
* | | | | | Member event: store use the the latest oneEmmanuel ROHEE2014-09-101-2/+7
* | | | | | Removed wrong comments about recents-controller.js: it uses $rootScope.rooms ...Emmanuel ROHEE2014-09-102-25/+2
* | | | | | dedup events: state events conflict with messages events. Do not consider the...Emmanuel ROHEE2014-09-101-7/+9
* | | | | | Reenabled handle of room states events in initialSync but do not add them to ...Emmanuel ROHEE2014-09-102-13/+13
* | | | | | Presence events do not have event id. Do not discard themEmmanuel ROHEE2014-09-101-2/+2
* | | | | | Improved requests: pagination is done from the data received in initialSyncEmmanuel ROHEE2014-09-103-15/+38
|/ / / / /
* | | | | More rst formatting.Kegan Dougal2014-09-091-5/+6
* | | | | Extra restrictions to make parsing easier.Kegan Dougal2014-09-091-1/+8
* | | | | TyopsKegan Dougal2014-09-091-7/+7
* | | | | Added initial draft for human-readable ID rules.Kegan Dougal2014-09-091-0/+71
* | | | | Move model to client-server for now.Kegan Dougal2014-09-097-0/+0
* | | | | 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
* | | | | Fix bug where we used an unbound local variable if we ended up rolling back t...Erik Johnston2014-09-091-4/+1
* | | | | 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
* | | | | Update jsfiddles to have more helpful error messages when there is no connect...Kegan Dougal2014-09-084-5/+30
* | | | | Add slightly helpful advice on how to generate config if you don'y already ha...Erik Johnston2014-09-081-0/+1
* | | | | Don't autogen config in synctl for the same reasons we don't turn of --genera...Erik Johnston2014-09-081-6/+2
* | | | | Apparently we can't do txn.rollback(), so raise and catch an exception instead.Erik Johnston2014-09-081-11/+19
* | | | | Added demo.detailsKegan Dougal2014-09-081-0/+7
* | | | | Updated jsfiddle links to point to githubKegan Dougal2014-09-081-5/+5
* | | | | 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-084-2/+15
* | | | | Handle the case where we don't have a common ancestorErik Johnston2014-09-082-9/+42
* | | | | Added number of users in recent rooms.Kegan Dougal2014-09-082-0/+16
* | | | | Fix bug in state handling where we incorrectly identified a missing pdu. Upda...Erik Johnston2014-09-083-67/+267
* | | | | 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
* | | | | Rollback if we try and insert duplicate eventsErik Johnston2014-09-081-0/+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
* | | | Merge branch 'origin/release-v0.2.2' into developEmmanuel ROHEE2014-09-080-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | fix desktop notifs, which were broken in eab463fdMatthew Hodgson2014-09-062-3/+3
| | |/ | |/|
| * | Center recaptcha dialog.Kegan Dougal2014-09-061-0/+4
| * | Remove disabled change from CHANGESErik Johnston2014-09-061-1/+0
| * | disable broken event dup suppression, and fix echo for /meMatthew Hodgson2014-09-062-16/+25
| * | Set the room_alias field when we encounter a new one, rather than only from l...Kegan Dougal2014-09-061-2/+1
| * | Use the room_display_name when presenting on the home page, and not the room_...Kegan Dougal2014-09-061-1/+1
| * | https when loading recaptcha jsKegan Dougal2014-09-061-1/+1
| * | Fix race in presence handler where we evicted things from cache while handlin...Erik Johnston2014-09-061-2/+3
| * | Bump version and changelogErik Johnston2014-09-063-2/+23
* | | 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
* | | Remove disabled change from CHANGESErik Johnston2014-09-081-1/+0
* | | 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
* | | Fix race in presence handler where we evicted things from cache while handlin...Erik Johnston2014-09-081-2/+3
* | | Bump version and changelogErik Johnston2014-09-083-2/+23
* | | Minor spec tweaks.Kegan Dougal2014-09-081-3/+5
* | | 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
* | add todoMatthew Hodgson2014-09-061-0/+4
* | Fix state unit testErik Johnston2014-09-061-0/+1
* | Fix bug where we used an event_id as a pdu_idErik Johnston2014-09-061-3/+5
* | Unit tests do not need captchas.Kegan Dougal2014-09-051-0/+1
* | Added captcha support on both the HS and web client.Kegan Dougal2014-09-0513-21/+309
|\ \
| * | 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-052-2/+11
| * | 80 chars pleaseKegan Dougal2014-09-052-11/+23
| * | Add config opion for XFF headers when performing ReCaptcha auth.Kegan Dougal2014-09-053-2/+12
| * | Captchas now work on registration. Missing x-forwarded-for config arg support...Kegan Dougal2014-09-054-7/+115
| * | Added a captcha config to the HS, to enable registration captcha checking and...Kegan Dougal2014-09-055-3/+44
| * | Added webclient config.js for storing recaptcha public key.Kegan Dougal2014-09-054-5/+31
| * | 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
* | | Fix generation of event ids so that they are consistent between local and rem...Erik Johnston2014-09-061-1/+4
* | | When getting a state event also include the previous contentErik Johnston2014-09-065-13/+43
* | | Document new invite key added to createRoom apiErik Johnston2014-09-061-0/+10
* | | Add support for inviting people when you create a roomErik Johnston2014-09-061-0/+26
* | | Better call bar (visually: still lacks ring[back] tones).David Baker2014-09-067-18/+112
* | | Add m.roo.aliasesErik Johnston2014-09-051-0/+16
* | | Validate power levels event changes. Change error messages to be more helpful...Erik Johnston2014-09-051-10/+37
* | | Generate m.room.aliases event when the HS creates a room aliasErik Johnston2014-09-0510-18/+94
|/ /
* | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-09-0516-246/+578
|\ \
| * | 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
| * | Add demo/etc to .gitignoreMark Haines2014-09-051-0/+1
| * | 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
| * | merge spec changesMatthew Hodgson2014-09-041-13/+27
| * | switch IRC-style command parser to use regexps rather than split(" ") so that...Matthew Hodgson2014-09-042-55/+96
| * | Add version 0 of the VoIP specification.David Baker2014-09-041-11/+97
| * | Merge branch 'master' into developMark Haines2014-09-040-0/+0
| |\|
| | * 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
| | * Merge branch 'develop' of github.com:matrix-org/synapse v0.2.1aErik Johnston2014-09-042-16/+43
| | |\
| * | | 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
| | |/ | |/|
* | | Empty string is not a valid JSON object, so don't return them in HTTP responses.Erik Johnston2014-09-053-7/+7
* | | AUth the contents of power level eventsErik Johnston2014-09-051-1/+72
* | | Change the default power levels to be 0, 50 and 100Erik Johnston2014-09-052-10/+10
|/ /
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-044-15/+16
|\|
| * make synctl default to homesever.logMatthew Hodgson2014-09-031-3/+3
| * Merge branch 'release-v0.2.1' v0.2.1Erik Johnston2014-09-03189-1090/+4260
| |\
| | * Bump versions. Update change logs.Erik Johnston2014-09-033-2/+19
* | | big warningMatthew Hodgson2014-09-041-0/+17
* | | target live siteMatthew Hodgson2014-09-041-2/+2
* | | changelog for v0.2.1Matthew Hodgson2014-09-041-0/+16
* | | update README to know about synctlMatthew Hodgson2014-09-041-14/+24
| |/ |/|
* | Added a simple start/stop control scriptPaul "LeoNerd" Evans2014-09-031-0/+38
* | Added a TODO note about YAML modeline for editorsPaul "LeoNerd" Evans2014-09-031-0/+3
* | Error code must be an integerErik Johnston2014-09-031-1/+1
* | Import SynapseErrorErik Johnston2014-09-031-0/+1
* | Handle timeouts slightly nicer.Erik Johnston2014-09-031-1/+5
* | Fix test to assert that we don't do authErik Johnston2014-09-031-1/+1
* | Don't do auth for change_membership in federation handler, it doesn't work an...Erik Johnston2014-09-031-2/+3
* | Hide email link UI from the settings because it doesn't work.David Baker2014-09-031-2/+2
* | When creating a room and a user supplies a room_alias but no name, use the ro...Erik Johnston2014-09-031-0/+11
* | Added more ng-if to make nice sentences like "Bob kicked Alice" or "Bob unba...Emmanuel ROHEE2014-09-031-4/+13