summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Bump syutil dependencyErik Johnston2014-10-171-2/+2
* Bump version and changelogErik Johnston2014-10-174-10/+12
* Bump database version number.Erik Johnston2014-10-172-1/+32
* Merge branch 'docs-restructuring' of github.com:matrix-org/synapse into developErik Johnston2014-10-1716-5531/+6
|\
| * move swagger JSON from synapse project to matrix-doc projectMatthew Hodgson2014-10-098-1897/+0
| * move matrix-generic content to new matrix-doc git projectMatthew Hodgson2014-10-099-3721/+6
| * Add spec-additions.rst with info on recaptcha and common event fields.Kegan Dougal2014-10-091-0/+89
| * Restructure specification sections.Kegan Dougal2014-10-091-837/+835
* | keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ...Mark Haines2014-10-178-13/+18
* | SPEC-7: Rename 'ts' to 'origin_server_ts'Mark Haines2014-10-1716-42/+42
* | SPEC-7: Don't stamp event contents with 'hsob_ts'Mark Haines2014-10-171-13/+3
* | move gendoc into matrix-doc projectMatthew Hodgson2014-10-173-794/+0
* | Remove warning since the end result is still $sanitize'dKegan Dougal2014-10-151-3/+1
* | Add unsanitizedLinky filter to fix links in formatted messages.Kegan Dougal2014-10-152-5/+57
* | Remove org.matrix.custom.text.html event type and replace it with 'format' an...Kegan Dougal2014-10-152-3/+2
* | Add support for org.matrix.custom.text.htmlKegan Dougal2014-10-152-1/+3
* | Make sure to return an empty JSON object ({}) from presence PUT/POST requests...Paul "LeoNerd" Evans2014-10-141-2/+2
* | SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin fr...Mark Haines2014-10-145-3/+10
* | remove debugging logging for signing requestsMark Haines2014-10-141-4/+0
* | Note that this breaks federationErik Johnston2014-10-142-0/+9
* | Merge pull request #8 from matrix-org/server2server_signingMark Haines2014-10-1428-468/+786
|\ \
| * | typoeMatthew Hodgson2014-10-131-1/+1
| * | Better response message when signature is missing or unsupportedMark Haines2014-10-131-1/+1
| * | Respond with more helpful error messages for unsigned requestsMark Haines2014-10-136-10/+45
| * | Raise a SynapseError if the authorisation header is missing or malformedMark Haines2014-10-132-19/+31
| * | Remove debug logging, raise a proper SynapseError if the auth header is missingMark Haines2014-10-131-5/+4
| * | Verify signatures for server2server requestsMark Haines2014-10-135-25/+100
| * | SYN-75 sign at the request level rather than the transaction levelMark Haines2014-10-137-52/+70
| * | Merge branch 'develop' into server2server_signingMark Haines2014-10-131-11/+35
| |\ \ | |/ / |/| |
* | | Replace on_send_callback with something a bit clearer so that we can sign mes...Mark Haines2014-10-131-11/+35
| * | Merge branch develop into server2server_signingMark Haines2014-10-1322-527/+911
| |\ \ | |/ / |/| |
* | | remove wishlist in favour of jiraMatthew Hodgson2014-10-121-9/+0
* | | Fixed test.Kegan Dougal2014-10-091-1/+0
* | | Still broken.Kegan Dougal2014-10-091-1/+2
* | | Break a test.Kegan Dougal2014-10-091-1/+1
| |/ |/|
* | Fix unit test.Kegan Dougal2014-10-081-1/+1
* | Break unit test.Kegan Dougal2014-10-081-1/+1
* | Merge pull request #7 from matrix-org/paul/docErik Johnston2014-10-071-0/+8
|\ \
| * | Clarify that room alias domain names will be server-scoped; nonlocal edits ar...Paul "LeoNerd" Evans2014-10-071-0/+8
|/ /
* | SPEC-3: First hack at defining some of the various event related conceptsErik Johnston2014-10-071-0/+53
* | Add quick and dirty doc about state resolutionErik Johnston2014-10-061-0/+51
* | Clarify how-to some more.Kegan Dougal2014-10-061-2/+3
* | Update JSFiddles/how-to to support the new registration format.Kegan Dougal2014-10-063-3/+3
* | Add more section headings.Kegan Dougal2014-10-061-5/+37
* | Clarify room permission / power level information.Kegan Dougal2014-10-061-16/+19
* | Add information about the initialSync API.Kegan Dougal2014-10-061-8/+46
* | swagger: Added DELETE method for directory server.Kegan Dougal2014-10-061-0/+16
* | More spec work.Kegan Dougal2014-10-031-14/+11
* | Merge pull request #6 from matrix-org/paul/docErik Johnston2014-10-031-4/+26
|\ \
| * | Clarify how m.room.alias event worksPaul "LeoNerd" Evans2014-10-031-4/+26
* | | Flesh out room alias section.Kegan Dougal2014-10-031-9/+29
|/ /
* | Add more information to TODOs. Explain m.room.join_rules.Kegan Dougal2014-10-031-12/+21
* | Federation protocol URLs should have an H2 heading, not H1Paul "LeoNerd" Evans2014-10-021-1/+1
* | Remove TODO note about VoIP events as they now have their own entire sectionPaul "LeoNerd" Evans2014-10-021-3/+0
* | Merge pull request #5 from matrix-org/paul/docErik Johnston2014-10-021-8/+101
|\ \
| * | Document the Profile systemPaul "LeoNerd" Evans2014-10-021-8/+101
* | | Merge pull request #4 from matrix-org/erikj-spec-changesPaul Evans2014-10-021-23/+24
|\ \ \
| * | | Add todo notesErik Johnston2014-10-021-0/+5
| * | | Remove incorrect reasons for empty PDU lists.Erik Johnston2014-10-021-3/+1
| * | | Remove note about assymetry of having left a room.Erik Johnston2014-10-021-5/+1
| * | | m.room.ops_levels includes redact_levelErik Johnston2014-10-021-2/+2
| * | | Don't use spaces in example room aliasErik Johnston2014-10-021-1/+1
| * | | Fix default value and key names.Erik Johnston2014-10-021-3/+3
| * | | Be less alarmist about not using an ID server.Erik Johnston2014-10-021-2/+2
| * | | Alias lookups return a server list.Erik Johnston2014-10-021-1/+4
| * | | All room state is currently shared.Erik Johnston2014-10-021-6/+5
| |/ /
* | | Fix pyflakes errorsMark Haines2014-10-022-9/+3
* | | Add a keyword argument to get_json to avoid retrying on DNS failures. Rather ...Mark Haines2014-10-026-20/+16
* | | Merge branch 'master' into developDavid Baker2014-10-023-4/+6
|\ \ \
| * | | Fix ncorrect ports in documentation and add notes on how generate-config also...David Baker2014-10-023-4/+6
* | | | Split PlainHttpClient into separate clients for talking to Identity servers a...Mark Haines2014-10-026-156/+163
| |/ / |/| |
* | | Merge branch 'master' into developMark Haines2014-10-021-82/+86
|\| |
| * | Trivial formatting fixes for README.Mark Haines2014-10-021-82/+86
* | | Merge remote-tracking branch 'origin/master' into developMark Haines2014-10-022-5/+8
|\| |
| * | Update README setup instructions to be correct. Make synapse spit out explana...David Baker2014-10-022-5/+8
| * | Re-apply a0b1b34c71e46304f7024f0570db92f4577303b5 to master (fixing synctl)David Baker2014-10-021-2/+2
* | | Make instructions synctl gives for generateing a config file actuall generate...David Baker2014-10-021-2/+2
* | | Added a TODO-doc marker about the presence timing systemPaul "LeoNerd" Evans2014-10-011-0/+6
* | | Define the client and server APIs for PresencePaul "LeoNerd" Evans2014-10-011-9/+102
* | | Continue moving content out of docs/model/presence into the main spec; delete...Paul "LeoNerd" Evans2014-10-013-100/+24
* | | SPEC-25: Add details on how to prune redacted events.Erik Johnston2014-10-011-0/+30
* | | Move documented but-unimplemented 'presence idle times' into a new document t...Paul "LeoNerd" Evans2014-10-012-8/+20
* | | s/m.room.redacted/m.room.redaction/Erik Johnston2014-10-011-1/+1
* | | Nuke the entire 'Typing Notifications' spec section given as they don't exist...Paul "LeoNerd" Evans2014-10-011-16/+0
* | | remove "red", "blue" and "green" server_name mappingsMark Haines2014-10-011-7/+0
* | | Annotate all the 'TODO' marks as relating to either the specification itself ...Paul "LeoNerd" Evans2014-09-301-50/+54
| | * Merge branch 'develop' into server2server_signingMark Haines2014-09-3064-934/+2403
| | |\ | |_|/ |/| |
* | | pyflakes cleanupErik Johnston2014-09-303-3/+1
* | | SYN-2: Allow server admins to delete room aliasesErik Johnston2014-09-304-21/+99
* | | Re-wrap content after latest additionsPaul "LeoNerd" Evans2014-09-291-25/+30
* | | Merge remote-tracking branch 'origin/develop' into developPaul "LeoNerd" Evans2014-09-2917-40/+335
|\ \ \
| * | | Add a 'Redactions' section.Erik Johnston2014-09-291-0/+17
| * | | Add m.room.redacted in events listErik Johnston2014-09-291-0/+16
| * | | Merge branch 'whois' of github.com:matrix-org/synapse into developErik Johnston2014-09-2916-40/+302
| |\ \ \
| | * | | Unbreak tests after changing storage APIErik Johnston2014-09-294-12/+53
| | * | | Update docstringErik Johnston2014-09-292-2/+3
| | * | | SYN-48: Delete dead codeErik Johnston2014-09-291-26/+0
| | * | | SYN-48: Fix typo. Get the whois for requested user rather tahan the requesterErik Johnston2014-09-291-1/+1
| | * | | SYN-48: Implement WHOIS rest servletErik Johnston2014-09-299-25/+190
| | * | | Add auth check to test if a user is an admin or not.Erik Johnston2014-09-292-0/+11
| | * | | SYN-48: Track User-Agents as well as IPs for client devices.Erik Johnston2014-09-294-5/+20
| | * | | Track the IP users connect with. Add an admin column to users table.Erik Johnston2014-09-269-12/+67
| * | | | No longer need the Freenode verification key filePaul "LeoNerd" Evans2014-09-291-1/+0
| |/ / /
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-255-5/+30
| |\| |
* | | | Extended docs about the registration/login flowsPaul "LeoNerd" Evans2014-09-291-23/+30
* | | | Reörder the specification sections, to move 'Registration and Login' first, ...Paul "LeoNerd" Evans2014-09-291-315/+316
* | | | Huge whitespace hackery - reflow all (content) paragraphs at tw=80Paul "LeoNerd" Evans2014-09-291-389/+435
* | | | No longer need the Freenode verification key filePaul "LeoNerd" Evans2014-09-291-1/+0
| |/ / |/| |
* | | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse v0.3.4Erik Johnston2014-09-2546-233/+1297
|\ \ \
| * | | Just use a yaml list for turn serversDavid Baker2014-09-252-3/+3
| * | | More change log linesErik Johnston2014-09-251-0/+3
| * | | Bump version and changelogErik Johnston2014-09-253-2/+24
| |/ /
| * | Add realm to coturn options (it needs it).David Baker2014-09-251-1/+2
| * | Merge branch 'deletions' of github.com:matrix-org/synapse into developErik Johnston2014-09-2517-27/+531
| |\ \
| | * | Don't strip out null's in serialized events, as that is not need anymore and ...Erik Johnston2014-09-251-1/+2
| | * | Don't strip of False values from events when serializingErik Johnston2014-09-251-1/+1
| | * | Rename redaction test case to something helpfulErik Johnston2014-09-251-1/+1
| | * | Add LIMIT to scalar subqueryErik Johnston2014-09-253-5/+10
| | * | More tests.Erik Johnston2014-09-251-1/+82
| | * | Add test for redactionsErik Johnston2014-09-251-0/+181
| | * | Rename deletions to redactionsErik Johnston2014-09-2416-74/+77
| | * | Make deleting deletes not undeleteErik Johnston2014-09-241-14/+4
| | * | Fix bug where we didn't correctly pull out the event_id of the deletionErik Johnston2014-09-242-3/+8
| | * | Fill out the prune_event method.Erik Johnston2014-09-241-6/+31
| | * | Fix test.Erik Johnston2014-09-241-1/+1
| | * | Add v4 deltas to current sql.Erik Johnston2014-09-243-1/+10
| | * | Rename 'pruned' to 'pruned_because'Erik Johnston2014-09-233-3/+3
| | * | SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops lev...Erik Johnston2014-09-234-6/+43
| | * | Add prune_event methodErik Johnston2014-09-231-0/+39
| | * | Make sure we don't persist the 'pruned' keyErik Johnston2014-09-231-1/+1
| | * | Add m.room.deletion. If an event is deleted it will be returned to clients 'p...Erik Johnston2014-09-239-21/+144
| | * | Add a deletions tableErik Johnston2014-09-221-0/+5
| * | | fix rst warningsDavid Baker2014-09-251-0/+3
| * | | add howto for setting up your very own TURN serverDavid Baker2014-09-251-0/+89
| * | | Fix bug where we tried to insert state events with null state keyErik Johnston2014-09-251-1/+2
| * | | BF: Do a pagination when opening a room from an invitationEmmanuel ROHEE2014-09-251-5/+8
| * | | Merge branch 'turn' into developDavid Baker2014-09-257-6/+165
| |\ \ \
| | * | | Add stun server fallback and I-told-you-so message if we get no TURN server a...David Baker2014-09-252-18/+34
| | * | | Make turn server endpoint return an empty object if no turn servers toDavid Baker2014-09-252-2/+2
| | * | | Refresh turn server before the ttl runs out. Support firefox.David Baker2014-09-241-14/+23
| | * | | The REST API spec only alows for returning a single server so name theDavid Baker2014-09-242-2/+2
| | * | | Hopefully implement turn in the web client (probably wrong for Firefox becaus...David Baker2014-09-242-3/+34
| | * | | OopsDavid Baker2014-09-241-1/+1
| | * | | rename endpoint to better reflect what it is and allow specifying multiple urisDavid Baker2014-09-242-8/+6
| | * | | Use standard base64 encoding with padding to get the same result asDavid Baker2014-09-241-2/+5
| | * | | The config is not hierarchicalDavid Baker2014-09-231-3/+3
| | * | | Add support for TURN servers as per the TURN REST API (http://tools.ietf.org/...David Baker2014-09-234-2/+104
| * | | | Fix test where we changed arguments used to call the notifierErik Johnston2014-09-251-1/+1
| * | | | SYN-46: An invite received from fedearation didn't wake up the event stream f...Erik Johnston2014-09-251-1/+9
| * | | | Fixed SYWEB-36: use getUserDisplayName for disambiguating display name in mem...Emmanuel ROHEE2014-09-252-24/+10
| * | | | getUserDisplayName: Disambiguate users who have the same displayname in the r...Emmanuel ROHEE2014-09-251-0/+15
| * | | | Don't set the room name to be the room alias on room creation if the client d...Erik Johnston2014-09-241-11/+0
| * | | | Fixed getUserDisplayname when the user has a null displaynameEmmanuel ROHEE2014-09-241-1/+1
| * | | | SYN-70: And fix another bug where I can't typeErik Johnston2014-09-241-1/+1
| * | | | SYN-70: Fix typoErik Johnston2014-09-241-1/+1
| * | | | Fixed SYWEB-74: Emote desktop notifications sometimes lack a name: "undefined...Emmanuel ROHEE2014-09-241-32/+49
| * | | | SYWEB-27: Public rooms with 2 users must not considered as 1:1 chat room and ...Emmanuel ROHEE2014-09-241-2/+9
| * | | | Fixed SYWEB-28: show displayname changes in recentsEmmanuel ROHEE2014-09-241-21/+28
| * | | | Added hasOwnProperty tests when required to be robust to random properties ad...Emmanuel ROHEE2014-09-243-1/+12
| * | | | State data now provides up-to-date users displaynames. So use it first.Emmanuel ROHEE2014-09-242-50/+36
| * | | | close buttons on recents (SYWEB-68)Matthew Hodgson2014-09-243-2/+14
| * | | | close buttons on recents (SYWEB-68)Matthew Hodgson2014-09-241-0/+0
| * | | | on safari at least keypress's event.which returns ASCII rather than keycodes,...Matthew Hodgson2014-09-231-1/+1
| * | | | comment-convo with keganMatthew Hodgson2014-09-231-1/+10
| * | | | fix yet more room id leak disastersMatthew Hodgson2014-09-231-5/+12
| * | | | oops, stupid bug on room/$room/stateMatthew Hodgson2014-09-232-4/+4
| * | | | manu: what's going on here?Matthew Hodgson2014-09-231-3/+4
| * | | | Bugfix for older Pythons that lack hmac.compare_digest()Paul "LeoNerd" Evans2014-09-231-1/+11
| * | | | use all new /rooms/<room id>/state to actually gather the state for rooms whe...Matthew Hodgson2014-09-233-8/+49
| * | | | patch over another scenario whe we leak room IDs. i have *zero* idea why or ...Matthew Hodgson2014-09-231-1/+1
| * | | | fix a case of rampaging SYWEB-78Matthew Hodgson2014-09-231-0/+5
| * | | | Fix SYWEB-72 : Improve performance when typing.Kegan Dougal2014-09-232-2/+16
| * | | | SYWEB-28: Fixed weird members list ordering: sort members on their last activ...Emmanuel ROHEE2014-09-231-3/+10
| * | | | Merge branch 'jira/SYN-60' into developPaul "LeoNerd" Evans2014-09-232-6/+44
| |\ \ \ \
| | * | | | Send an HMAC(SHA1) protecting the User ID for the ReCAPTCHA bypass, rather th...Paul "LeoNerd" Evans2014-09-231-7/+26
| | * | | | Config values are almost never 'None', but they might be empty string. Detect...Paul "LeoNerd" Evans2014-09-231-1/+1
| | * | | | Make sure the config actually /has/ a captcha_bypass_secret set before trying...Paul "LeoNerd" Evans2014-09-231-2/+3
| | * | | | Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared se...Paul "LeoNerd" Evans2014-09-232-6/+24
| * | | | | remove old commented-out codeMatthew Hodgson2014-09-231-2/+1
| * | | | | fix one cause of SYWEB-53Matthew Hodgson2014-09-231-7/+4
| * | | | | Update API docs to include notes on /rooms/$roomid/stateKegan Dougal2014-09-231-1/+1
| * | | | | Implemented /rooms/$roomid/state API.Kegan Dougal2014-09-232-6/+23
| | |/ / / | |/| | |
| * | | | Partial fix of SYWEB-28: If members do not have last_active_ago, compare thei...Emmanuel ROHEE2014-09-231-1/+17
| * | | | send messages to users from the home page (SYWEB-19)Matthew Hodgson2014-09-233-4/+42
| * | | | fix NPEMatthew Hodgson2014-09-231-2/+1
| * | | | Fix SYWEB-8 : Buggy tab-complete.Kegan Dougal2014-09-231-19/+40
| |/ / /
| | | * SYN-75 Verify signatures on server to server transactionsMark Haines2014-09-3014-235/+245
| | | * Sign federation transactionsMark Haines2014-09-248-10/+73
| | | * Fix a few pyflakes errors in the server_key_resourceMark Haines2014-09-231-5/+1
| | | * Add a _matrix/key/v1 resource with the verification keys of the local serverMark Haines2014-09-235-164/+104
| | | * Read signing keys using methods from syutil. convert keys that are in the wro...Mark Haines2014-09-231-9/+30
| | | * fix grammaticsMatthew Hodgson2014-09-221-4/+4
| | | * Add section to explain how to sign events such that we can redact message con...Mark Haines2014-09-221-1/+27
| | | * Merge branch 'develop' into server2server_signingMark Haines2014-09-22151-4730/+14728
| | | |\ | | |_|/ | |/| |
| * | | Show display name changes in the message list.Kegan Dougal2014-09-222-8/+30
|/ / /
* | | Bump versions and changelog v0.3.3Erik Johnston2014-09-223-2/+22
* | | Add working protractor e2e test.Kegan Dougal2014-09-224-8/+26
* | | Set required environment variables for e2e testing.Kegan Dougal2014-09-223-6/+15
* | | Updated test README to include a section on environment-protractor.jsKegan Dougal2014-09-221-0/+6
* | | Added boilerplate for running end-to-end tests.\nThis is done using Protracto...Kegan Dougal2014-09-225-6/+30
|/ /
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-222-2/+1
|\ \
| * | Fix undefined variable errorDavid Baker2014-09-191-1/+1
| * | Merge branch 'develop' of github.com:matrix-org/synapseErik Johnston2014-09-1832-310/+3413
| |\ \
| * | | Remove lie from change log.Erik Johnston2014-09-181-1/+0
* | | | Propagate failure reason to the other party.David Baker2014-09-222-7/+8
* | | | Better logging of ICE candidates and fail the call when ICE fails.David Baker2014-09-222-8/+12
* | | | Fixed unit test; it all actually works. Added a README for running the tests ...Kegan Dougal2014-09-221-0/+9
* | | | go back to the original behaviour of only notifying if we think the app is ba...Matthew Hodgson2014-09-201-8/+14
* | | | remove insanely busy logging which is killing CPUMatthew Hodgson2014-09-201-2/+6
* | | | remove the ng-model attribute from mainInput textarea to stop the digest bein...Matthew Hodgson2014-09-202-16/+16
* | | | Notify a callee that their browser doesn't support VoIP too.David Baker2014-09-195-9/+20
* | | | Move video background element up as it was causing the page to scroll.David Baker2014-09-191-1/+3
* | | | Join rooms if we're not already in them when accepting a call coming from tha...David Baker2014-09-191-0/+15
* | | | SYWEB-32: made all input/textearea inherit the font of their parentEmmanuel ROHEE2014-09-191-0/+5
* | | | Fix the "is webrtc supported" titles on buttons and make the video / voice ca...David Baker2014-09-191-6/+6
* | | | Test that prev_content get's added if there is a prev_state key (in the event...Erik Johnston2014-09-191-17/+70
* | | | Merge branch 'videocalls' into developDavid Baker2014-09-196-19/+224
|\ \ \ \
| * | | | First working version of UI chrome for video calls.David Baker2014-09-193-14/+35
| * | | | add unprefixed filter css as wellDavid Baker2014-09-181-0/+2
| * | | | Prettier and stabler video with basic support for viewing mode. For now, tran...David Baker2014-09-184-19/+70
| * | | | WIP video chat layoutDavid Baker2014-09-184-4/+38
| * | | | Video calling (in a tiny box at the moment)David Baker2014-09-176-15/+106
* | | | | SYWEB-13 SYWEB-14: disabled "Call" button if the browser does not support all...Emmanuel ROHEE2014-09-193-2/+14
* | | | | SYWEB-13: disabled "Send image" button if the browser does not support HTML5 ...Emmanuel ROHEE2014-09-191-6/+16
* | | | | SYWEB-13: Do not start the app if the browser does not support WEBStorage.Emmanuel ROHEE2014-09-193-4/+37
* | | | | SYN-47: Fix bug where we still returned events for rooms we had left.Erik Johnston2014-09-192-1/+174
* | | | | Small formatting fixesKegan Dougal2014-09-191-8/+10
* | | | | formattingKegan Dougal2014-09-191-5/+9
* | | | | A kind of the typo in the fix of SYWEB-44Emmanuel ROHEE2014-09-191-2/+2
* | | | | Room id leaks: log them when then happens. Plus log the conditions that made ...Emmanuel ROHEE2014-09-191-0/+4
* | | | | Fixed SYWEB-16: When sending an invite over federation, the remote user sees ...Emmanuel ROHEE2014-09-191-22/+38
| |_|/ / |/| | |
* | | | fix SYWEB-41 (hopefully)Matthew Hodgson2014-09-181-1/+7
* | | | Fixed missing component dependency which created a crashEmmanuel ROHEE2014-09-181-3/+2
* | | | Added test directory, karma conf, and angular-mocks. Expect it to work? Pah, ...Kegan Dougal2014-09-183-0/+2314
* | | | Oops. Removed dev logsEmmanuel ROHEE2014-09-181-1/+0
* | | | SYWEB-14: BF: rooms invitations were not visible in recents after launching/r...Emmanuel ROHEE2014-09-183-3/+22
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-184-3/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Bump Changelog and version v0.3.2Erik Johnston2014-09-183-2/+9
| * | | undefined is empty. Fixed bug where empty bingWords with old accounts which h...Kegan Dougal2014-09-181-1/+1
* | | | fix wordwrapMatthew Hodgson2014-09-181-2/+2
* | | | fix binger descriptionMatthew Hodgson2014-09-181-3/+3
* | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-185-21/+17
|\| | |
| * | | Bump changelog and versions v0.3.1Erik Johnston2014-09-183-2/+11
| * | | SYWEB-40: Only local rooms are shown in the recents list.Emmanuel ROHEE2014-09-181-7/+0
| * | | Reverted patches done for SYWEB-40Emmanuel ROHEE2014-09-182-12/+6
* | | | Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into developErik Johnston2014-09-1823-298/+1064
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'develop' into test-sqlite-memoryPaul "LeoNerd" Evans2014-09-1740-452/+1259
| |\ \ \
| * | | | Remark on remaining storage modules that still need unit testsPaul "LeoNerd" Evans2014-09-171-0/+5
| * | | | Neaten more of the storage layer tests with assertObjectHasAttributes; more s...Paul "LeoNerd" Evans2014-09-173-20/+22
| * | | | Unit tests for (some) room events via the RoomStorePaul "LeoNerd" Evans2014-09-171-0/+85