Mark Haines
|
3c85a317d6
|
Merge pull request #420 from matrix-org/markjh/resource_usage
Track the cpu used in the main thread by each logging context
|
2015-12-04 14:15:41 +00:00 |
|
Mark Haines
|
5231737369
|
Add comments to explain why we are hardcoding RUSAGE_THREAD
|
2015-12-04 11:53:38 +00:00 |
|
Mark Haines
|
d6059bdd2a
|
Fix warnings
|
2015-12-04 11:34:23 +00:00 |
|
Mark Haines
|
48a2526d62
|
Track the cpu used in the main thread by each logging context
|
2015-12-03 21:03:01 +00:00 |
|
Mark Haines
|
b29d2fd7f8
|
Merge pull request #419 from matrix-org/markjh/reuse_captcha_client
Reuse the captcha client rather than creating a new one for each request
|
2015-12-03 17:00:59 +00:00 |
|
Daniel Wagner-Hall
|
edfcb83473
|
Flatten devices into a dict, not a list
|
2015-12-03 16:19:21 +00:00 |
|
Mark Haines
|
478b4e3ed4
|
Reuse the captcha client rather than creating a new one for each request
|
2015-12-03 13:48:55 +00:00 |
|
Erik Johnston
|
b8680b82c3
|
Merge pull request #414 from matrix-org/erikj/if_not_exists
Older versions of SQLite don't like IF NOT EXISTS in virtual tables
|
2015-12-03 13:21:09 +00:00 |
|
Daniel Wagner-Hall
|
ac213c2e08
|
Merge pull request #415 from matrix-org/daniel/endpoints
Merge pull request #415 from matrix-org/daniel/endpoints
|
2015-12-03 12:19:12 +00:00 |
|
Daniel Wagner-Hall
|
e880164c59
|
Merge pull request #418 from matrix-org/daniel/whois
Merge pull request #418 from matrix-org/daniel/whois
|
2015-12-03 12:18:01 +00:00 |
|
Daniel Wagner-Hall
|
526bc33e02
|
Fix implementation of /admin/whois
|
2015-12-02 17:29:47 +00:00 |
|
David Baker
|
181616deed
|
Merge pull request #417 from matrix-org/fix_db_v15_postgres
Fix schema delta 15 on postgres
|
2015-12-02 17:26:17 +00:00 |
|
David Baker
|
e515b48929
|
Just replace the table definition with the one from full_schema 16
|
2015-12-02 17:23:52 +00:00 |
|
David Baker
|
8810eb8c39
|
Fix schema delta 15 on postgres in the very unlikley event that anyone upgrades to 15...
|
2015-12-02 17:19:11 +00:00 |
|
Mark Haines
|
748c0f5efa
|
Merge pull request #416 from matrix-org/markjh/idempotent_state
Make state updates in the C+S API idempotent
|
2015-12-02 17:14:45 +00:00 |
|
Mark Haines
|
491f3d16dc
|
Make state updates in the C+S API idempotent
|
2015-12-02 15:50:50 +00:00 |
|
Daniel Wagner-Hall
|
872c134807
|
Update endpoints to reflect current spec
|
2015-12-02 15:45:04 +00:00 |
|
Erik Johnston
|
f721fdbf87
|
Merge pull request #412 from matrix-org/erikj/search
Search: Add prefix matching support
|
2015-12-02 13:56:41 +00:00 |
|
Erik Johnston
|
976cb5aaa8
|
Throw if unrecognized DB type
|
2015-12-02 13:50:43 +00:00 |
|
Erik Johnston
|
b2def42bfd
|
Older versions of SQLite don't like IF NOT EXISTS in virtual tables
|
2015-12-02 13:29:14 +00:00 |
|
Erik Johnston
|
b9acef5301
|
Fix so highlight matching works again
|
2015-12-02 13:28:13 +00:00 |
|
Mark Haines
|
58d0927767
|
Merge pull request #410 from matrix-org/markjh/edu_frequency
Only fire user_joined_room if the user has actually joined.
|
2015-12-02 13:17:15 +00:00 |
|
Erik Johnston
|
7dd6e5efca
|
Remove deuplication. Add comment about regex.
|
2015-12-02 13:09:37 +00:00 |
|
Mark Haines
|
5dc09e82c4
|
Merge pull request #413 from matrix-org/markjh/reuse_http_client
Reuse a single http client, rather than creating new ones
|
2015-12-02 12:56:23 +00:00 |
|
Mark Haines
|
c2c70f7daf
|
Use the context returned by _handle_new_event
|
2015-12-02 12:01:24 +00:00 |
|
Erik Johnston
|
477da77b46
|
Search: Add prefix matching support
|
2015-12-02 11:40:52 +00:00 |
|
Mark Haines
|
37b2d69bbc
|
Reuse a single http client, rather than creating new ones
|
2015-12-02 11:36:02 +00:00 |
|
David Baker
|
addb248e0b
|
Merge pull request #411 from matrix-org/default_dont_notify
Change the m.room.message rule to be disabled by default
|
2015-12-02 11:32:56 +00:00 |
|
David Baker
|
4b1281f9b7
|
Change the m.room.message rule to be disabled by default so we only notify for 1:1 rooms / highlights out-of-the-box
|
2015-12-02 11:26:49 +00:00 |
|
Mark Haines
|
dede14f689
|
Merge branch 'develop' into markjh/edu_frequency
|
2015-12-02 10:57:51 +00:00 |
|
Mark Haines
|
5eb4d13aaa
|
Fix typo in collect_presencelike_data
|
2015-12-02 10:50:58 +00:00 |
|
Mark Haines
|
c30cdb0d68
|
Add comments
|
2015-12-02 10:49:35 +00:00 |
|
Mark Haines
|
2a0ec3b89d
|
Merge branch 'develop' into markjh/edu_frequency
Conflicts:
synapse/handlers/federation.py
synapse/handlers/room.py
|
2015-12-02 10:40:22 +00:00 |
|
Erik Johnston
|
03b2a6a8aa
|
Merge pull request #409 from MadsRC/develop
Develop
|
2015-12-02 10:08:18 +00:00 |
|
Mark Haines
|
9fbd504b4e
|
Merge pull request #408 from matrix-org/markjh/distributor_facade
Wrap calls to distributor.fire in appropriately named functions
|
2015-12-02 09:44:56 +00:00 |
|
Erik Johnston
|
9670f226e3
|
Merge pull request #406 from matrix-org/erikj/search
Search: Don't disregard grouping info in pagination tokens
|
2015-12-02 09:13:20 +00:00 |
|
Mads R. Christensen
|
6863466653
|
Added a single line to explain what the server_name is used for
|
2015-12-02 00:37:55 +01:00 |
|
Mads R. Christensen
|
3d5c5e8be5
|
Added a few lines to better explain how to run Synapse on a FQDN that is not part of the UserID
|
2015-12-02 00:35:45 +01:00 |
|
Matthew Hodgson
|
65a9bf2dd5
|
various fixes - thanks to Mark White for pointing out you need to run synapse before you try to register a new user
|
2015-12-01 23:05:12 +00:00 |
|
Mark Haines
|
ae9f8cda7e
|
Merge branch 'develop' into markjh/distributor_facade
|
2015-12-01 21:18:13 +00:00 |
|
Mark Haines
|
5d321e4b9a
|
Fix definitions script
|
2015-12-01 21:17:58 +00:00 |
|
Mark Haines
|
a9526831a4
|
Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what
|
2015-12-01 20:53:04 +00:00 |
|
Mark Haines
|
ed0f79bdc5
|
Only fire user_joined_room if the membership has changed
|
2015-12-01 19:46:15 +00:00 |
|
Mads R. Christensen
|
98ee629d00
|
Added --report-status=yes|no as Synapse won't generate the config without it
|
2015-12-01 20:20:53 +01:00 |
|
Mark Haines
|
f73ea0bda2
|
Merge branch 'develop' into markjh/edu_frequency
|
2015-12-01 19:15:27 +00:00 |
|
Mads R. Christensen
|
c533f69d38
|
Added libffi-devel in CentOS 7 installation requirements and fixed indentation of yum groupinstall. Signed-off-by: Mads Robin Christensen <mads@v42.dk>
|
2015-12-01 20:00:41 +01:00 |
|
Mark Haines
|
a2922bb944
|
Merge pull request #392 from matrix-org/markjh/client_config
Add API for setting per user account data at the top level or room level.
|
2015-12-01 18:42:59 +00:00 |
|
Mark Haines
|
95f30ecd1f
|
Add API for setting account_data globaly or on a per room basis
|
2015-12-01 18:41:32 +00:00 |
|
Matthew Hodgson
|
f487355364
|
Merge pull request #407 from MadsRC/develop
Develop
|
2015-12-01 18:41:31 +00:00 |
|
Daniel Wagner-Hall
|
6e70979973
|
Merge pull request #400 from matrix-org/daniel/versioning
Merge pull request # 400 from matrix-org/daniel/versioning
|
2015-12-01 17:36:37 +00:00 |
|