Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-08-19 17:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
6786 commits 903 branches 710 tags 454 MiB
Commit graph

6786 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Johnston
d2b59f2482 Implement top-level unread_notifications 2016-06-28 10:55:54 +01:00
Erik Johnston
6c137b321d Encode batch tokens better 2016-06-27 15:21:12 +01:00
Erik Johnston
4b7abedfd9 Comments 2016-06-27 15:10:39 +01:00
Erik Johnston
f07f99387e Use cbor 2016-06-27 14:24:50 +01:00
Erik Johnston
4c67e06dfb Use JSON instead of msgpack 2016-06-27 13:18:04 +01:00
Erik Johnston
92c58932d1 More logging 2016-06-27 11:51:06 +01:00
Erik Johnston
3263e12d73 Try serializing as json rather than msgpack 2016-06-27 11:24:58 +01:00
Erik Johnston
c0b2f33dc2 Logging 2016-06-27 10:34:52 +01:00
Erik Johnston
3ace9bdff9 Empty commit 2016-06-24 16:34:37 +01:00
Erik Johnston
434c51d538 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync 2016-06-24 16:09:23 +01:00
Mark Haines
535b6bfacc Merge pull request #895 from matrix-org/markjh/jenkins_port_range 
Fix the sytests to use a port-range rather than a port base
 2016-06-24 14:03:01 +01:00
Erik Johnston
a72919b748 Add get_last_event_id_ts_for_room to slave DataStore 2016-06-24 13:54:06 +01:00
Mark Haines
f7fe0e5f67 Fix the sytests to use a port-range rather than a port base 2016-06-24 13:53:03 +01:00
Erik Johnston
62050d2dfb Comments 2016-06-24 11:11:53 +01:00
Erik Johnston
bf0edf7a16 Make jenkins-unittests.sh install deps 2016-06-24 11:05:09 +01:00
Erik Johnston
9df5f81687 Make get_room_tags_changed take a now position. Comments 2016-06-23 17:50:30 +01:00
Erik Johnston
a7e6ad9f3e Use SyncExtras 2016-06-23 17:26:27 +01:00
Erik Johnston
6c8c061c2f Move stuff into separate function 2016-06-23 16:25:11 +01:00
Erik Johnston
7b3324e252 Get rid of per room full_state flag 2016-06-23 15:48:33 +01:00
Erik Johnston
8c3fca8b28 Correctly handle tags changing in paginated sync 2016-06-23 13:43:25 +01:00
Mark Haines
05f1a4596a Merge branch 'master' into develop 2016-06-23 11:17:48 +01:00
Erik Johnston
a90140358b Change default tag handling 2016-06-23 10:40:43 +01:00
David Baker
13517e2914 Merge pull request #892 from matrix-org/dbkr/email_notif_most_recent 
Put most recent 20 messages in notif
 2016-06-23 09:25:45 +01:00
David Baker
b5fb7458d5 Actually we need to order these properly 
otherwise we'll end up returning the wrong 20
 2016-06-22 18:07:14 +01:00
David Baker
f73fdb04a6 Style 2016-06-22 17:51:40 +01:00
David Baker
3a4120e49a Put most recent 20 messages in notif 
Fixes https://github.com/vector-im/vector-web/issues/1648
 2016-06-22 17:47:18 +01:00
Erik Johnston
9fe894402f Merge pull request #843 from mweinelt/ldap3-rewrite 
Rewrite LDAP Authentication against ldap3
 2016-06-22 17:23:07 +01:00
Martin Weinelt
0a32208e5d Rework ldap integration with ldap3 
Use the pure-python ldap3 library, which eliminates the need for a
system dependency.

Offer both a `search` and `simple_bind` mode, for more sophisticated
ldap scenarios.
- `search` tries to find a matching DN within the `user_base` while
  employing the `user_filter`, then tries the bind when a single
  matching DN was found.
- `simple_bind` tries the bind against a specific DN by combining the
  localpart and `user_base`

Offer support for STARTTLS on a plain connection.

The configuration was changed to reflect these new possibilities.

Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
 2016-06-22 17:51:59 +02:00
Erik Johnston
baab93b0dd Implement 'synced' flag 2016-06-22 11:40:06 +01:00
Erik Johnston
839088e2e7 Support streaming peek 2016-06-22 11:02:27 +01:00
Erik Johnston
6a101e512f Add tag handling 2016-06-22 10:59:24 +01:00
Mark Haines
774f3a692c Merge pull request #889 from matrix-org/markjh/synctl_workers 
Optionally start or stop workers in synctl.
 2016-06-21 17:58:19 +01:00
Mark Haines
5cc7564c5c Optionally start or stop workers in synctl. 
Optionally start or stop an individual worker by passing -w with
the path to the worker config.
Optionally start or stop every worker and the main synapse by
passing -a with a path to a directory containing worker configs.

The "-w" is intended to be used to bounce individual workers proceses.
THe "-a" is intended for when you want to restart all the workers
simultaneuously, for example when performing database upgrades.
 2016-06-21 16:38:05 +01:00
Mark Haines
0fe0b0eeb6 Merge pull request #888 from matrix-org/markjh/content_repo 
Remove the legacy v0 content upload API.
 2016-06-21 14:01:01 +01:00
David Baker
0126a5d60a Merge pull request #887 from matrix-org/dbkr/notif_template_subs_fail 
Fix substitution failure in mail template
 2016-06-21 13:48:54 +01:00
Mark Haines
13e334506c Remove the legacy v0 content upload API. 
The existing content can still be downloaded. The last upload to the
matrix.org server was in January 2015, so it is probably safe to remove
the upload API.
 2016-06-21 11:47:39 +01:00
David Baker
6b40e4f52a Fix substitution failure in mail template 2016-06-21 11:37:56 +01:00
Erik Johnston
cdd379b6df Use msgpack for shorter tokens 2016-06-21 11:36:28 +01:00
Erik Johnston
3b6027dbc1 Always include tags 2016-06-21 11:18:09 +01:00
Erik Johnston
6992fb9bc1 Implement error responses 2016-06-21 10:29:44 +01:00
Erik Johnston
d8ec81cc31 Merge pull request #879 from matrix-org/erikj/linearize_fed_server 
Linearize some federation endpoints based on (origin, room_id)
 2016-06-20 17:34:29 +01:00
Erik Johnston
22dea0ca37 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync 2016-06-20 14:39:58 +01:00
Erik Johnston
bc72d381b2 Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse 2016-06-20 14:18:04 +01:00
Erik Johnston
4d362a61ea Bump version and changelog 2016-06-20 14:17:42 +01:00
Erik Johnston
00c281f6a4 Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1 2016-06-20 14:13:54 +01:00
Mark Haines
c8cd41cdd8 Merge pull request #880 from matrix-org/markjh/registered_user 
Remove registered_users from the distributor.
 2016-06-17 19:45:06 +01:00
Mark Haines
41e4b2efea Add the create_profile method back since the tests use it 2016-06-17 19:20:47 +01:00
Mark Haines
0c13d45522 Add a comment on why we don't create a profile for upgrading users 2016-06-17 19:18:53 +01:00
Mark Haines
9f1800fba8 Remove registered_users from the distributor. 
The only place that was observed was to set the profile. I've made it
so that the profile is set within store.register in the same transaction
that creates the user.

This required some slight changes to the registration code for upgrading
guest users, since it previously relied on the distributor swallowing errors
if the profile already existed.
 2016-06-17 19:14:16 +01:00
Erik Johnston
8f4a9bbc16 Linearize some federation endpoints based on (origin, room_id) 2016-06-17 16:43:45 +01:00