Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,066 Commits 932 Branches 727 Tags 442 MiB
Commit Graph

14066 Commits

Author SHA1 Message Date
Neil Johnson 332b60ec68 Merge branch 'master' of github.com:matrix-org/synapse into develop 2019-03-12 17:15:21 +00:00
Neil Johnson 83193a9362
fix orphaned sentence 2019-03-12 16:57:17 +00:00
Andrew Morgan d42c81d724
Transfer local user's push rules on room upgrade (#4838) 
Transfer push rules (notifications) on room upgrade
 2019-03-12 14:42:53 +00:00
Amber Brown c0332d095f fixup 2019-03-13 01:30:54 +11:00
Andrew Morgan 97653ef1f4 Correct argument name 2019-03-12 14:30:26 +00:00
Neil Johnson 8b692bf7c2
Neilj/improved delegation doc 2 (#4832) 
Improved federation configuration docs.  Specifically detailing  .well-known and SRV based delegation methods. 

Inspiration Valentin Lab <valentin.lab@kalysto.org> for https://github.com/matrix-org/synapse/pull/4781
 2019-03-12 14:23:28 +00:00
Amber Brown 797b6a63fc fixup 2019-03-13 01:17:51 +11:00
Andrew Morgan 0ea8582f8b Cleaner way of implementing trailing slashes 2019-03-12 14:11:11 +00:00
Amber Brown d306bd1b26 fixup 2019-03-12 22:38:01 +11:00
Amber Brown 81d9d1bee6 fixup 2019-03-12 22:28:48 +11:00
Amber Brown 6f5890b2fa fixup 2019-03-12 22:27:56 +11:00
Amber Brown 10480c4348 fixup 2019-03-12 21:47:14 +11:00
Amber Brown 8b618041ef fixup 2019-03-12 18:06:28 +11:00
Amber Brown c980c7e31f use the old method 2019-03-12 17:51:14 +11:00
Andrew Morgan 4868b12029 and again 2019-03-11 18:22:26 +00:00
Aaron Raimist 8ea1b41a0e Clarify what registration_shared_secret allows for (#2885) (#4844) 
* Clarify what registration_shared_secret allows for (#2885)

Signed-off-by: Aaron Raimist <aaron@raim.ist>

* Add changelog

Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-03-11 18:21:52 +00:00
Andrew Morgan 802cb5dcf0 Fix syntax error 2019-03-11 18:08:28 +00:00
Andrew Morgan 66f205e93d We're calling different functions now 2019-03-11 18:01:58 +00:00
Andrew Morgan f18dca26da Merge branch 'develop' into anoa/trailing_slashes_client 2019-03-11 17:44:29 +00:00
Andrew Morgan 290552fd83
Make federation endpoints more tolerant of trailing slashes for some endpoints (#4793) 
Server side of a solution towards #3622.
 2019-03-11 17:44:03 +00:00
Erik Johnston 9c0e6e8e7c
Merge pull request #4847 from matrix-org/erikj/fix_stacktrace_keyring 
Correctly log expected errors when fetching server keys
 2019-03-11 17:12:20 +00:00
Andrew Morgan a8a028dfce Merge branch 'develop' into anoa/trailing_slashes_client 2019-03-11 17:07:31 +00:00
Erik Johnston 33dfd9a288 Newsfile 2019-03-11 14:13:58 +00:00
Erik Johnston 78c563b77c Correctly log expected errors when fetching server keys 2019-03-11 14:11:10 +00:00
Amber Brown 78a6b950b3 fix 2019-03-12 00:50:28 +11:00
Amber Brown 1b77bd69fb pep8 2019-03-12 00:39:12 +11:00
Amber Brown 41a5ba1682 changelog 2019-03-12 00:38:17 +11:00
Amber Brown 5ba8ceab4c fixes 2019-03-12 00:35:31 +11:00
Amber Brown 26eefca3b7 setup master 2019-03-11 21:16:10 +11:00
Amber Brown 8da22e2b53 master startup 2019-03-11 21:13:35 +11:00
Amber Brown 30a8deeb68 Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search 2019-03-11 21:12:30 +11:00
Amber Brown 4abc988c6a
initial 2019-03-11 21:11:36 +11:00
Andrew Morgan b61ac9660a
Merge pull request #4839 from matrix-org/anoa/no_captcha_tests 
Disable captcha registration by default in tests
 2019-03-11 09:58:43 +00:00
Matthew Hodgson 2326e00bc4 fix incorrect encoding of filenames with spaces in (#2090) 
fixes https://github.com/vector-im/riot-web/issues/3155
 2019-03-11 09:53:45 +00:00
Erik Johnston ca7f7d84f4
Merge pull request #4837 from matrix-org/erikj/optional_prev_state 
Make `prev_state` field optional
 2019-03-11 09:22:33 +00:00
Andrew Morgan a5dd335cd8 lint 2019-03-08 18:25:59 +00:00
Andrew Morgan f8740d57de Add changelog 2019-03-08 18:23:54 +00:00
Andrew Morgan 64ff11019e Retry certain federation requests on 404 2019-03-08 18:22:47 +00:00
Andrew Morgan 525dd02bbe Remove trailing slashes from outbound federation requests 2019-03-08 16:55:52 +00:00
Andrew Morgan 50924ee34a Add changelog 2019-03-08 16:49:16 +00:00
Erik Johnston fe6c12e6cd Add comment to schema 2019-03-08 16:38:23 +00:00
Andrew Morgan d6e0be92fe
Disable captcha registration by default in tests 2019-03-08 15:49:38 +00:00
Erik Johnston cac4723afe Newsfile 2019-03-08 15:08:34 +00:00
Erik Johnston 5536ddba75 Make `prev_state` field optional 
The `prev_state` field on events is not specced and so synapse shouldn't
explode if an event is missing the field.

Fixes #4787
 2019-03-08 15:05:32 +00:00
Erik Johnston 39e57f9728
Merge pull request #4814 from matrix-org/erikj/soft_fail_impl 
Implement soft fail
 2019-03-08 14:51:06 +00:00
Erik Johnston 8c4896668f Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_impl 2019-03-08 11:44:20 +00:00
Erik Johnston 0ff8163eae Factor out soft fail checks 2019-03-08 11:26:33 +00:00
Erik Johnston 469b66c102
Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates 
When re-syncing device lists reset the state
 2019-03-08 09:54:54 +00:00
Erik Johnston 436b1c8be1
Merge pull request #4828 from matrix-org/erikj/debug_device_lists 
Add some debug logging for device list handling
 2019-03-07 17:02:58 +00:00
Erik Johnston cef80da903 Newsfile 2019-03-07 16:18:02 +00:00