summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-09-0310-177/+247
|\
| * Edited /presence REST servlet to raise SynapseErrors to return a standard err...Kegan Dougal2014-09-031-7/+12
| * Update API docs to use 'presence' key not 'state'. Fixed error messages when ...Kegan Dougal2014-09-032-2/+2
| * Fixed /presence APIs to urldecode user IDs.Kegan Dougal2014-09-031-1/+5
| * Fixed GET /events/$id to be not broken.Kegan Dougal2014-09-031-1/+3
| * move contentrepo class to it's own fileMark Haines2014-09-033-163/+194
| * URL decode user IDs for /profile REST path segments.Kegan Dougal2014-09-031-0/+6
| * Make API docs not lie on registration/login.Kegan Dougal2014-09-032-2/+24
* | Add option to change content repo locationErik Johnston2014-09-033-4/+20
|/
* Update port numbers.Kegan Dougal2014-09-037-7/+7
* Better indicate in the page feedback section that a user can't join a room (b...Emmanuel ROHEE2014-09-031-1/+2
* Fill out power level bits in the specErik Johnston2014-09-031-42/+63
* Rename the 'do_users_share_a_room' to something slightly less verb-soundingPaul "LeoNerd" Evans2014-09-034-6/+6
* Allow optional non-suppression of exceptions through the DistributorPaul "LeoNerd" Evans2014-09-032-7/+34
* Neater is_presence_visible() codePaul "LeoNerd" Evans2014-09-031-9/+8
* Do not show banned people in member list. Format ban events strings in room a...Emmanuel ROHEE2014-09-033-4/+10
* Prefix API links with /docs/api/client-server so they should link through cor...Kegan Dougal2014-09-031-15/+15
* cmdclient: Fixed /join to work with the updated c-s API.Kegan Dougal2014-09-031-1/+1
* Added /ban commandEmmanuel ROHEE2014-09-032-1/+29
* Made IRC style command easier to handle specifically for possible argumentsEmmanuel ROHEE2014-09-031-10/+22
* cmdclient: Now works correctly with user localpart login. Default to 8008 not...Kegan Dougal2014-09-031-3/+7
* Merge branch 'master' into developErik Johnston2014-09-037-6/+69
|\
| * Add database upgrade script v0.2.0Erik Johnston2014-09-021-0/+10
| * Un block quote listErik Johnston2014-09-021-3/+3
| * Try and remove annoying italics in github rst viewerErik Johnston2014-09-021-1/+2
| * Remove an annoying 'the'Erik Johnston2014-09-021-1/+1
| * Don't so heavily suggest you need to edit the default config. List the change...Erik Johnston2014-09-021-3/+7
| * Fix spellingErik Johnston2014-09-021-1/+1
| * Hide the email textbox during registeration has it has not been wired up yet.Erik Johnston2014-09-021-2/+2
| * Bump version and changelogErik Johnston2014-09-024-2/+50
| * Update default endpoint port to match the default ports in the configErik Johnston2014-09-021-2/+2
* | Add ban support: /rooms/$roomid/ban with { user_id : foo }Kegan Dougal2014-09-031-2/+2
* | Add copyright notices and fix pyflakes errorsMark Haines2014-09-037-7/+59
* | Set status message for ratelimit error responsesMark Haines2014-09-033-6/+12
* | Merge branch 'ratelimiting' into developMark Haines2014-09-0314-10/+244
|\ \
| * | Fix tests to support ratelimitingMark Haines2014-09-033-2/+64
| * | Raise LimitExceedError when the ratelimiting is throttling requestsMark Haines2014-09-032-11/+29
| * | rate limiting for message sendingMark Haines2014-09-024-4/+7
| * | Add ratelimiting configMark Haines2014-09-021-0/+21
| * | Add ratelimiting function to basehandlerMark Haines2014-09-025-1/+27
| * | Test ratelimiterMark Haines2014-09-023-19/+87
| * | Ratelimiter objectMark Haines2014-09-021-0/+36
* | | howto: Link jsfiddles correctly. Hide ugly TODOs.Kegan Dougal2014-09-031-10/+22
* | | doc generatorMatthew Hodgson2014-09-033-0/+792
* | | fix rstMatthew Hodgson2014-09-031-16/+26
* | | don't echo password to stdout...Matthew Hodgson2014-09-031-1/+1
* | | more critiqueMatthew Hodgson2014-09-021-1/+2
* | | Edited room creation section to mention all the events created when the room is.Kegan Dougal2014-09-021-1/+16
* | | Added Qs which should be answered in the marked TODOsKegan Dougal2014-09-021-7/+7
* | | only need one voip section :)Matthew Hodgson2014-09-021-5/+0
* | | general documentation review and editingMatthew Hodgson2014-09-022-52/+156
* | | fix quickstart slightlyMatthew Hodgson2014-09-021-6/+6
* | | Added the new power level related events which were recently introduced.Kegan Dougal2014-09-021-0/+60
* | | Added more room alias bullet points.Kegan Dougal2014-09-021-2/+4
* | | Finished up Identity section in the architecture section.Kegan Dougal2014-09-021-7/+20
* | | Minor formatting tweaks.Kegan Dougal2014-09-021-4/+4
* | | Added section on rate limiting.Kegan Dougal2014-09-021-3/+15
* | | ALL THE LINKS! Most APIs now link to relative paths off the doc, outlined at ...Kegan Dougal2014-09-021-18/+52
* | | roomName directive: Take into account invited users.Emmanuel ROHEE2014-09-021-1/+38
* | | More formatting, more TODOs. Settled on a way of linking to external API docs...Kegan Dougal2014-09-021-31/+53
* | | spec: Added internal links to different sections. Added NOTE and WARNING admo...Kegan Dougal2014-09-021-64/+123
* | | make power level more visibleMatthew Hodgson2014-09-021-3/+3
* | | Attempt to make avatar change clearerEmmanuel ROHEE2014-09-022-4/+15
* | | BF: Reset base timer time ($scope.now) everytime last_active_ago is touchedEmmanuel ROHEE2014-09-021-7/+6
* | | Updated howto.rst to use the new APIs. Updated JSFiddles to use 8008. Linked ...Kegan Dougal2014-09-0211-138/+465
| |/ |/|
* | Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0Erik Johnston2014-09-024-4/+56
|\ \
| * | v0.1.2 v0.1.2David Baker2014-08-293-2/+8
| * | Give basic feedback on the state of VoIP calls in the UI (manually adding to ...David Baker2014-08-293-3/+6
| * | Version bump for bug fix. v0.1.1Erik Johnston2014-08-293-2/+9
| * | Merge branch 'hotfixes-v0.1.0' of github.com:matrix-org/synapseErik Johnston2014-08-291-2/+19
| |\ \
| | * | When notifying listeners, don't do so in a serial fashionErik Johnston2014-08-291-2/+19
| |/ /
| * | Bump version and change log v0.1.0Erik Johnston2014-08-293-2/+24
* | | BF: Prevent controllers from being instantiated twice.Emmanuel ROHEE2014-09-021-14/+7
* | | Handle "m.room.create" in order to inform controllers about new roomsEmmanuel ROHEE2014-09-023-5/+29
* | | Order matters when adding REST servletsPaul "LeoNerd" Evans2014-09-021-21/+21
* | | Fix bug where we didn't correctly store the ops power levels event.Erik Johnston2014-09-023-1/+9
* | | Whoops: Put /events parameters object in the right part of the api tree.Kegan Dougal2014-09-021-17/+18
* | | Updated API docs with new keys on /createRoom and new API /rooms/$roomid/banKegan Dougal2014-09-021-0/+54
* | | Add rest endpoint for the whole user profileDavid Baker2014-09-021-0/+21
* | | More ban spec. Added 'name' and 'topic' keys to /createRoom.Kegan Dougal2014-09-021-13/+33
* | | Safer handling of incoming presence EDUs that may or maynot contain 'presence...Paul "LeoNerd" Evans2014-09-021-3/+13
* | | 'continue' to go to the next item in a for loop, not 'break'Paul "LeoNerd" Evans2014-09-021-1/+1
* | | By default, only room ops can change the name and topic.Erik Johnston2014-09-021-0/+2
| |/ |/|
* | 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