summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Convert param styleErik Johnston2016-01-291-0/+3
| | * | | | Prefill stream change cachesErik Johnston2016-01-294-19/+52
| * | | | | Merge pull request #541 from matrix-org/erikj/fixsomeofpushErik Johnston2016-01-291-9/+14
| |\ \ \ \ \
| | * | | | | Deal with None limitErik Johnston2016-01-291-1/+5
| | * | | | | Make /events always return a newer token, if one existsErik Johnston2016-01-291-9/+10
| | |/ / / /
| * | | | | Merge pull request #539 from matrix-org/markjh/3pidMark Haines2016-01-294-10/+29
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add missing param to the log lineMark Haines2016-01-291-1/+2
| | * | | | Fix the mock homserver used in the testsMark Haines2016-01-291-0/+1
| | * | | | Merge remote-tracking branch 'origin/develop' into markjh/3pidMark Haines2016-01-2917-347/+581
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add config option for setting the trusted id servers, disabling checking the ...Mark Haines2016-01-292-8/+24
| | * | | | Allow three_pid_creds as well as threePidCreds in /account/3pidMark Haines2016-01-291-2/+3
* | | | | | Update CHANGES v0.12.1-rc1Erik Johnston2016-01-291-4/+4
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1Erik Johnston2016-01-2940-1031/+936
|\| | | | |
| * | | | | Bump AccountDataAndTagsChangeCache sizeErik Johnston2016-01-291-1/+1
| * | | | | Don't work out unread_notifs_for_room_id unless neededErik Johnston2016-01-291-11/+12
| * | | | | Merge pull request #536 from matrix-org/erikj/syncErik Johnston2016-01-2910-324/+501
| |\ \ \ \ \
| | * | | | | Amalgamate tags and account data stream cachesErik Johnston2016-01-282-12/+9
| | * | | | | If the same as the earliest key, assume nothing has changed.Erik Johnston2016-01-281-0/+5
| | * | | | | Correctly update _entity_to_keyErik Johnston2016-01-281-4/+5
| | * | | | | Fix inequalitiesErik Johnston2016-01-281-2/+2
| | * | | | | Don't use defer.returnValueErik Johnston2016-01-281-1/+1
| | * | | | | Include cache hits with has_entity_changedErik Johnston2016-01-281-0/+4
| | * | | | | Add events indexErik Johnston2016-01-281-0/+16
| | * | | | | Change name and doc has_entity_changedErik Johnston2016-01-284-4/+6
| | * | | | | Cache tags and account dataErik Johnston2016-01-287-102/+137
| | * | | | | Ensure keys to RoomStreamChangeCache are intsErik Johnston2016-01-282-5/+12
| | * | | | | Invalidate caches properly. Remove unused argErik Johnston2016-01-284-10/+15
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-284-28/+20
| | |\ \ \ \ \
| | * | | | | | Change load limit paramsErik Johnston2016-01-281-2/+2
| | * | | | | | Amalgamate incremental and full sync for userErik Johnston2016-01-281-40/+16
| | * | | | | | Allow paginating backwards from stream tokenErik Johnston2016-01-283-16/+24
| | * | | | | | Return correct type of tokenErik Johnston2016-01-281-3/+6
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-283-25/+36
| | |\ \ \ \ \ \
| | * | | | | | | No chdirErik Johnston2016-01-271-1/+0
| | * | | | | | | PEP8Erik Johnston2016-01-273-6/+9
| | * | | | | | | Use the same path for incremental with gap or without gapErik Johnston2016-01-273-212/+147
| | * | | | | | | Add cache to room streamErik Johnston2016-01-275-74/+254
| | * | | | | | | Don't turn on profilingErik Johnston2016-01-271-1/+1
| * | | | | | | | Merge pull request #538 from matrix-org/erikj/fix_lru_cacheErik Johnston2016-01-294-8/+57
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add testsErik Johnston2016-01-292-0/+19
| | * | | | | | | | Directly set self.valueErik Johnston2016-01-291-1/+1
| | * | | | | | | | Remove spurious self.sizeErik Johnston2016-01-291-1/+0
| | * | | | | | | | Correctly bookkeep the size of TreeCacheErik Johnston2016-01-291-3/+28
| | * | | | | | | | Make TreeCache keep track of its own size.Erik Johnston2016-01-292-6/+10
| | * | | | | | | | Reset size on clearErik Johnston2016-01-291-0/+2
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #537 from matrix-org/erikj/cache_filtersErik Johnston2016-01-283-4/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix testErik Johnston2016-01-282-3/+9
| | * | | | | | | Cache filtersErik Johnston2016-01-281-1/+2
| |/ / / / / / /
| * | | | | | | Prune on fetchingDaniel Wagner-Hall2016-01-281-1/+1
| * | | | | | | Pin pynacl to 0.3.0Daniel Wagner-Hall2016-01-281-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #534 from matrix-org/erikj/setupErik Johnston2016-01-2812-120/+123
| |\ \ \ \ \ \
| | * | | | | | Clean up a bit. Add commentErik Johnston2016-01-283-26/+18
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-271-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix testsErik Johnston2016-01-273-5/+12
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-274-9/+27
| | |\ \ \ \ \ \
| | * | | | | | | PEP 8Erik Johnston2016-01-271-1/+0
| | * | | | | | | Add a Homeserver.setup method.Erik Johnston2016-01-269-116/+121
| * | | | | | | | Quot all the thingsDaniel Wagner-Hall2016-01-281-2/+2
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Up get_rooms_for_user cache sizeErik Johnston2016-01-281-1/+1
| * | | | | | | Merge pull request #535 from matrix-org/rav/paginate_from_stream_tokenRichard van der Hoff2016-01-282-24/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Make it possible to paginate forwards from stream tokensRichard van der Hoff2016-01-272-24/+35
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Remove chdirErik Johnston2016-01-281-1/+0
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #530 from matrix-org/erikj/server_refactorErik Johnston2016-01-2712-544/+190
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Don't turn on profilingErik Johnston2016-01-261-1/+1
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/server_ref...Erik Johnston2016-01-262-2/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | * | | | Remove redundated BaseHomeServerErik Johnston2016-01-2612-545/+191
| * | | | | Merge pull request #533 from matrix-org/rav/hashtest_federationRichard van der Hoff2016-01-271-1/+7
| |\ \ \ \ \
| | * | | | | Federation: drop events which cause SynapseErrorsRichard van der Hoff2016-01-271-1/+7
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #531 from matrix-org/markjh/relative_push_rulesMark Haines2016-01-272-6/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix adding push rules relative to other rulesMark Haines2016-01-272-6/+12
* | | | | | Bump version and changelogErik Johnston2016-01-272-1/+46
|/ / / / /
* | | | | Merge pull request #529 from matrix-org/dbkr/one_to_one_only_messagesDavid Baker2016-01-261-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only notify for messages in one to one rooms, not every eventDavid Baker2016-01-261-0/+6
|/ / / /
* | | | Merge pull request #528 from matrix-org/markjh/missing_yieldMark Haines2016-01-251-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add missing yield in push_rules set enabledMark Haines2016-01-251-2/+2
* | | | Merge pull request #524 from matrix-org/erikj/syncErik Johnston2016-01-254-93/+178
|\ \ \ \
| * | | | PEP8Erik Johnston2016-01-251-1/+0
| * | | | Remove weird stuffErik Johnston2016-01-251-6/+0
| * | | | Fix testsErik Johnston2016-01-252-7/+5
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-251-3/+7
| |\| | |
| * | | | Move logic from rest/ to handlers/Erik Johnston2016-01-253-87/+181
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-228-19/+275
| |\ \ \ \
* | \ \ \ \ Merge pull request #525 from matrix-org/erikj/select_manyErik Johnston2016-01-253-60/+110
|\ \ \ \ \ \
| * | | | | | Guard against empty iterablesErik Johnston2016-01-251-0/+6
| * | | | | | Correct docstringErik Johnston2016-01-251-1/+0
| * | | | | | Implement a _simple_select_many_batchErik Johnston2016-01-253-60/+105
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #527 from matrix-org/erikj/push_cacheErik Johnston2016-01-252-17/+14
|\ \ \ \ \ \
| * | | | | | Push: Use storage apis that are cachedErik Johnston2016-01-252-17/+14
| |/ / / / /
* | | | | | Merge pull request #526 from matrix-org/erikj/push_indexErik Johnston2016-01-251-0/+1
|\ \ \ \ \ \
| * | | | | | Add index to event_push_actionsErik Johnston2016-01-251-0/+1
| |/ / / / /
* | | | | | Merge pull request #521 from matrix-org/erikj/underscoresErik Johnston2016-01-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Underscores are allowed in user idsErik Johnston2016-01-221-1/+1
* | | | | | Merge branch 'erikj/filters' of github.com:matrix-org/synapse into developErik Johnston2016-01-254-35/+41
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix testsErik Johnston2016-01-221-1/+1
| * | | | | Sanitize filtersErik Johnston2016-01-223-34/+40
* | | | | | Merge pull request #523 from matrix-org/dbkr/no_push_unless_notifyDavid Baker2016-01-221-9/+1
|\ \ \ \ \ \
| * | | | | | Better fix for actions with both dont_notify and tweaksDavid Baker2016-01-221-1/+1
| * | | | | | Revert b4a41aa542203c03bb8a6c93097b94bc5d167265 as it's just broken.David Baker2016-01-221-9/+1
* | | | | | | Merge pull request #522 from matrix-org/dbkr/no_push_unless_notifyDavid Baker2016-01-221-1/+9
|\| | | | | |
| * | | | | | Don't add notifications to the table unless there's actually a 'notify' actionDavid Baker2016-01-221-1/+9
| | |_|/ / / | |/| | | |
* / | | | | Don't mutate cached valuesErik Johnston2016-01-221-2/+6
|/ / / / /
* | | | | Merge pull request #520 from matrix-org/dbkr/bulk_push_overlay_enabledDavid Baker2016-01-222-0/+46
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't crash if a user has no push rule enabled entriesDavid Baker2016-01-221-0/+3
| * | | | Overlay the push_rules_enabled map for users, otherwise they won't be able to...David Baker2016-01-222-0/+43
|/ / / /
* | | | Merge pull request #519 from matrix-org/dbkr/treecacheDavid Baker2016-01-226-19/+229
|\ \ \ \ | |/ / / |/| | |
| * | | Don't add the member functiopn if we're not using treecacheDavid Baker2016-01-221-1/+4
| * | | docsDavid Baker2016-01-221-1/+5
| * | | Revert all the bits changing keys of eeverything that used LRUCaches to tuplesDavid Baker2016-01-225-44/+44
| * | | Make LRU cache not default to treecache & add options to use itDavid Baker2016-01-224-12/+22
| * | | Add __contains__David Baker2016-01-221-0/+3
| * | | Docs for treecacheDavid Baker2016-01-221-0/+5
| * | | Use new invalidate_many cache invalidation to invalidate the event_push_actio...David Baker2016-01-221-4/+15
| * | | Add invalidate_many here tooDavid Baker2016-01-221-0/+1
| * | | Test treecache directlyDavid Baker2016-01-221-0/+19
| * | | Add tests for treecache directly and test del_multi at the LruCache level too.David Baker2016-01-221-0/+66
| * | | peppateDavid Baker2016-01-211-2/+2
| * | | Change LRUCache to be tree-based so we can delete subtrees.David Baker2016-01-217-52/+140
|/ / /
* | | Merge pull request #517 from matrix-org/erikj/push_only_roomErik Johnston2016-01-213-7/+8
|\ \ \
| * | | Only fetch events for rooms and receiptsErik Johnston2016-01-213-7/+8
|/ / /
* | | Merge pull request #516 from matrix-org/erikj/push_perfErik Johnston2016-01-212-5/+17
|\ \ \
| * | | Cache get_unread_event_push_actions_by_room_for_userErik Johnston2016-01-211-1/+2
| * | | Only compute badge count when necessary.Erik Johnston2016-01-211-4/+15
|/ / /
* | | Fix AttributeErrorErik Johnston2016-01-211-1/+1
* | | Merge pull request #515 from matrix-org/erikj/syn-606Erik Johnston2016-01-211-1/+3
|\ \ \
| * | | SYN-606: Peeking does not wake up /eventsErik Johnston2016-01-211-1/+3
* | | | Merge pull request #509 from matrix-org/erikj/dns_cacheErik Johnston2016-01-212-30/+186
|\ \ \ \
| * | | | Cache dns lookups, and use the cache if we fail to lookup servers laterErik Johnston2016-01-202-30/+186
* | | | | Merge pull request #514 from matrix-org/remove_member_event_ruleDavid Baker2016-01-211-17/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove member event rule as per SYN-607David Baker2016-01-211-17/+19
|/ / / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2016-01-216-69/+110
|\ \ \ \
| * \ \ \ Merge pull request #507 from matrix-org/push_badge_countsDavid Baker2016-01-215-66/+108
| |\ \ \ \
| | * | | | peppateDavid Baker2016-01-201-3/+2
| | * | | | Add index by user id on receipts_linearizedDavid Baker2016-01-201-0/+18
| | * | | | Add storage function to get all receipts for a user. Also add some cache inva...David Baker2016-01-202-43/+40
| | * | | | Inline membership specifierDavid Baker2016-01-201-3/+1
| | * | | | Simplify badge updating code by just updating it every time we get woken up a...David Baker2016-01-201-15/+4
| | * | | | Merge branch 'develop' into push_badge_countsDavid Baker2016-01-201-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into push_badge_countsDavid Baker2016-01-201-0/+3
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into push_badge_countsDavid Baker2016-01-203-36/+36
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'develop' into push_badge_countsDavid Baker2016-01-1935-1247/+1044
| | |\ \ \ \ \ \
| | * | | | | | | Use the unread notification count to send accurate badge counts in push notif...David Baker2016-01-133-45/+86
| * | | | | | | | Merge pull request #513 from matrix-org/erikj/register_user_charsErik Johnston2016-01-211-3/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't explode when given a unicode username in /register/Erik Johnston2016-01-201-3/+2
* | | | | | | | | | Add another graph contribErik Johnston2016-01-211-0/+151
|/ / / / / / / / /
* | | | | | | | | Fix change_passwordErik Johnston2016-01-201-3/+2
* | | | | | | | | Merge pull request #512 from matrix-org/erikj/whine_on_fromErik Johnston2016-01-201-0/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Whine if we give a from param to /syncErik Johnston2016-01-201-0/+7
|/ / / / / / / /
* | | | | | | | Merge pull request #510 from matrix-org/daniel/nonguestpeekingDaniel Wagner-Hall2016-01-208-85/+108
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Allow non-guests to peek on rooms using /eventsDaniel Wagner-Hall2016-01-208-85/+108
|/ / / / / / /
* | | | | | | Merge branch 'dbkr/no_push_for_own_events' into developDavid Baker2016-01-201-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 'filtered' is a list of zero or 1David Baker2016-01-201-1/+1
* | | | | | | Merge pull request #511 from matrix-org/dbkr/no_push_for_own_eventsDavid Baker2016-01-201-0/+3
|\| | | | | | | |_|_|/ / / |/| | | | |
| * | | | | Don't generate push actions for our own eventsDavid Baker2016-01-201-0/+3
|/ / / / /
* | | | | Merge pull request #506 from matrix-org/erikj/push_fastErik Johnston2016-01-192-30/+23
|\ \ \ \ \
| * | | | | Only compute unread notifications for rooms we send down streamErik Johnston2016-01-192-30/+23
* | | | | | Don't use form of get_state_for_events with None state_keyErik Johnston2016-01-191-6/+13
| |_|/ / / |/| | | |
* | | | | Merge pull request #505 from matrix-org/erikj/push_fastErik Johnston2016-01-197-14/+49
|\| | | |
| * | | | Use split rather than endswithErik Johnston2016-01-191-2/+1
| * | | | Change regex cache size to 5000Erik Johnston2016-01-191-1/+1
| * | | | Add regex cache. Only caculate push actions for users that have sent read rec...Erik Johnston2016-01-197-14/+50
|/ / / /
* | | | Handle glob -> regex errorsErik Johnston2016-01-191-29/+33
* | | | Merge pull request #477 from matrix-org/erikj/access_token_logErik Johnston2016-01-191-3/+5
|\ \ \ \
| * | | | Use compiled regexErik Johnston2016-01-131-2/+4
| * | | | Don't log urlencoded access_tokensErik Johnston2016-01-081-2/+2
* | | | | Use all_ephemeral_by_room in incremental_sync_with_gap_for_roomErik Johnston2016-01-191-3/+5
* | | | | Return don't breakErik Johnston2016-01-191-1/+1
* | | | | Except truthy valuesErik Johnston2016-01-191-1/+1
* | | | | Merge pull request #504 from matrix-org/erikj/highlight_countErik Johnston2016-01-193-8/+40
|\ \ \ \ \
| * | | | | Return highlight_count in /syncErik Johnston2016-01-193-8/+40
* | | | | | Merge pull request #486 from matrix-org/default_notifyErik Johnston2016-01-191-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into default_notifyErik Johnston2016-01-1929-1222/+945
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #502 from matrix-org/erikj/push_notif_perfErik Johnston2016-01-1913-954/+550
|\ \ \ \ \ \
| * | | | | | Take a deepcopy of push rules before mutating themErik Johnston2016-01-191-1/+3
| * | | | | | Update _idErik Johnston2016-01-191-2/+3
| * | | | | | Preserve truthinessErik Johnston2016-01-181-1/+2
| * | | | | | You need to escape backslashesErik Johnston2016-01-181-2/+2
| * | | | | | Fix branch didn't check word_boundaryErik Johnston2016-01-181-3/+9
| * | | | | | Remove dead codeErik Johnston2016-01-181-22/+1
| * | | | | | Don't split at word boundaries, actually use regexErik Johnston2016-01-182-63/+48
| * | | | | | Drop log levelsErik Johnston2016-01-181-2/+2
| * | | | | | Add comments and remove dead codeErik Johnston2016-01-181-12/+11
| * | | | | | Do for loop once at startErik Johnston2016-01-181-8/+17
| * | | | | | Use static for const dictsErik Johnston2016-01-184-198/+209
| * | | | | | Remove internal idsErik Johnston2016-01-181-0/+4
| * | | | | | Don't edit rulesetErik Johnston2016-01-181-5/+4
| * | | | | | Make unit tests workErik Johnston2016-01-183-560/+1
| * | | | | | Re-enable urnead notificationsErik Johnston2016-01-183-13/+6
| * | | | | | Make notifications go quickerErik Johnston2016-01-184-131/+260
| * | | | | | Make Event objects behave more like dictsErik Johnston2016-01-181-0/+9
| * | | | | | Allow filtering events for multiple users at onceErik Johnston2016-01-182-39/+67
* | | | | | | Merge pull request #503 from matrix-org/daniel/nonghostsDaniel Wagner-Hall2016-01-191-31/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Don't error on AS non-ghost user useDaniel Wagner-Hall2016-01-181-0/+2
| * | | | | | Pull out app service user lookupDaniel Wagner-Hall2016-01-181-31/+28
|/ / / / / /
* | | | | | Merge pull request #501 from matrix-org/daniel/unbanDaniel Wagner-Hall2016-01-156-58/+116
|\ \ \ \ \ \
| * | | | | | Require unbanning before other membership changesDaniel Wagner-Hall2016-01-156-58/+116
|/ / / / / /
* | | | | | Merge pull request #500 from matrix-org/daniel/cleanupDaniel Wagner-Hall2016-01-152-16/+8
|\ \ \ \ \ \
| * | | | | | Remove unused parametersDaniel Wagner-Hall2016-01-152-16/+8
|/ / / / / /
* | | | | | Merge branch 'invalid_user_name' into developDavid Baker2016-01-152-2/+2
|\ \ \ \ \ \
| * | | | | | M_INVALID_USERNAME to be consistent with the parameter nameDavid Baker2016-01-152-2/+2
* | | | | | | Merge pull request #499 from matrix-org/invalid_user_nameDavid Baker2016-01-152-1/+3
|\| | | | | |
| * | | | | | Add specific error code for invalid user names.David Baker2016-01-142-1/+3
|/ / / / / /
* | | | | | Merge pull request #497 from matrix-org/erikj/max_limitErik Johnston2016-01-141-2/+5
|\ \ \ \ \ \
| * | | | | | Clamp pagination limits to at most 1000Erik Johnston2016-01-141-2/+5
* | | | | | | Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-142-12/+29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #492 from matrix-org/rav/event_context_shiz_release github/release-v0.12.1 release-v0.12.1Richard van der Hoff2016-01-142-12/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Add 'event' result to 'context' endpointRichard van der Hoff2016-01-132-12/+29
| |/ / / / / / /
* | | | | | | | Merge pull request #496 from matrix-org/daniel/3Daniel Wagner-Hall2016-01-143-17/+111
|\ \ \ \ \ \ \ \
| * | | | | | | | Require ID and as_token be unique for ASsDaniel Wagner-Hall2016-01-143-17/+111
|/ / / / / / / /
* | | | | | | | Merge pull request #498 from matrix-org/push_rule_enabled_fixDavid Baker2016-01-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix enabling & disabling push rulesDavid Baker2016-01-141-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'release-v0.12.1' into developRichard van der Hoff2016-01-141-0/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Skip, rather than erroring, invalid guest requestsDaniel Wagner-Hall2016-01-135-21/+5
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #476 from koobs/patch-1Matthew Hodgson2016-01-081-0/+8
| |\ \ \ \ \ \
| | * | | | | | Add FreeBSD install section & instructionsKubilay Kocak2016-01-091-0/+8
| |/ / / / / /
* | | | | | | Merge pull request #487 from matrix-org/daniel/forceregistrationDaniel Wagner-Hall2016-01-141-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Require AS users to be registered before useDaniel Wagner-Hall2016-01-131-0/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #494 from matrix-org/daniel/2Daniel Wagner-Hall2016-01-141-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Don't start server if ASes are invalidly configuredDaniel Wagner-Hall2016-01-131-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #493 from matrix-org/daniel/1Daniel Wagner-Hall2016-01-141-59/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Delete unused codeDaniel Wagner-Hall2016-01-131-59/+0
| |/ / / / /
* | | | | | Use logger not loggingErik Johnston2016-01-141-2/+2
* | | | | | Merge pull request #495 from matrix-org/erikj/disable_notificationErik Johnston2016-01-143-6/+13
|\ \ \ \ \ \
| * | | | | | Don't change signature. Return empty listErik Johnston2016-01-131-2/+2
| * | | | | | Temporarily disable notification branchErik Johnston2016-01-133-7/+14
|/ / / / / /
* | | | | | Merge pull request #488 from matrix-org/markjh/user_nameMark Haines2016-01-139-99/+99
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rename 'user_name' to 'user_id' in push to make it consistent with the rest o...Mark Haines2016-01-139-99/+99
|/ / / / /
| | * / / Change default pushrules back to notifying for all messages.David Baker2016-01-131-1/+0
| |/ / / |/| | |
* | | | Merge pull request #482 from matrix-org/markjh/table_nameMark Haines2016-01-137-128/+41
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/t...Mark Haines2016-01-133-26/+13
| |\ \ \ \
| * | | | | Delete the table objects from TransactionStoreMark Haines2016-01-133-60/+10
| * | | | | Remove the RoomsTable objectMark Haines2016-01-131-13/+3
| * | | | | Remove the PushersTable and EventPushActionsTable objectsMark Haines2016-01-122-14/+6
| * | | | | Remove the PushRuleTable and PushRuleEnableTable objectsMark Haines2016-01-121-50/+33
* | | | | | Merge pull request #483 from matrix-org/erikj/bulk_get_push_rulesErik Johnston2016-01-131-21/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | bulk_get_push_rules should handle empty listsErik Johnston2016-01-131-21/+13
|/ / / / /
* | | | | Merge pull request #480 from matrix-org/erikj/guest_event_tightloopErik Johnston2016-01-131-7/+0
|\ \ \ \ \
| * | | | | Dont fire user_joined_room when guest hits /eventsErik Johnston2016-01-121-7/+0
| |/ / / /
* | | | | Merge pull request #481 from matrix-org/erikj/SYN-589Erik Johnston2016-01-121-1/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't include old left roomsErik Johnston2016-01-121-1/+5
|/ / / /
* | | | Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-1124-144/+178
|\ \ \ \
| * | | | Introduce a Requester objectDaniel Wagner-Hall2016-01-1124-144/+178
* | | | | Postgres doesn't like booleansDavid Baker2016-01-111-2/+2
* | | | | Remove rogue 'admin'David Baker2016-01-111-1/+1
* | | | | Merge pull request #474 from matrix-org/erikj/core_dumpErik Johnston2016-01-081-2/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Turn on core dumpsErik Johnston2016-01-071-2/+5
| |/ / /
* | | | Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-0819-36/+541
|\ \ \ \
| * | | | This comma is actually importantDavid Baker2016-01-071-1/+1
| * | | | more commasDavid Baker2016-01-071-1/+1
| * | | | comma styleDavid Baker2016-01-061-1/+1
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-066-142/+60
| |\ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-15 15:31:42 +0000