summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Add support for inviting people when you create a roomErik Johnston2014-09-061-0/+26
| * | | Better call bar (visually: still lacks ring[back] tones).David Baker2014-09-067-18/+112
| * | | Add m.roo.aliasesErik Johnston2014-09-051-0/+16
| * | | Validate power levels event changes. Change error messages to be more helpful...Erik Johnston2014-09-051-10/+37
| * | | Generate m.room.aliases event when the HS creates a room aliasErik Johnston2014-09-0510-18/+94
| |/ /
| * | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-09-0516-246/+578
| |\ \
| | * | BF: tab completion did not work with commands. $scope.input contained only th...Emmanuel ROHEE2014-09-051-1/+10
| | * | BF: Update the members list on banned & kicked "events"Emmanuel ROHEE2014-09-051-4/+13
| | * | autoscroll down(if the scroller was already at the bottom) when receiving mem...Emmanuel ROHEE2014-09-051-13/+18
| | * | doc: kick can take a reason argEmmanuel ROHEE2014-09-051-1/+1
| | * | Created kick & unban methods in matrixService. Made some factorisation.Emmanuel ROHEE2014-09-052-23/+24
| | * | Added sanity checks in commandsEmmanuel ROHEE2014-09-051-34/+55
| | * | BF: Make /unban work againEmmanuel ROHEE2014-09-052-2/+2
| | * | Display ban & kick reasonEmmanuel ROHEE2014-09-052-1/+14
| | * | Fixed empty display name (content.displayname in a room member can be null)Emmanuel ROHEE2014-09-051-1/+3
| | * | Revert "Fixed empty display name (content.displayname in a room member can be...Emmanuel ROHEE2014-09-051-6/+0
| | * | Fixed empty display name (content.displayname in a room member can be null)Emmanuel ROHEE2014-09-051-0/+6
| * | | Empty string is not a valid JSON object, so don't return them in HTTP responses.Erik Johnston2014-09-053-7/+7
| * | | AUth the contents of power level eventsErik Johnston2014-09-051-1/+72
| * | | Change the default power levels to be 0, 50 and 100Erik Johnston2014-09-052-10/+10
* | | | Minor spec tweaks.Kegan Dougal2014-09-051-3/+5
| | | * SYN-39: Add documentation explaining how to check a signatureMark Haines2014-09-181-11/+33
| | | * SpellingMark Haines2014-09-051-1/+1
| | | * Add docs on how to sign jsonMark Haines2014-09-051-0/+103
| | |/
| | * Add demo/etc to .gitignoreMark Haines2014-09-051-0/+1
| | * BF: Fixed members list layout when the scrollbar appearsEmmanuel ROHEE2014-09-051-1/+3
| | * BF: Show "Bob invited you" in recents when Bob invites the userEmmanuel ROHEE2014-09-051-1/+5
| | * hide the forgot password link until it worksDavid Baker2014-09-051-2/+2
| | * Fixed duplicated messages sending in slow network condition.Emmanuel ROHEE2014-09-053-5/+55
| | * Cleaned all sending references as it not usedEmmanuel ROHEE2014-09-051-22/+4
| | * Do not systematically scroll to the bottom on new events in the roomEmmanuel ROHEE2014-09-051-2/+8
| | * merge spec changesMatthew Hodgson2014-09-041-13/+27
| | * switch IRC-style command parser to use regexps rather than split(" ") so that...Matthew Hodgson2014-09-042-55/+96
| | * Add version 0 of the VoIP specification.David Baker2014-09-041-11/+97
| | * Merge branch 'master' into developMark Haines2014-09-040-0/+0
| | |\ | |_|/ |/| |
* | | BF: presence PUT requests stopped to work with old "state" param yesterday ev...Emmanuel ROHEE2014-09-041-1/+1
* | | Fixed registration flow when registering with matrixID & password and no emailEmmanuel ROHEE2014-09-041-1/+1
* | | Merge branch 'develop' of github.com:matrix-org/synapse v0.2.1aErik Johnston2014-09-042-16/+43
|\| |
| | * BF: presence PUT requests stopped to work with old "state" param yesterday ev...Emmanuel ROHEE2014-09-041-1/+1
| | * Fixed registration flow when registering with matrixID & password and no emailEmmanuel ROHEE2014-09-041-1/+1
| | * Added mUserDisplayName, a filter to resolve a user display name from a user_idEmmanuel ROHEE2014-09-042-9/+42
| | * Moved mRoomName filter into matrix-filter.js, a place for all generic filters...Emmanuel ROHEE2014-09-047-86/+106
| | * Re-apply fixes to the link-email screen to make it work again (in a somewhat ...David Baker2014-09-042-27/+54
| | * BF: Do not filter incoming member events. Before, only invitations to the cur...Emmanuel ROHEE2014-09-041-7/+2
| | * Report ban/unban messages to recents listsEmmanuel ROHEE2014-09-041-8/+19
| |/
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2014-09-044-15/+16
| |\ | |/ |/|
* | make synctl default to homesever.logMatthew Hodgson2014-09-031-3/+3
* | Merge branch 'release-v0.2.1' v0.2.1Erik Johnston2014-09-03189-1090/+4260
|\ \
| * | Bump versions. Update change logs.Erik Johnston2014-09-033-2/+19
| | * big warningMatthew Hodgson2014-09-041-0/+17
| | * target live siteMatthew Hodgson2014-09-041-2/+2
| | * changelog for v0.2.1Matthew Hodgson2014-09-041-0/+16
| | * update README to know about synctlMatthew Hodgson2014-09-041-14/+24
| |/
| * Added a simple start/stop control scriptPaul "LeoNerd" Evans2014-09-031-0/+38
| * Added a TODO note about YAML modeline for editorsPaul "LeoNerd" Evans2014-09-031-0/+3
| * Error code must be an integerErik Johnston2014-09-031-1/+1
| * Import SynapseErrorErik Johnston2014-09-031-0/+1
| * Handle timeouts slightly nicer.Erik Johnston2014-09-031-1/+5
| * Fix test to assert that we don't do authErik Johnston2014-09-031-1/+1
| * Don't do auth for change_membership in federation handler, it doesn't work an...Erik Johnston2014-09-031-2/+3
| * Hide email link UI from the settings because it doesn't work.David Baker2014-09-031-2/+2
| * When creating a room and a user supplies a room_alias but no name, use the ro...Erik Johnston2014-09-031-0/+11
| * Added more ng-if to make nice sentences like "Bob kicked Alice" or "Bob unba...Emmanuel ROHEE2014-09-031-4/+13
| * better error msgsMatthew Hodgson2014-09-031-3/+3
| * Ignore leave members in the list tooEmmanuel ROHEE2014-09-031-2/+2
| * Fixed used of state_key instead of user_id in member events.Emmanuel ROHEE2014-09-031-4/+7
| * Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2014-09-03168-789/+1898
| |\
| | * Fix ban pathErik Johnston2014-09-031-1/+1
| | * Add support to _simple_insert() to do INSERT OR REPLACEPaul "LeoNerd" Evans2014-09-031-4/+6
| | * Added federation protocol urls section from other docs.Kegan Dougal2014-09-031-0/+73
| | * Fix a few cases where we used user_id instead of state_keyErik Johnston2014-09-032-6/+6
| | * Marked docs/client-server/specification.rst as old.Kegan Dougal2014-09-031-0/+14
| | * More explanation of federation keys.Kegan Dougal2014-09-031-8/+124
| | * Normalise users power levels so that the user with the higher power level wil...Emmanuel ROHEE2014-09-032-1/+24
| | * Added more terms.Kegan Dougal2014-09-031-4/+68
| | * Implement a kick apiErik Johnston2014-09-031-2/+5
| | * Unindent list in specification to remove blockquoteMark Haines2014-09-031-32/+36
| | * Default PID file should be 'homeserver.pid' to match the other 'homeserver.*'...Paul "LeoNerd" Evans2014-09-031-1/+1
| | * Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of ...Emmanuel ROHEE2014-09-032-3/+15
| | * fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org has...Matthew Hodgson2014-09-03152-153/+155
| | * Fix formating for threat modelMark Haines2014-09-031-6/+6
| | * Move securitY threat model docs into specificationMark Haines2014-09-032-141/+124
| | * Limit the size of uploadsMark Haines2014-09-033-1/+55
| | * Bubble up SynapseErrors so expected failures aren't masked.Kegan Dougal2014-09-031-0/+2
| | * Add exception handling to directory servlet, so we don't 500. Mark directory ...Kegan Dougal2014-09-032-2/+18
| | * Fix up directory server to not require uploading room hosts. Update the room ...Erik Johnston2014-09-033-2/+16
| | * List commands and their usage in the settings pageEmmanuel ROHEE2014-09-031-0/+15
| | * Added /kick $user_idEmmanuel ROHEE2014-09-031-4/+14
| | * Handle new state events which don't have a common ancestorErik Johnston2014-09-031-0/+12
| | * Snapshot prev_state for generic eventsErik Johnston2014-09-031-1/+6
| | * Kill the statePaul "LeoNerd" Evans2014-09-035-94/+60
| | * Bugfix for back-pagination of presencePaul "LeoNerd" Evans2014-09-031-0/+2
| | * Added /unban $user_idEmmanuel ROHEE2014-09-031-0/+10
| | * Add support for room namesErik Johnston2014-09-032-2/+20
| | * Make retrying requests on DNS failures configurable, and turn off retrying on...Kegan Dougal2014-09-033-8/+29
| | * Send unrecognized commands as text message (as before)Emmanuel ROHEE2014-09-031-1/+2
| | * Do not define power level limits in setUserPowerLevel. Update the function to...Emmanuel ROHEE2014-09-032-35/+3
| | * Added /deop $user_idEmmanuel ROHEE2014-09-032-3/+36
| | * Store SQL DDL deltas as well; attempt to upgrade the database on startup if i...Paul "LeoNerd" Evans2014-09-034-22/+183
| | * BF: Do not be polluted by ops events that come when paginating backEmmanuel ROHEE2014-09-031-2/+5
| | * hs: Updated synapse.http.client to handle DNSLookupErrors and bail immediately.Kegan Dougal2014-09-031-1/+6
| | * Implement presence state visibilty limiting when polling eventsource for streamPaul "LeoNerd" Evans2014-09-033-15/+147
| | * Don't eat federation transmit errors during unit tests; fix remote presence E...Paul "LeoNerd" Evans2014-09-032-1/+16
| | * Make sure to print exceptions properly from notifier failuresPaul "LeoNerd" Evans2014-09-031-1/+6
| | * apidocs: Added m.room.nameKegan Dougal2014-09-031-0/+62
| | * apidocs: Tweak join response format. Explicitly state empty JSON objects wher...Kegan Dougal2014-09-031-5/+35
| | * Added /op $user_id $powerLevelEmmanuel ROHEE2014-09-033-7/+59
| | * Updated feedback api docs and fixed feedback content template bugKegan Dougal2014-09-032-2/+11
| | * apidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in i...Kegan Dougal2014-09-032-2/+10
| | * 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
| * | Make registering and logging in with a threepid work in the webclient.David Baker2014-09-035-27/+113
| * | Add support for registering with a threepid to the HS (get credentials from t...David Baker2014-09-033-9/+100
| |/
| * 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-22 01:54:54 +0000