summary refs log tree commit diff
path: root/synapse/handlers (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #832 from matrix-org/erikj/presence_coountErik Johnston2016-06-031-5/+9
|\ \
| * | Change metric styleErik Johnston2016-06-031-5/+4
| * | Presence metrics. Change def of small deltaErik Johnston2016-06-031-5/+10
* | | Fix typoErik Johnston2016-06-031-1/+1
|/ /
* | Merge pull request #829 from matrix-org/erikj/poke_notifierErik Johnston2016-06-031-4/+7
|\ \
| * | Poke notifier on next reactor tickErik Johnston2016-06-031-4/+7
* | | Load push rules in storage layer, so that they get cachedErik Johnston2016-06-031-3/+2
|/ /
* | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ...David Baker2016-06-021-28/+36
|\ \
| * | Store the typing users as user_id strings. (#819)Mark Haines2016-06-021-28/+36
* | | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribeDavid Baker2016-06-022-550/+716
|\| |
| * | Deduplicate presence entries in sync (#818)Mark Haines2016-06-021-0/+3
| * | Allow external processes to mark a user as syncing. (#812)Mark Haines2016-06-021-13/+106
| * | Merge pull request #817 from matrix-org/dbkr/split_out_auth_handlerDavid Baker2016-06-022-3/+1
| |\ \
| * \ \ Merge pull request #800 from matrix-org/erikj/sync_refactorErik Johnston2016-06-021-537/+607
| |\ \ \
| | * | | Change short circuit pathErik Johnston2016-05-241-16/+26
| | * | | Don't send down all ephemeral eventsErik Johnston2016-05-241-1/+3
| | * | | Only work out newly_joined_users for incremental syncErik Johnston2016-05-241-6/+9
| | * | | Only include non-offline presence in initial syncErik Johnston2016-05-241-0/+3
| | * | | Spell builder correctlyErik Johnston2016-05-241-63/+63
| | * | | Inline function. Make load_filtered_recents privateErik Johnston2016-05-241-17/+7
| | * | | Add commentsErik Johnston2016-05-241-7/+105
| | * | | Shuffle things roomErik Johnston2016-05-241-37/+33
| | * | | Add back concurrently_executeErik Johnston2016-05-231-25/+9
| | * | | Refactor SyncHandlerErik Johnston2016-05-231-497/+481
* | | | | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribeDavid Baker2016-06-023-4/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Split out the auth handlerDavid Baker2016-06-022-3/+1
| |/ / /
| * | | Fix room list spideringDavid Baker2016-06-011-1/+1
* | | | Email unsubscribing that may in theory, workDavid Baker2016-06-021-0/+5
|/ / /
* | | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spiderDavid Baker2016-06-013-22/+7
|\ \ \
| * | | Move the AS handler out of the Handlers object.Mark Haines2016-05-313-22/+7
* | | | Add cache to remote room listsDavid Baker2016-05-311-4/+30
* | | | Basic, un-cached support for secondary_directory_serversDavid Baker2016-05-311-1/+32
|/ / /
* | | Split out the room list handlerDavid Baker2016-05-311-2/+1
* | | Send down correct error response if user not foundErik Johnston2016-05-271-2/+7
* | | Fix set profile error with Requester.Negi Fazeli2016-05-231-4/+5
|/ /
* | Move typing handler out of the Handlers objectMark Haines2016-05-172-20/+15
* | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handlerMark Haines2016-05-171-15/+0
|\ \
| * | Remove unused get_joined_rooms_for_userMark Haines2016-05-171-15/+0
| * | Merge branch 'develop' into markjh/member_cleanupMark Haines2016-05-175-25/+25
| |\ \
| | * \ Merge pull request #787 from matrix-org/markjh/liberate_presence_handlerMark Haines2016-05-175-25/+25
| | |\ \
* | | | | Move SyncHandler out of the Handlers objectMark Haines2016-05-162-7/+5
* | | | | Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_han...Mark Haines2016-05-165-25/+25
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ...Mark Haines2016-05-161-19/+21
| * | | Move the presence handler out of the Handlers objectMark Haines2016-05-165-7/+5
* | | | Remove get_joined_rooms_for_user from RoomMemberHandlerMark Haines2016-05-163-11/+4
* | | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_roomMark Haines2016-05-163-67/+27
| |/ / |/| |
* | | Spell "domain" correctlyMark Haines2016-05-163-8/+8
|/ /
* | Merge pull request #741 from negzi/create_user_with_expiryErik Johnston2016-05-132-2/+55
|\ \
| * | Create user with expiryNegi Fazeli2016-05-132-2/+55
* | | missed a spotMark Haines2016-05-121-1/+1
* | | move filter_events_for_client out of base handlerMark Haines2016-05-115-204/+29
* | | Shuffle when we get the signing_key attribute.Mark Haines2016-05-111-2/+2
* | | Merge pull request #775 from matrix-org/erikj/password_hashErik Johnston2016-05-111-1/+4
|\ \ \
| * | | Correctly handle NULL password hashes from the databaseErik Johnston2016-05-111-1/+4
| |/ /
* | | Fix typoMark Haines2016-05-111-1/+1
* | | Move _create_new_client_event and handle_new_client_event out of base handlerMark Haines2016-05-114-204/+214
|/ /
* | Merge pull request #759 from matrix-org/dbkr/email_notifsMatthew Hodgson2016-05-105-12/+12
|\ \
| * \ Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-05-103-16/+10
| |\ \
| * \ \ Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-04-291-1/+1
| |\ \ \
| * | | | Run filter_events_for_clientDavid Baker2016-04-275-12/+12
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-093-15/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Add and use get_domian_from_idErik Johnston2016-05-093-15/+9
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_userErik Johnston2016-05-091-1/+1
|\| | | |
| * | | | Reduce database inserts when sending transactionsErik Johnston2016-05-061-1/+1
| | |/ / | |/| |
* | | | Add bulk fetch storage APIErik Johnston2016-05-052-8/+4
* | | | Implement basic ignore userErik Johnston2016-05-042-6/+42
|/ / /
* / / fix typoMatthew Hodgson2016-04-281-1/+1
|/ /
* | Simplify _check_passwordErik Johnston2016-04-151-5/+9
* | Fix check_password rather than inverting the meaning of _check_local_password...Mark Haines2016-04-141-9/+12
* | Fix login to error for nonexistent usersDavid Baker2016-04-141-1/+1
* | Merge pull request #718 from matrix-org/erikj/public_room_listErik Johnston2016-04-131-5/+8
|\ \
| * | Don't return empty public roomsErik Johnston2016-04-121-5/+8
* | | Don't auto log failed auth checksErik Johnston2016-04-132-9/+31
|/ /
* | More commentsErik Johnston2016-04-121-0/+9
* | More commentsErik Johnston2016-04-121-0/+6
* | Don't append to unused listErik Johnston2016-04-121-4/+0
* | Add back backfilled parameter that was removedErik Johnston2016-04-121-1/+3
* | Add commentErik Johnston2016-04-121-0/+1
* | Check if we've already backfilled eventsErik Johnston2016-04-121-7/+20
* | Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actionsDavid Baker2016-04-113-6/+32
|\ \
| * | Add comments on min_stream_idDavid Baker2016-04-071-0/+1
| * | Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_act...David Baker2016-04-073-12/+49
| |\ \
| * | | Send badge count pushes.David Baker2016-04-071-4/+17
| * | | Make pushers use the event_push_actions table instead of listening on an even...David Baker2016-04-062-2/+14
* | | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_dataErik Johnston2016-04-081-15/+0
|\ \ \ \
| * | | | changed_presencelike_data isn't observed anywhere in synapse so can be removedMark Haines2016-04-081-15/+0
* | | | | Remove some unused functions (#711)Mark Haines2016-04-082-42/+0
* | | | | Move all the wrapper functions for distributor.fireMark Haines2016-04-084-38/+3
|/ / / /
* | | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_dataMark Haines2016-04-082-37/+1
|\ \ \ \
| * | | | Call profile handler get_displayname directly rather than using collect_prese...Mark Haines2016-04-072-37/+1
* | | | | Merge pull request #701 from DoubleMalt/ldap-authErik Johnston2016-04-071-9/+77
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix check for failed authenticationChristoph Witzany2016-04-061-2/+4
| * | | | remove lineChristoph Witzany2016-04-061-1/+0
| * | | | make tests for ldap more specific to not be fooled by MocksChristoph Witzany2016-04-061-3/+3
| * | | | output ldap version for info and to pacify pep8Christoph Witzany2016-04-061-0/+2
| * | | | conditionally import ldapChristoph Witzany2016-04-061-2/+5
| * | | | fix pep8Christoph Witzany2016-04-061-2/+1
| * | | | fix exception handlingChristoph Witzany2016-04-061-2/+2
| * | | | code styleChristoph Witzany2016-04-061-6/+13
| * | | | add tls property and twist my head around twistedChristoph Witzany2016-04-061-15/+29
| * | | | move LDAP authentication to AuthenticationHandlerChristoph Witzany2016-04-061-6/+48
* | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joinsErik Johnston2016-04-071-0/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Deduplicate joinsErik Johnston2016-04-071-0/+31
* | | | | Set profile information when joining rooms remotelyErik Johnston2016-04-071-0/+5
|/ / / /
* / / / Let users see their own leave eventsRichard van der Hoff2016-04-061-11/+40
|/ / /
* | | Merge pull request #693 from matrix-org/erikj/backfill_selfErik Johnston2016-04-051-1/+4
|\ \ \ | |/ / |/| |
| * | Don't backfill from selfErik Johnston2016-04-051-1/+4
* | | Merge pull request #691 from matrix-org/erikj/memberErik Johnston2016-04-052-15/+37
|\ \ \
| * | | Fix stuck invitesErik Johnston2016-04-052-15/+37
* | | | Merge pull request #690 from matrix-org/erikj/memberErik Johnston2016-04-051-1/+4
|\| | |
| * | | Docs and indentsErik Johnston2016-04-041-1/+4
| * | | Store invites in a separate table.Erik Johnston2016-04-041-1/+1
* | | | Merge pull request #689 from matrix-org/erikj/memberErik Johnston2016-04-043-149/+169
|\| | |
| * | | Use computed prev event idsErik Johnston2016-04-013-13/+25
| * | | Remove state hack from _create_new_client_eventErik Johnston2016-04-011-43/+0
| * | | Do checks for memberships before creating eventsErik Johnston2016-04-011-93/+144
* | | | Merge pull request #686 from matrix-org/markjh/doc_stringsMark Haines2016-04-015-72/+101
|\ \ \ \ | |/ / / |/| | |
| * | | Use google style doc strings.Mark Haines2016-04-015-72/+101
* | | | Add concurrently_execute functionErik Johnston2016-04-013-74/+51
* | | | Filter rooms list before chunkingErik Johnston2016-04-011-6/+12
* | | | Remove outlier parameter from compute_event_contextMark Haines2016-03-312-9/+5
|/ / /
* | | Merge pull request #680 from matrix-org/markjh/remove_is_new_stateMark Haines2016-03-311-16/+4
|\ \ \
| * | | Remove the is_new_state argument to persist event.Mark Haines2016-03-311-16/+4
| |/ /
* / / Split out RoomMemberHandlerErik Johnston2016-03-313-603/+651
|/ /
* | Line lengthErik Johnston2016-03-311-1/+3
* | Only forget room if you were in the roomErik Johnston2016-03-301-1/+2
* | Require user to have left room to forget roomErik Johnston2016-03-301-6/+16
* | Add a response cache for getting the public room listMark Haines2016-03-241-1/+11
* | Deduplicate identical /sync requestsMark Haines2016-03-241-1/+15
* | Ensure all old public rooms have aliasesErik Johnston2016-03-231-4/+5
* | Ensure published rooms have public join rulesErik Johnston2016-03-231-0/+7
* | CommentErik Johnston2016-03-231-0/+3
* | Don't require alias in public room list.Erik Johnston2016-03-231-14/+13
* | Merge pull request #657 from matrix-org/erikj/roomlistErik Johnston2016-03-221-0/+22
|\ \
| * | Doc stringErik Johnston2016-03-221-0/+6
| * | an invalide is something else...Matthew Hodgson2016-03-221-1/+1
| * | Add published room list edit APIErik Johnston2016-03-211-0/+16
* | | Remove unused backfilled parameter from persist_eventMark Haines2016-03-211-23/+15
* | | remove unused current_state variable from on_receive_pduMark Haines2016-03-211-2/+0
|/ /
* | Merge pull request #652 from matrix-org/erikj/delete_aliasErik Johnston2016-03-181-6/+47
|\ \ | |/ |/|
| * Check canonical alias event existsErik Johnston2016-03-171-1/+2
| * Update aliases event after deletionErik Johnston2016-03-171-6/+46
* | Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_usernameDavid Baker2016-03-172-1/+25
|\ \
| * | Make registration idempotent, part 2: be idempotent if the client specifies a...David Baker2016-03-162-1/+25
| |/
* | Remove another unused function from presenceMark Haines2016-03-171-4/+0
* | Remove dead code left over from presence changesMark Haines2016-03-172-74/+0
|/
* pep8David Baker2016-03-161-1/+2
* time_msec()David Baker2016-03-161-1/+1
* string with symbols is a bit too symboly.David Baker2016-03-161-1/+1
* Replace other time.time().David Baker2016-03-161-2/+1
* Use hs get_clock instead of time.time()David Baker2016-03-161-2/+2
* pep8 & remove debug loggingDavid Baker2016-03-161-1/+1
* Make registration idempotent: if you specify the same session, make it give y...David Baker2016-03-161-12/+48
* Remove needless PreserveLoggingContextErik Johnston2016-03-151-5/+4
* Persist rejection of invites over federationErik Johnston2016-03-151-1/+17
* Add config to create guest account on 3pid inviteErik Johnston2016-03-141-25/+32
* Make select more sensible when dseleting access tokens, rename pusher deletio...David Baker2016-03-111-1/+1
* Delete old, unused methods and rename new one to just be `user_delete_access_...David Baker2016-03-111-1/+1
* Dear PyCharm, please indent sensibly for me. Thx.David Baker2016-03-111-2/+2
* Fix cache invalidation so deleting access tokens (which we did when changing ...David Baker2016-03-111-4/+9
* Store appservice ID on registerDaniel Wagner-Hall2016-03-101-1/+4
* Merge pull request #631 from matrix-org/markjh/py3v1Mark Haines2016-03-082-2/+2
|\
| * Use syntax that works on both py2.7 and py3Mark Haines2016-03-072-2/+2
* | Send the user ID matching the guest access token, since there is no Matrix AP...David Baker2016-03-071-0/+5
|/
* Merge pull request #626 from matrix-org/erikj/visibilityErik Johnston2016-03-071-0/+26
|\
| * Send history visibility on boundary changesErik Johnston2016-03-041-0/+26
* | Merge pull request #618 from matrix-org/markjh/pushrule_streamMark Haines2016-03-042-2/+24
|\ \
| * | Merge branch 'develop' into markjh/pushrule_streamMark Haines2016-03-0410-80/+162
| |\|
| * | Hook up the push rules stream to account_data in /syncMark Haines2016-03-041-0/+22
| * | Hook up the push rules to the notifierMark Haines2016-03-031-2/+2
* | | Merge pull request #625 from matrix-org/erikj/kick_ban_syncErik Johnston2016-03-041-3/+9
|\ \ \
| * | | Always include kicks and bans in full /syncErik Johnston2016-03-041-3/+9
| | |/ | |/|
* | | SpellingErik Johnston2016-03-041-1/+1
* | | Add profile information to invitesErik Johnston2016-03-041-2/+15
|/ /
* | Merge pull request #598 from Rugvip/invite-stateErik Johnston2016-03-041-6/+2
|\ \
| * | config,handlers/_base: added homeserver config for what state is included in ...Patrik Oldsberg2016-03-041-6/+2
* | | Merge pull request #596 from Rugvip/createErik Johnston2016-03-041-0/+6
|\ \ \ | |/ / |/| |
| * | handlers/_base: don't allow room create event to be changedPatrik Oldsberg2016-02-231-0/+6
* | | Merge pull request #610 from Rugvip/unique-userErik Johnston2016-03-041-0/+1
|\ \ \
| * | | handlers/register: make sure another user id is generated when a collision oc...Patrik Oldsberg2016-02-291-0/+1
* | | | Merge pull request #623 from matrix-org/rav/fix_createroom_raceRichard van der Hoff2016-03-041-1/+1
|\ \ \ \
| * | | | Make sure we add all invited members before returning from createRoomRichard van der Hoff2016-03-041-1/+1
* | | | | Merge pull request #614 from matrix-org/erikj/alias_deleteErik Johnston2016-03-041-6/+21
|\ \ \ \ \
| * | | | | Allow alias creators to delete aliasesErik Johnston2016-03-011-6/+21
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'origin/develop' into rav/SYN-642Richard van der Hoff2016-03-037-57/+85
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #621 from matrix-org/daniel/ratelimitingDaniel Wagner-Hall2016-03-036-56/+84
| |\ \ \ \
| | * | | | Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-036-56/+84
| * | | | | Stop using checkpw as it seems to have vanished from bcrypt. Use `bcrypt.hash...David Baker2016-03-021-1/+1
| |/ / / /
* | | | | Merge branch 'develop' into rav/SYN-642Richard van der Hoff2016-03-033-2/+37
|\| | | |
| * | | | Merge pull request #612 from matrix-org/erikj/cache_sizeErik Johnston2016-03-022-2/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add enviroment variable SYNAPSE_CACHE_FACTOR, default it to 0.1Erik Johnston2016-03-012-2/+4
| | |/ /
| * / / Add a /replication API for extracting the updates that happened onMark Haines2016-03-012-0/+33
| |/ /
* | | Fix typoRichard van der Hoff2016-03-031-1/+1
* | | Move arg default to the start of the functionRichard van der Hoff2016-03-021-2/+3
* | | fix pyflakes quibbleRichard van der Hoff2016-03-021-1/+2
* | | Address review commentsRichard van der Hoff2016-03-022-8/+17
* | | Fix pyflakes warningRichard van der Hoff2016-03-011-1/+1
* | | Handle rejections of invites from local users locallyRichard van der Hoff2016-03-012-8/+31
|/ /
* | Send the invier's member event in room invite state so the invitee has their ...David Baker2016-02-251-1/+7
* | Generate guest access token on 3pid invitesDaniel Wagner-Hall2016-02-242-0/+23
* | Check presence token interval is less than 100, rather than the token itselfErik Johnston2016-02-231-4/+4
* | Merge pull request #602 from matrix-org/erikj/presenceErik Johnston2016-02-231-19/+45
|\ \
| * | Handle get_all_entities_changed returning NoneErik Johnston2016-02-231-0/+3
| * | Add commentsErik Johnston2016-02-231-0/+4
| * | Change the way we figure out presence updates for small deltasErik Johnston2016-02-231-17/+36
* | | Allow third_party_signed to be specified on /joinDaniel Wagner-Hall2016-02-232-29/+131
* | | Merge pull request #600 from matrix-org/erikj/presenceErik Johnston2016-02-231-26/+30
|\| |
| * | Don't include defer.returnValue in Measure blockErik Johnston2016-02-231-9/+12
| * | Measure PresenceEventSource.get_new_eventsErik Johnston2016-02-231-34/+35
* | | handlers/sync: style fix, line too longPatrik Oldsberg2016-02-231-1/+5
* | | Pick up currently_active across federationErik Johnston2016-02-231-0/+1
* | | handlers/sync: fix SyncResult not counting account_data change when convertin...Patrik Oldsberg2016-02-231-1/+1
| |/ |/|
* | Merge pull request #587 from matrix-org/rav/guest_access_after_room_joinRichard van der Hoff2016-02-222-15/+40
|\ \ | |/ |/|
| * address review commentsRichard van der Hoff2016-02-221-7/+2
| * Interpret unknown visibilities the same as sharedRichard van der Hoff2016-02-191-11/+13
| * Merge branch 'develop' into rav/guest_access_after_room_joinRichard van der Hoff2016-02-199-1348/+1160
| |\
| * | Allow guest users access to messages in rooms they have joinedRichard van der Hoff2016-02-192-13/+41
* | | Remove superfluous call to get_state_at when we already have an event for tha...Erik Johnston2016-02-221-4/+12
* | | Correctly filter statesErik Johnston2016-02-191-2/+2
* | | Only send presence updates to remote hosts if user is oursErik Johnston2016-02-191-2/+10
* | | Add Measures to presenceErik Johnston2016-02-191-57/+62
| |/ |/|
* | Add presence metricErik Johnston2016-02-191-0/+3
* | Remove spurious extra metricsErik Johnston2016-02-191-1/+0
* | Merge pull request #586 from matrix-org/erikj/presenceErik Johnston2016-02-191-6/+26
|\ \
| * | Don't set currently_active for remote presenceErik Johnston2016-02-191-6/+12
| * | More metricsErik Johnston2016-02-191-0/+6
| * | Add presence metricsErik Johnston2016-02-191-0/+8
* | | Merge pull request #582 from matrix-org/erikj/presenceErik Johnston2016-02-195-1028/+784
|\| |
| * | Remove invalid arg.Erik Johnston2016-02-181-1/+0
| * | Add unit testErik Johnston2016-02-181-93/+187
| * | Add stuff pulled from the DB to the cacheErik Johnston2016-02-181-2/+4
| * | PEP8Erik Johnston2016-02-181-2/+2
| * | Prefix TS fields with _tsErik Johnston2016-02-181-27/+27
| * | Remove status_msg when going offline. Don't offline -> online if you send a m...Erik Johnston2016-02-181-5/+15
| * | Check presence state is a valid oneErik Johnston2016-02-181-0/+6
| * | Move if statementErik Johnston2016-02-181-8/+8
| * | CommentErik Johnston2016-02-181-0/+2
| * | Remove spurious commentErik Johnston2016-02-171-1/+0
| * | Initial cutErik Johnston2016-02-175-1050/+694
| |/
* | Merge pull request #573 from matrix-org/erikj/sync_fixErik Johnston2016-02-181-5/+12
|\ \
| * | Mitigate against incorrect old state in /sync.Erik Johnston2016-02-121-5/+12
* | | Review commentsDaniel Wagner-Hall2016-02-183-7/+7
* | | Some cleanupDaniel Wagner-Hall2016-02-171-66/+58
* | | Respond to federated invite with non-empty contextDaniel Wagner-Hall2016-02-172-42/+61
* | | Some cleanup, some TODOs, more to doDaniel Wagner-Hall2016-02-161-68/+60
* | | Some cleanupDaniel Wagner-Hall2016-02-162-23/+30
* | | Tidy? up room creation event sendingDaniel Wagner-Hall2016-02-161-63/+72
* | | Add commentDaniel Wagner-Hall2016-02-161-1/+1
* | | Merge branch 'develop' into daniel/roomcleanupincrementalDaniel Wagner-Hall2016-02-161-3/+3
|\ \ \ | | |/ | |/|
| * | Simplify room creation codeDaniel Wagner-Hall2016-02-151-40/+28
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-25 18:50:02 +0000