Erik Johnston
|
07cf96ebf7
|
Pin pysaml2 version to 3.x
This is due to the fact that `from saml2 import config` fails in version
4.x
|
2016-03-09 11:54:56 +00:00 |
|
Erik Johnston
|
158a322e82
|
Ensure integer is an integer
|
2016-03-09 10:20:48 +00:00 |
|
Mark Haines
|
5f5817ab05
|
Merge pull request #632 from matrix-org/markjh/py3v2
Fix relative imports so they work in both py3 and py27
|
2016-03-08 18:11:10 +00:00 |
|
Daniel Wagner-Hall
|
3b97797c8d
|
Merge branch 'develop' into daniel/ick
|
2016-03-08 17:35:09 +00:00 |
|
Daniel Wagner-Hall
|
edca2d9891
|
Idempotent-ise schema update script
If any ASes don't have an ID, the schema will fail, and then it will
error when trying to add the column again.
|
2016-03-08 17:32:29 +00:00 |
|
David Baker
|
c00f4e48ba
|
Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_params
Encode unicode objects given to post_urlencode*
|
2016-03-08 13:51:49 +00:00 |
|
Mark Haines
|
7076082ae6
|
Fix relative imports so they work in both py3 and py27
|
2016-03-08 11:45:50 +00:00 |
|
Mark Haines
|
ea72bd9600
|
Merge pull request #631 from matrix-org/markjh/py3v1
Use syntax that's valid on both py2.7 and py3
|
2016-03-08 11:08:20 +00:00 |
|
David Baker
|
9a3c80a348
|
pep8
|
2016-03-08 10:09:07 +00:00 |
|
David Baker
|
7bcee4733a
|
Encode unicode objects given to post_urlencode* otherwise urllib.urlencode chokes.
|
2016-03-08 10:04:38 +00:00 |
|
Mark Haines
|
239badea9b
|
Use syntax that works on both py2.7 and py3
|
2016-03-07 20:13:10 +00:00 |
|
David Baker
|
874fd43257
|
Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.
|
2016-03-07 17:13:56 +00:00 |
|
Erik Johnston
|
80916e6884
|
Merge pull request #626 from matrix-org/erikj/visibility
Send history visibility on boundary changes
|
2016-03-07 11:56:07 +00:00 |
|
Erik Johnston
|
2ab0bf4b97
|
Send history visibility on boundary changes
|
2016-03-04 16:54:32 +00:00 |
|
Mark Haines
|
b7a3be693b
|
Merge pull request #618 from matrix-org/markjh/pushrule_stream
Add a stream for push rule updates
|
2016-03-04 16:35:08 +00:00 |
|
Erik Johnston
|
beebc0a40f
|
Merge pull request #625 from matrix-org/erikj/kick_ban_sync
Always include kicks and bans in full /sync
|
2016-03-04 16:33:52 +00:00 |
|
Mark Haines
|
9848b54cac
|
Prefill from the correct stream
|
2016-03-04 16:20:22 +00:00 |
|
Mark Haines
|
deda48068c
|
prefill the push rules stream change cache
|
2016-03-04 16:19:42 +00:00 |
|
Mark Haines
|
ebcbb23226
|
s/stream_ordering/event_stream_ordering/ in push
|
2016-03-04 16:15:23 +00:00 |
|
Mark Haines
|
7e9fc9b6af
|
/FNARG/d
|
2016-03-04 15:54:09 +00:00 |
|
Erik Johnston
|
125f674eae
|
Always include kicks and bans in full /sync
|
2016-03-04 15:27:55 +00:00 |
|
Erik Johnston
|
13cbd31040
|
Spelling
|
2016-03-04 15:22:39 +00:00 |
|
Mark Haines
|
ec7460b4f2
|
Merge branch 'develop' into markjh/pushrule_stream
|
2016-03-04 14:44:34 +00:00 |
|
Mark Haines
|
1b4f4a936f
|
Hook up the push rules stream to account_data in /sync
|
2016-03-04 14:44:01 +00:00 |
|
Erik Johnston
|
ed61a49169
|
Add profile information to invites
|
2016-03-04 14:35:02 +00:00 |
|
Erik Johnston
|
389d558a3b
|
Merge pull request #598 from Rugvip/invite-state
config,handlers/_base: added homeserver config for what state is included in a room invite
|
2016-03-04 09:58:52 +00:00 |
|
Erik Johnston
|
44b084a75e
|
Merge pull request #596 from Rugvip/create
handlers/_base: don't allow room create event to be changed
|
2016-03-04 09:43:20 +00:00 |
|
Patrik Oldsberg
|
5fc59f009c
|
config,handlers/_base: added homeserver config for what state is included in a room invite
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
|
2016-03-04 10:43:17 +01:00 |
|
Erik Johnston
|
ce82b9e48f
|
Merge pull request #610 from Rugvip/unique-user
handlers/register: make sure another user id is generated when a collision occurs
|
2016-03-04 09:40:20 +00:00 |
|
Richard van der Hoff
|
09b1d98070
|
Merge pull request #623 from matrix-org/rav/fix_createroom_race
Make sure we add all invited members before returning from createRoom
|
2016-03-04 09:29:15 +00:00 |
|
Erik Johnston
|
dd463e246d
|
Merge pull request #614 from matrix-org/erikj/alias_delete
Allow alias creators to delete aliases
|
2016-03-04 09:02:33 +00:00 |
|
Richard van der Hoff
|
a92b4ea76f
|
Make sure we add all invited members before returning from createRoom
add a missing yield.
|
2016-03-04 00:06:03 +00:00 |
|
Richard van der Hoff
|
a85179aff3
|
Merge remote-tracking branch 'origin/develop' into rav/SYN-642
|
2016-03-03 19:05:54 +00:00 |
|
Daniel Wagner-Hall
|
0b3083c75b
|
Merge pull request #621 from matrix-org/daniel/ratelimiting
Pass whole requester to ratelimiting
|
2016-03-03 17:02:48 +00:00 |
|
Daniel Wagner-Hall
|
b4022cc487
|
Pass whole requester to ratelimiting
This will enable more detailed decisions
|
2016-03-03 16:43:42 +00:00 |
|
Erik Johnston
|
5c90451ea0
|
Merge pull request #619 from matrix-org/dbkr/dont_use_checkpw
Stop using checkpw as it seems to have vanished from bcrypt.
|
2016-03-03 16:25:41 +00:00 |
|
Mark Haines
|
3406eba4ef
|
Move the code for formatting push rules into a separate function
|
2016-03-03 16:11:59 +00:00 |
|
Mark Haines
|
ddf9e7b302
|
Hook up the push rules to the notifier
|
2016-03-03 14:57:45 +00:00 |
|
Daniel Wagner-Hall
|
95481e7ba7
|
Merge pull request #571 from matrix-org/daniel/asids
Mark AS users with their AS's ID
|
2016-03-03 13:56:28 +00:00 |
|
Richard van der Hoff
|
79f34bdbc2
|
Merge branch 'develop' into rav/SYN-642
|
2016-03-03 11:39:25 +00:00 |
|
Richard van der Hoff
|
74cd80e530
|
Fix typo
|
2016-03-03 10:28:58 +00:00 |
|
David Baker
|
ff8b87118d
|
Stop using checkpw as it seems to have vanished from bcrypt. Use bcrypt.hashpw(password, hashed) == hashed as per the bcrypt README.
|
2016-03-02 18:06:45 +00:00 |
|
Mark Haines
|
2223204eba
|
Hook push rules up to the replication API
|
2016-03-02 17:26:20 +00:00 |
|
Richard van der Hoff
|
fc1f932cc0
|
Move arg default to the start of the function
Also don't overwrite the list that gets passed in.
|
2016-03-02 16:44:14 +00:00 |
|
Matthew Hodgson
|
c0147f86a1
|
Merge pull request #616 from matrix-org/matthew/800x600
add 800x600 thumbnails to make vector look prettier (and anyone else …
|
2016-03-02 16:02:26 +00:00 |
|
Matthew Hodgson
|
47c361d2f8
|
add 800x600 thumbnails to make vector look prettier (and anyone else who likes big thumbnails)
|
2016-03-02 15:57:54 +00:00 |
|
Richard van der Hoff
|
863d3f26b3
|
fix pyflakes quibble
|
2016-03-02 15:52:50 +00:00 |
|
Richard van der Hoff
|
9ff940a0ef
|
Address review comments
|
2016-03-02 15:40:30 +00:00 |
|
Erik Johnston
|
2a78dac60d
|
Merge pull request #612 from matrix-org/erikj/cache_size
Add environment variable SYNAPSE_CACHE_FACTOR, default it to 0.1
|
2016-03-02 14:36:10 +00:00 |
|
Mark Haines
|
a1cf9e3bf3
|
Add a stream for push rule updates
|
2016-03-01 18:16:37 +00:00 |
|