Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,196 Commits 842 Branches 671 Tags 438 MiB
Commit Graph

5196 Commits

Author SHA1 Message Date
Erik Johnston 8b5349c7bc Merge branch 'master' of github.com:matrix-org/synapse into develop 2015-11-19 16:17:54 +00:00
Erik Johnston 37de8a7f4a Remove m.login.token from advertised flows. 2015-11-19 16:16:49 +00:00
Mark Haines 7a802ec0ff Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data 
s/private_user_data/account_data/
 2015-11-19 15:21:35 +00:00
Daniel Wagner-Hall d2ecde2cbb Merge pull request #382 from matrix-org/daniel/macarooncleanup 
Take a boolean not a list of lambdas
 2015-11-19 15:16:32 +00:00
Daniel Wagner-Hall 248cfd5eb3 Take a boolean not a list of lambdas 2015-11-19 15:16:25 +00:00
Daniel Wagner-Hall 9da4c5340d Simplify code 2015-11-19 10:07:21 -05:00
Erik Johnston f9d9bd6aa0 Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse 2015-11-19 13:11:49 +00:00
Erik Johnston 5fcef78c6a Bump changes and version 2015-11-19 13:09:48 +00:00
Erik Johnston c104fd3494 Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2 2015-11-19 13:08:44 +00:00
Erik Johnston 57a76c9aee Merge pull request #388 from matrix-org/erikj/messages 
Split out text for missing config options.
 2015-11-19 13:08:09 +00:00
Erik Johnston 06f74068f4 Comment 2015-11-19 13:05:51 +00:00
Erik Johnston e5d91b8e57 Merge pull request #387 from matrix-org/erikj/fix_port_script 
Fix database port script to work with new event_search table
 2015-11-19 13:04:28 +00:00
Richard van der Hoff f6e092f6cc Put back the 'state.events' subobject 
We're keeping 'events', in case we decide to add more keys later.
 2015-11-19 12:23:42 +00:00
Richard van der Hoff 24ae0eee8e v2 /sync: Rename the keys of the 'rooms' object to match member states 
joined->join
invited->invite
archived->leave
 2015-11-19 10:51:12 +00:00
Richard van der Hoff 3c3fc6b268 Flatten the /sync response to remove the event_map 2015-11-19 10:51:11 +00:00
Erik Johnston b361440738 Spelling 2015-11-19 09:11:42 +00:00
Daniel Wagner-Hall f0ee1d515b Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cached 
Share sytest clone across runs

Depends on https://github.com/matrix-org/synapse/pull/380
 2015-11-18 23:22:34 +00:00
Daniel Wagner-Hall 628ba81a77 Share sytest clone across runs 
Depends on https://github.com/matrix-org/synapse/pull/380
 2015-11-18 23:22:27 +00:00
Daniel Wagner-Hall bed7889703 Apply forgetting properly to historical events 2015-11-18 18:11:12 -05:00
Erik Johnston 03204f54ac Merge branch 'master' of github.com:matrix-org/synapse into develop 2015-11-18 18:38:06 +00:00
Erik Johnston 037ce4c68f Split out text for missing config options. 
This allows packages to more easily override the default messages to
include package specific options.
 2015-11-18 18:37:05 +00:00
Oddvar Lovaas 2fcd9819ac Erik pointed out we should advise on the lack of included client 2015-11-18 16:51:26 +00:00
Erik Johnston 162e2c1ce5 Fix database port script to work with new event_search table 2015-11-18 15:54:50 +00:00
Erik Johnston 1fe973fa5a Merge branch 'master' of github.com:matrix-org/synapse into develop 2015-11-18 15:53:39 +00:00
Mark Haines d153f482dd Rename the database table 2015-11-18 15:33:02 +00:00
Mark Haines 1c960fbb80 s/private_user_data/account_data/ 2015-11-18 15:31:04 +00:00
Erik Johnston 915e56e1af Merge branch 'hotfixes-v0.11.0-r1' 2015-11-18 14:15:25 +00:00
Erik Johnston fbb76a4d5d Change date 2015-11-18 14:15:03 +00:00
Oddvar Lovaas 8bae98b314 adding link to apt repo 2015-11-18 11:44:35 +00:00
Erik Johnston fe51b3628e Better change log 2015-11-18 11:31:05 +00:00
Daniel Wagner-Hall ba26eb3d5d Allow users to forget rooms 2015-11-17 17:17:30 -05:00
Erik Johnston cf844e2ad6 Bump changelog and version 2015-11-17 18:48:32 +00:00
Erik Johnston b697a842a5 Merge pull request #384 from matrix-org/erikj/shorter_retries 
Only retry federation requests for a long time for background requests
 2015-11-17 18:46:04 +00:00
Erik Johnston bd3de8f39a Update tests 2015-11-17 18:38:48 +00:00
Erik Johnston cbf3cd6151 Add comment 2015-11-17 18:29:29 +00:00
Erik Johnston a9770e5d24 Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop 2015-11-17 18:27:17 +00:00
Erik Johnston cf4ef5f3c7 Only retry federation requests for a long time for background requests 2015-11-17 18:26:50 +00:00
Erik Johnston afdfd12bdf Implement required method 'resumeProducing' 2015-11-17 16:57:06 +00:00
Erik Johnston d3861b4442 Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse 2015-11-17 15:45:43 +00:00
Erik Johnston 391f2aa56c Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop 2015-11-17 15:10:49 +00:00
Erik Johnston bceec65913 Slightly more aggressive retry timers at HTTP level 2015-11-17 15:10:05 +00:00
Erik Johnston 9eff52d1a6 Bump changelog and version 2015-11-17 14:38:36 +00:00
Erik Johnston 0186aef814 Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 2015-11-17 14:37:13 +00:00
Erik Johnston e503848990 Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver 
SH CAS auth via homeserver
 2015-11-17 14:36:15 +00:00
Daniel Wagner-Hall 90b3a98df7 Merge pull request #380 from matrix-org/daniel/jenkins-sytest 
Merge pull request #380 from matrix-org/daniel/jenkins-sytest

Run sytests on jenkins
 2015-11-17 09:17:03 -05:00
Daniel Wagner-Hall d34990141e Merge pull request #379 from matrix-org/daniel/jenkins 
Output results files on jenkins
 2015-11-17 09:14:20 -05:00
Steven Hammerton f20d064e05 Always check guest = true in macaroons 2015-11-17 10:58:05 +00:00
Steven Hammerton f5e25c5f35 Merge branch 'develop' into sh-cas-auth-via-homeserver 2015-11-17 10:55:41 +00:00
Daniel Wagner-Hall f4db76692f Run sytests on jenkins 2015-11-16 15:40:55 -05:00
Daniel Wagner-Hall 09bb5cf02f Output results files on jenkins 
Outputs:
 * results.xml
 * coverage.xml
 * violations.flake8.log
 2015-11-16 14:35:57 -05:00