summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Added roomName, a directive to compute a room name based on its alias (not al...Emmanuel ROHEE2014-09-014-5/+45
* Little bit more on syncing APIs, need to know more about responses before mor...Kegan Dougal2014-09-011-8/+42
* Oops, show the voice call button once a call has endedDavid Baker2014-09-011-1/+1
* Added docs on presence 'last_active' fieldPaul "LeoNerd" Evans2014-09-011-0/+8
* Fairly simple move of the call status widget to the header bar (and therefore...David Baker2014-09-015-40/+44
* Flesh out Room Events.Kegan Dougal2014-09-011-17/+99
* BF: Check config exists (=defined in the localstorage) before using itEmmanuel ROHEE2014-09-011-2/+6
* missing semicolonDavid Baker2014-09-011-1/+1
* Bump a user's presence last_active time every time they send a message to a roomPaul "LeoNerd" Evans2014-09-012-0/+10
* Have MemoryDataStore's get_rooms_for_user_where_membership_is() return room m...Paul "LeoNerd" Evans2014-09-011-2/+3
* Perform room unit tests with 'local' users actually in the right domain ;)Paul "LeoNerd" Evans2014-09-012-6/+10
* Specced out state/non-state events. Start working on the myriad of syncing APIs.Kegan Dougal2014-09-011-15/+94
* 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
* Rename API-visible 'mtime' presence field to 'last_active'; slightly differen...Paul "LeoNerd" Evans2014-09-014-41/+82
* 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
* Rename 'state' presence key to the much more obvious 'presence'; maintain a l...Paul "LeoNerd" Evans2014-09-017-78/+147
* Fleshed out joining/leaving rooms. Added M_LIMIT_EXCEEDED standard error code...Kegan Dougal2014-09-011-12/+64
* Don't show the hang up button once tha call has endedDavid Baker2014-09-011-1/+1
* Added /web folder which contains html/css (based off the default swagger-ui) ...Kegan Dougal2014-09-0117-0/+10718
* Renamed json files because: paths.Kegan Dougal2014-09-018-7/+7
* add another public wishlist itemMatthew Hodgson2014-09-011-0/+1
* make the little logos clickable for ErikMatthew Hodgson2014-09-016-7/+7
* Start digging into invite/join/leave sections.Kegan Dougal2014-09-011-10/+51
* 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
* missed a s#/matrix#/_matrix/gMatthew Hodgson2014-08-311-1/+1
* change the world: make the default matrix API URL prefix /_matrix rather than...Matthew Hodgson2014-08-3127-93/+93
* 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
* add a basic wishlistMatthew Hodgson2014-08-311-0/+6
* 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
* Bugfixes on presence pushes on user joining:Paul "LeoNerd" Evans2014-08-292-66/+79
* Renamed get_current_token_part to get_current_keyPaul "LeoNerd" Evans2014-08-294-10/+10
* Have EventSource's get_new_events_for_user() API work only on keys within tha...Paul "LeoNerd" Evans2014-08-295-30/+33
* Bugfix for rest presence test - datastore needs to implement profile methodsPaul "LeoNerd" Evans2014-08-291-0/+10
* TypingNotificationEventSource has to return proper tokens, not int 0Paul "LeoNerd" Evans2014-08-291-2/+2
* Rename 'events_key' to 'room_key' so it matches the name of the event sourcePaul "LeoNerd" Evans2014-08-294-10/+10
* 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
* Added case-sensitivity notes on IDs, added TODO on UTF-8.Kegan Dougal2014-08-291-7/+15
* Define a new event stream data source for typing notifications (currently null)Paul "LeoNerd" Evans2014-08-294-11/+33
* Avoid hardcoding names of individual stream token keys in its own implementat...Paul "LeoNerd" Evans2014-08-291-9/+3
* 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
* Use str.join() properlyPaul "LeoNerd" Evans2014-08-291-2/+1
* Move the *EventSource classes into the handlers they relate to, so it's easie...Paul "LeoNerd" Evans2014-08-294-129/+132
* Rooms: More subsections, more bullet points, more detail.Kegan Dougal2014-08-291-9/+88
* 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
* Fix JSFiddles to work with the new C-S API.Kegan Dougal2014-08-296-81/+93
* Update API swagger JSON to default to POSTs not PUTs when describing the API.Kegan Dougal2014-08-291-61/+19
* Merge branch 'release-v0.1.0' into developEmmanuel ROHEE2014-08-290-0/+0
|\
| * The away state is unavailable not offlineEmmanuel ROHEE2014-08-291-7/+7
* | The away state is unavailable not offlineEmmanuel ROHEE2014-08-291-7/+7
* | Merge branch 'release-v0.1.0' into developDavid Baker2014-08-292-3/+7
|\|
| * Only show voice call button if there are exactly 2 members in the room. Also ...David Baker2014-08-292-3/+7
* | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-08-291-4/+81
|\ \ | |/ |/|
| * Flesh out API standards.Kegan Dougal2014-08-291-4/+81
* | 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
* Get the equalities right.Erik Johnston2014-08-292-4/+10
* Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2014-08-2911-206/+423
|\
| * Show notifications only when the user is detected as idleEmmanuel ROHEE2014-08-291-10/+9
| * Merge branch 'presence_logging' into developErik Johnston2014-08-299-163/+346
| |\
| | * Fix a couple of bugs in presence handler related to pushing updatesto the cor...Erik Johnston2014-08-295-90/+200
| | * Turn of trace_function loggingErik Johnston2014-08-282-10/+10
| | * Only poll remote users if they are in our presence list, rather than in a com...Erik Johnston2014-08-281-53/+66
| | * Don't query the rooms members table so much by using the new notifier api tha...Erik Johnston2014-08-282-62/+46
| | * Merge branch 'develop' of github.com:matrix-org/synapse into presence_loggingErik Johnston2014-08-2820-289/+483
| | |\
| | * | Up timeout to 10 minutesErik Johnston2014-08-281-1/+1
| | * | And more logging.Erik Johnston2014-08-282-1/+3
| | * | Add more logging. Up the event stream timer to 10sErik Johnston2014-08-282-1/+4
| | * | Add logging to try and figure out what is going on with the presence stuffErik Johnston2014-08-284-3/+66
| * | | Expand architecture section to introduce room IDs, room aliases, user IDs, ev...Kegan Dougal2014-08-291-33/+68
* | | | 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
* | | | Redo architecture diagram. Reword parts of federation. Formatting fixes and t...Kegan Dougal2014-08-291-81/+97
* | | | 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
* | | | Fix FederationHandler to event.originMark Haines2014-08-281-1/+1
* | | | Start fleshing out architecture section. Moar .rst formatting! Reword some co...Kegan Dougal2014-08-281-106/+146
* | | | Initial room event stream token must be s0, not s1, or everyone will miss the...Paul "LeoNerd" Evans2014-08-281-1/+1
| |_|/ |/| |
* | | Only send presence "poll"/"unpoll" EDUs when changing from/to zero remotesPaul "LeoNerd" Evans2014-08-282-8/+47
* | | Ability to assert a DeferredMockCallable has received no callsPaul "LeoNerd" Evans2014-08-281-0/+15
* | | Avoid AlreadyCalledError from EDU sending failuresPaul "LeoNerd" Evans2014-08-281-1/+2
* | | Re-enable presence, un-skip presence testsPaul "LeoNerd" Evans2014-08-284-19/+0
* | | Do a smart update of the recents from the events stream rather than hammering...Emmanuel ROHEE2014-08-281-7/+21
* | | Flesh out m.room.message msgtypesKegan Dougal2014-08-281-10/+102
* | | Remove get_state_for_room function from federation handlerMark Haines2014-08-283-17/+29
* | | use @wraps to set the __name__ __module__ and __doc__ correctly for logged fu...Mark Haines2014-08-281-0/+2
* | | 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
* | | Support multiple login flows when deciding how to login. Updated cmdclient an...Kegan Dougal2014-08-283-16/+23
* | | Fleshed out login spec.Kegan Dougal2014-08-281-158/+164
* | | Fix pyflakes warningsMark Haines2014-08-284-10/+4
* | | Merge backfill_ and backfill in federation handlerMark Haines2014-08-281-18/+5
| |/ |/|
* | Fix bug where we used UserID objects instead of strignsErik Johnston2014-08-281-1/+2
* | Added skeleton specification for a general feel of the layout.Kegan Dougal2014-08-281-0/+648
* | Fix typo in NullSource.get_pagination_rows. Remove unused import.Erik Johnston2014-08-281-2/+1
* | Start the events stream once the app starts (if credentials are in cache) or ...Emmanuel ROHEE2014-08-284-9/+4
* | Shuffle files around in /docsKegan Dougal2014-08-286-0/+0
|/
* Fix up the various presence-related tests so that if they're not skipped, the...Paul "LeoNerd" Evans2014-08-273-12/+26
* Define a NullSource useful for unit-testingPaul "LeoNerd" Evans2014-08-271-0/+16
* Split out MessageHandlerErik Johnston2014-08-273-276/+305
* Wired the recents list with the stream events for realtime updateEmmanuel ROHEE2014-08-271-9/+10
* Merge branch 'develop' into storage_transactionsMark Haines2014-08-275-7/+11
|\
| * Fix tests.Erik Johnston2014-08-272-4/+3
| * If timeout=0, return immediatelyErik Johnston2014-08-271-1/+5
| * Add python shebang line and chmod +x setup.pyPaul "LeoNerd" Evans2014-08-271-0/+2
* | Merge branch 'develop' into storage_transactionsMark Haines2014-08-2723-646/+727
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-08-278-13/+284
| |\
| | * improve iOS layout a bitMatthew Hodgson2014-08-271-0/+10
| | * Added /rooms/$roomid/state and /rooms/$roomid/initialSync to API docs.Kegan Dougal2014-08-271-0/+73
| | * BF: mFileInput dependency got lost somewhere and upload buttons did not work ...Emmanuel ROHEE2014-08-272-2/+2
| * | Comments!Erik Johnston2014-08-271-0/+35
| * | Remove stale FIXMEsErik Johnston2014-08-271-2/+0
| * | Remove store_id from notifier.on_new_room_event calls.Erik Johnston2014-08-272-13/+8
| * | Merge branch 'stream_refactor' into developErik Johnston2014-08-2717-636/+599
| |\ \
| | * | Turn off presence again.Erik Johnston2014-08-271-2/+2
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2714-111/+289
| | |\ \
| | * | | Index sources in a nicer fashion.Erik Johnston2014-08-273-16/+15
| | * | | Convert get_paginat_rows to use PaginationConfig. This allows people to suppl...Erik Johnston2014-08-273-41/+61
| | * | | PEP8 tweaks.Erik Johnston2014-08-275-10/+12
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2723-748/+771
| | |\ \ \
| | * | | | Implement presence event source. Change the way the notifier indexes listenersErik Johnston2014-08-275-80/+107
| | * | | | Enable presence again. Fix up api to match old api.Erik Johnston2014-08-265-10/+35
| | * | | | Fix exceptions so that the event stream works. Presence like events are turne...Erik Johnston2014-08-261-2/+4
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2610-161/+85
| | |\ \ \ \
| | * | | | | WIP: Completely change how event streaming and pagination work. This reflects...Erik Johnston2014-08-2616-655/+437
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-268-17/+22
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2611-31/+11
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-267-39/+42
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-267-12/+319
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactorErik Johnston2014-08-2663-800/+3107
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Use new StreamToken in pagination configErik Johnston2014-08-211-5/+9
| | * | | | | | | | | | Add in StreamToken typeErik Johnston2014-08-211-0/+74
* | | | | | | | | | | | Return the store_id from persist_eventMark Haines2014-08-271-1/+3
* | | | | | | | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-2734-792/+1341
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Added RestServlet for /rooms/$roomid/initialSyncKegan Dougal2014-08-271-0/+30
| * | | | | | | | | | | Added RestServlet for /rooms/$roomid/stateKegan Dougal2014-08-271-0/+16
| * | | | | | | | | | | 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
| * | | | | | | | | | | Added generic state/non-state event sending to the API docs.Kegan Dougal2014-08-271-8/+123
| |/ / / / / / / / / /
| * | | | | | | | | / api docs: Finished adding all C-S APIs. Added initialSync, publicRooms, membe...Kegan Dougal2014-08-274-53/+331
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | 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-272-2/+2
| * | | | | | | | | Renamed /public/rooms to /publicRoomsKegan Dougal2014-08-274-37/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | fix joining rooms on webclientDavid Baker2014-08-271-1/+2
| * | | | | | | | git ignore all the homeserver*.db filesPaul "LeoNerd" Evans2014-08-271-1/+1
| * | | | | | | | A reliable logger.info() message /after/ the TCP port has been opened and is ...Paul "LeoNerd" Evans2014-08-271-0/+1
| * | | | | | | | Updated swagger JSON: cleaned up unused entries. Converted most paths to the ...Kegan Dougal2014-08-274-477/+105
| * | | | | | | | Removed urls.rst - The API docs / swagger JSON should be used as the canonica...Kegan Dougal2014-08-271-92/+0
| * | | | | | | | Initial typing notification support - EDU federation, but no timers, and no a...Paul "LeoNerd" Evans2014-08-273-0/+398
| * | | | | | | | Added parse_roomid() helperPaul "LeoNerd" Evans2014-08-271-0/+5
| * | | | | | | | Use SQLite's PRAGMA user_version to check if the database file really matches...Paul "LeoNerd" Evans2014-08-271-6/+28
| * | | | | | | | Neater database setup at application startup time; only .connect() it once, n...Paul "LeoNerd" Evans2014-08-271-17/+19
| * | | | | | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-278-119/+59
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Final url modifications: renamed /presence_list to /presence/list to keep the...Kegan Dougal2014-08-272-4/+4
| | * | | | | | | | Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and remov...Kegan Dougal2014-08-276-115/+55
| |/ / / / / / / /
* | | | | | | | | add _get_room_member, fix datastore methodsMark Haines2014-08-275-12/+33
* | | | | | | | | Start updating state handling to use snapshotsMark Haines2014-08-274-25/+24
* | | | | | | | | Remove call to get_federation from homeserverMark Haines2014-08-271-4/+0
* | | | | | | | | Fill out prev_events before calling persist_eventMark Haines2014-08-275-83/+57
* | | | | | | | | Remove unused populate_previous_pdusMark Haines2014-08-273-27/+1
* | | | | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-2717-167/+185
|\| | | | | | | |
| * | | | | | | | Added support for GET /events/$eventid with auth checks.Kegan Dougal2014-08-274-2/+45
| * | | | | | | | Modified /join/$identifier to support $identifier being a room ID in addition...Kegan Dougal2014-08-273-14/+61
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Pepper UT TODOsKegan Dougal2014-08-262-0/+6
| * | | | | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-264-81/+13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-260-0/+0
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-266-87/+73
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | * | | | | | Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expand...Kegan Dougal2014-08-264-81/+13
| | |/ / / / / /
| | * | | | | | Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmd...Kegan Dougal2014-08-266-87/+25
| | * | | | | | Added RoomSendEventRestServlet to send generic non-state events. It even appe...Kegan Dougal2014-08-261-2/+50
| |/ / / / / /
| * | | | | | Respect 'limit' param in initialSync apiErik Johnston2014-08-261-1/+5
* | | | | | | Fold federation/handler into handlers/federationMark Haines2014-08-269-189/+165
* | | | | | | Use store.persist_event rather than pdu_actions.persist_outgoing/pdu_actions....Mark Haines2014-08-262-21/+2
* | | | | | | Move new event boilerplate in room handlers into a method on a base clase.Mark Haines2014-08-262-52/+33
* | | | | | | Move pdu and event persistence into a single persist_event functionMark Haines2014-08-264-50/+36
* | | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-266-15/+16
|\| | | | | |
| * | | | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-266-15/+16
| |\ \ \ \ \ \
| | * | | | | | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro...Kegan Dougal2014-08-266-15/+16
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-261-1/+1
|\| | | | | |
| * | | | | | Use state_key rather than target_user_idMark Haines2014-08-261-1/+1
| |/ / / / /
* | | | | | Use state_key rather than target_user_idMark Haines2014-08-261-1/+1
* | | | | | Merge branch 'develop' into storage_transactionsMark Haines2014-08-2674-869/+3466
|\| | | | |
| * | | | | Fix pyflakes errorsMark Haines2014-08-2611-31/+11
| | |_|_|/ | |/| | |
| * | | | Avoid double call of refresh at app startupEmmanuel ROHEE2014-08-262-5/+7
| * | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-265-34/+35
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix ALL THE UNIT TESTSKegan Dougal2014-08-265-34/+35
| * | | | Determine and send user presence stateEmmanuel ROHEE2014-08-264-5/+140
| * | | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-268-14/+217
| |\| | |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-264-7/+38
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Add the ability to turn on the twisted manhole telnet service.Erik Johnston2014-08-262-2/+13
| | | * | Add a do_users_share_a_room method and use that in the presence handler.Erik Johnston2014-08-262-5/+25
| | |/ / | |/| |
| * | | Merge branch 'client_server_url_rename' into developKegan Dougal2014-08-2614-170/+117
| |\ \ \
| | | * | webclient: Updated to use /rooms/$roomid/[invite|join|leave]Kegan Dougal2014-08-261-7/+11
| | | * | Implemented /rooms/$roomid/[invite|join|leave] with POST / PUT (incl txn ids)Kegan Dougal2014-08-262-8/+35
| | | * | Added basic in-memory REST transaction storage. Only the latest transaction f...Kegan Dougal2014-08-263-2/+103
| | | * | Added servlet for /rooms/$roomid/[invite|join|leave]Kegan Dougal2014-08-261-0/+40
| | |/ /
| | * | URL renaming: Room state keys now use the format /rooms/$roomid/state/$event_...Kegan Dougal2014-08-261-2/+2
| | * | Adjusted webclient to use new state paths. Updated membership msg template to...Kegan Dougal2014-08-266-47/+24
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-261-1/+1
| | |\ \ | | |/ / | |/| |
| * | | Add 'state_key' to valid_keysErik Johnston2014-08-261-0/+1
| * | | Send down state_key to clientsErik Johnston2014-08-261-1/+0
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into client_server_ur...Kegan Dougal2014-08-2655-606/+2633
| | |\ \ | | |/ / | |/| |
| * | | Order 'get_recent_events_for_room' correctly.Erik Johnston2014-08-261-1/+1
| * | | The landing URL is now '#/' which actually points to homeControllerEmmanuel ROHEE2014-08-251-2/+2
| * | | Merge remote-tracking branch 'origin/master' into developEmmanuel ROHEE2014-08-251-2/+2
| |\ \ \
| | * | | Ensure that we don't have duplicate hosts in the pdu destinations listErik Johnston2014-08-241-2/+2
| | * | | Merge branch 'hotfixes-0.0.1' of github.com:matrix-org/synapseErik Johnston2014-08-244-4/+14
| | |\ \ \
| * | \ \ \ Merge remote-tracking branch 'origin/hotfixes-0.0.1' into developEmmanuel ROHEE2014-08-2524-40/+1787
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | For the content repo, don't just use homeserver.hostname as that might not in...Erik Johnston2014-08-242-1/+10
| | * | | | Add a unique constraint on the room hosts tableErik Johnston2014-08-241-1/+2
| | * | | | Encode unicode from json as utf-8. This was required to allow people to regis...Erik Johnston2014-08-241-2/+2
| | |/ / /
| | * | | oopsMatthew Hodgson2014-08-231-1/+1
| | * | | very quick and dirty responsive design for iPhonesMatthew Hodgson2014-08-236-30/+110
| | * | | point out the non-quick-start guideMatthew Hodgson2014-08-231-2/+4
| | * | | Mention in changelog that we disabled presence. v0.0.1Erik Johnston2014-08-221-0/+2
| | * | | skip presence tests which broke when presence polling was disabledMark Haines2014-08-223-0/+13