summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Add ratelimiting function to basehandlerMark Haines2014-09-025-1/+27
* Test ratelimiterMark Haines2014-09-023-19/+87
* Ratelimiter objectMark Haines2014-09-021-0/+36
* Remove option for disabling webclient because it was confusingMark Haines2014-09-021-4/+1
* Fix room permissions testErik Johnston2014-09-021-0/+3
* Implement auth for kicking.Erik Johnston2014-09-021-3/+10
* Add message to assertionErik Johnston2014-09-021-1/+1
* Default HTTP and HTTPS ports to 8008 and 8448Erik Johnston2014-09-021-2/+4
* Make the demo listen on both HTTP and HTTPS portsErik Johnston2014-09-021-3/+5
* os.makedirs is almost but not entirely unlike mkdir -pMark Haines2014-09-021-1/+2
* Fix typo when reading TLS configMark Haines2014-09-021-1/+1
* Represent user power level in a room by a red bar at the bottom of his avatar...Emmanuel ROHEE2014-09-025-0/+60
* Ensure that event source unit tests could cope with get_new_events_for_user()...Paul "LeoNerd" Evans2014-09-021-14/+20
* Make the config directory if the directory doesn't exisit when generating configMark Haines2014-09-021-0/+1
* More helpful error messages for missing configMark Haines2014-09-023-6/+29
* Yet more bullet points on various sections.Kegan Dougal2014-09-021-11/+45
* BF: Armed updateMemberListPresenceAge only onceEmmanuel ROHEE2014-09-021-1/+3
* Make the intro bit a separate section rather than have a 'quick start' sectio...David Baker2014-09-021-2/+5
* Add support for setting room name and topic when creating roomsErik Johnston2014-09-021-4/+29
* Added section on banning users, currently in flux as the API changes / is imp...Kegan Dougal2014-09-021-0/+26
* Merge remote-tracking branch 'origin/develop' into developEmmanuel ROHEE2014-09-021-4/+12
|\
| * Expanded on bullet points in several sections.Kegan Dougal2014-09-021-4/+12
* | Merge branch 'withoutYAML' into developEmmanuel ROHEE2014-09-021-2/+6
|\ \ | |/ |/|
| * BF: Take into account MEMBER_EVENT and PRESENCE_EVENT events only after the i...Emmanuel ROHEE2014-09-021-2/+6
* | given everything's apparently gone https:// by default for c-s, change this h...Matthew Hodgson2014-09-011-1/+5
* | Add unsecure listener port to homeserverMark Haines2014-09-012-8/+17
* | enable ECDHE ciphersMark Haines2014-09-011-0/+6
* | Reënable presence visibility permission checking now it's not used on redund...Paul "LeoNerd" Evans2014-09-012-6/+0
* | No need to test is_presence_visible in _start_polling_local because we know i...Paul "LeoNerd" Evans2014-09-011-4/+0
* | specify metavars in argparseMatthew Hodgson2014-09-011-2/+3
* | add pyyaml dependency for config filesMark Haines2014-09-011-0/+1
* | Use yaml for config fileMark Haines2014-09-011-11/+6
* | Don't set a 'default' key in the creation eventErik Johnston2014-09-011-1/+0
* | Use pregenerated DH params when generating configMark Haines2014-09-011-7/+29
* | That was a breaking db change. You need to recreate the databases. (In realit...Erik Johnston2014-09-011-1/+1
* | Merge branch 'room_config' into developErik Johnston2014-09-0112-48/+579
|\ \
| * | Don't put required power levels on permission state eventsErik Johnston2014-09-011-2/+4
| * | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-09-0117-248/+655
| |\ \
| * | | Fix the tests to include new db callsErik Johnston2014-09-012-6/+20
| * | | Add all the necessary checks to make banning work.Erik Johnston2014-09-016-6/+54
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-09-0143-252/+11416
| |\ \ \ | | | |/ | | |/|
| * | | Add beginnings of ban support.Erik Johnston2014-09-018-29/+122
| * | | Implement power level lists, default power levels and send_evnet_level/add_st...Erik Johnston2014-09-017-48/+218
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-09-0162-897/+1411
| |\ \ \
| * | | | Start adding storage for new events.Erik Johnston2014-08-293-0/+121
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into room_configErik Johnston2014-08-2933-351/+1976
| |\ \ \ \
| * | | | | Create the correct events with the right configuration when creating a new room.Erik Johnston2014-08-285-21/+104
* | | | | | Update readme with instructions on how to generate configs for homeserversMark Haines2014-09-011-2/+12
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'server2server_tls' into developMark Haines2014-09-0117-248/+655
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix SSL for federation http clientMark Haines2014-09-012-2/+2
| * | | | Merge remote-tracking branch 'origin/develop' into server2server_tlsMark Haines2014-09-0110-100/+260
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Follow API renaming. state -> presence. mtime_ago -> last_active_agoEmmanuel ROHEE2014-09-013-16/+15
* | | | | Small formatting errorsKegan Dougal2014-09-011-2/+2
* | | | | fix lying docsDavid Baker2014-09-011-14/+3
* | | | | 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
| * | | | Enable SSL for s2s http clientMark Haines2014-09-012-3/+7
| * | | | Add server TLS context factoryMark Haines2014-09-011-0/+23
| * | | | Merge branch 'develop' into server2server_tlsMark Haines2014-09-018-25/+126
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | 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
| * | | | Listen using SSLMark Haines2014-09-012-2/+8
| * | | | Merge branch 'develop' into server2server_tlsMark Haines2014-09-0134-142/+11045
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | 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
| |_|_|/ |/| | |
| * | | Fix homeserver config parsingMark Haines2014-09-019-36/+66
| * | | Merge branch 'develop' into server2server_tlsMark Haines2014-09-0160-747/+1291
| |\ \ \ | |/ / / |/| | |
* | | | 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
| * | | Merge branch 'develop' into server2server_tlsMark Haines2014-08-3143-794/+1800
| |\ \ \
| | * | | Add config tree to synapse. Add support for reading config from a fileMark Haines2014-08-319-231/+441
| |/ / / |/| | |
* | | | 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
| | | * | Add store for server certificates and keysMark Haines2014-08-283-1/+135
| |_|/ / |/| | |
* | | | 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