David Baker
|
b131fb1fe2
|
add list of things I want to fix with this branch
|
2015-12-18 18:04:45 +00:00 |
|
David Baker
|
413d0d6a24
|
Make unread notification count sending work: put the correct count in incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user...
|
2015-12-18 17:47:00 +00:00 |
|
David Baker
|
0a2d73fd60
|
Merge branch 'release-v0.12.0' into develop
|
2015-12-18 10:07:48 +00:00 |
|
David Baker
|
ce4999268a
|
Fix typo that broke registration on the mobile clients
|
2015-12-18 10:07:28 +00:00 |
|
Daniel Wagner-Hall
|
633ceb9bb1
|
Merge pull request #449 from matrix-org/daniel/3pid
Add display_name to 3pid invite in m.room.member invites
|
2015-12-18 09:55:59 +01:00 |
|
Matthew Hodgson
|
64374bda5b
|
fix indentation level
|
2015-12-17 23:04:53 +00:00 |
|
Matthew Hodgson
|
772ad4f715
|
stop generating default identicons. reverts most of 582019f870 and solves vector-web/vector-im#346
|
2015-12-17 23:04:20 +00:00 |
|
Daniel Wagner-Hall
|
bdacee476d
|
Add display_name to 3pid invite in m.room.member invites
|
2015-12-17 18:55:08 +01:00 |
|
Daniel Wagner-Hall
|
10f82b4bea
|
Merge pull request #448 from matrix-org/daniel/3pid
Strip address and such out of 3pid invites
|
2015-12-17 18:29:22 +01:00 |
|
Daniel Wagner-Hall
|
8c5f252edb
|
Strip address and such out of 3pid invites
We're not meant to leak that into the graph
|
2015-12-17 18:09:51 +01:00 |
|
Mark Haines
|
8b9f471d27
|
Merge pull request #447 from matrix-org/rav/fix_search_pagination
Fix 500 error when back-paginating search results
|
2015-12-17 16:43:50 +00:00 |
|
Richard van der Hoff
|
a64f9bbfe0
|
Fix 500 error when back-paginating search results
We were mistakenly adding pagination clauses to the count query, which then
failed because the count query doesn't join to the events table.
|
2015-12-17 12:50:46 +00:00 |
|
David Baker
|
42ad49f5b7
|
still very WIP, but now sends unread_notifications_count in the room object on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).
|
2015-12-16 18:42:09 +00:00 |
|
Daniel Wagner-Hall
|
2b0f8a9482
|
Fix typo
|
2015-12-16 17:59:44 +01:00 |
|
Daniel Wagner-Hall
|
af4422c42a
|
Merge pull request #446 from matrix-org/daniel/invitemetadata
Give the IS a bunch more 3pid invite context
This allows it to form richer emails
|
2015-12-16 14:05:46 +01:00 |
|
Daniel Wagner-Hall
|
0311612ce9
|
Give the IS a bunch more 3pid invite context
This allows it to form richer emails
|
2015-12-16 13:05:32 +00:00 |
|
Mark Haines
|
5fc03449c8
|
Merge pull request #440 from matrix-org/daniel/ise
Include errcode on Internal Server Error
|
2015-12-16 11:26:55 +00:00 |
|
Mark Haines
|
4fab578b43
|
Merge branch 'release-v0.12.0' into develop
|
2015-12-16 11:18:45 +00:00 |
|
Mark Haines
|
661b76615b
|
Merge pull request #445 from matrix-org/markjh/rebind_threepid
Allow users to change which account a 3pid is bound to
|
2015-12-15 17:07:47 +00:00 |
|
Mark Haines
|
dcfc70e8ed
|
Allow users to change which account a 3pid is bound to
|
2015-12-15 17:02:21 +00:00 |
|
Mark Haines
|
63fdd9fe0b
|
Changelog and version bump for v0.12.0-rc2
|
2015-12-14 16:26:59 +00:00 |
|
Mark Haines
|
910956b0ec
|
Merge pull request #443 from matrix-org/markjh/commentary
Add commentary for fix in PR #442
|
2015-12-14 15:48:00 +00:00 |
|
Oddvar Lovaas
|
d3ac8fd87d
|
Added info abou Martin Giess' auto-deployment process with vagrant/ansible
|
2015-12-14 15:27:27 +00:00 |
|
Mark Haines
|
e98e00558a
|
Merge pull request #444 from matrix-org/markjh/presence_race
Fix a race between started/stopped stream
|
2015-12-14 15:21:52 +00:00 |
|
Mark Haines
|
3ddf0b9722
|
Fix spacing
|
2015-12-14 15:20:59 +00:00 |
|
Mark Haines
|
2acae8300f
|
Fix logging to lie less
|
2015-12-14 15:19:37 +00:00 |
|
Mark Haines
|
dbe7892e03
|
Fix a race between started/stopped stream
|
2015-12-14 15:09:41 +00:00 |
|
Mark Haines
|
28c5181dfe
|
Add commentary for fix in PR#442
|
2015-12-14 14:50:51 +00:00 |
|
Mark Haines
|
15e9885197
|
Merge branch 'release-v0.12.0' into develop
|
2015-12-14 14:46:55 +00:00 |
|
Mark Haines
|
8505a4ddc3
|
Merge pull request #441 from matrix-org/markjh/fts_skip_invalid
Skip events that where the body, name or topic isn't a string
|
2015-12-14 14:42:35 +00:00 |
|
Mark Haines
|
6051266924
|
Merge pull request #442 from matrix-org/markjh/missing_prev_content
Check whether prev_content or prev_sender is set …
|
2015-12-14 14:39:07 +00:00 |
|
Mark Haines
|
070e28e203
|
Combine the prev content tests
|
2015-12-14 14:34:04 +00:00 |
|
Mark Haines
|
834924248f
|
Check whether prev_content or prev_sender is set before trying to rollback state
|
2015-12-14 14:09:21 +00:00 |
|
Mark Haines
|
98dfa7d24f
|
Skip events that where the body, name or topic isn't a string when back populating the FTS index
|
2015-12-14 13:55:46 +00:00 |
|
Daniel Wagner-Hall
|
338c0a8a69
|
Include errcode on Internal Server Error
|
2015-12-14 13:50:50 +00:00 |
|
Mark Haines
|
a874c0894a
|
Merge pull request #437 from matrix-org/markjh/parallel_sync
Do the /sync in parallel across the rooms like /initialSync does
|
2015-12-14 13:34:28 +00:00 |
|
Daniel Wagner-Hall
|
f382a3bb7e
|
Merge pull request #439 from matrix-org/daniel/typo
Fix typo
|
2015-12-14 12:46:34 +00:00 |
|
Daniel Wagner-Hall
|
76e69cc8de
|
Fix typo
|
2015-12-14 12:38:55 +00:00 |
|
Mark Haines
|
fde412b240
|
Merge pull request #438 from matrix-org/markjh/fix_search_sql
Fix typo in sql for full text search on sqlite3
|
2015-12-14 11:43:49 +00:00 |
|
Mark Haines
|
bfc52a2342
|
Fix typo in sql for full text search on sqlite3
|
2015-12-14 11:38:11 +00:00 |
|
Mark Haines
|
deeebbfcb7
|
Merge branch 'release-v0.12.0' into develop
|
2015-12-12 14:21:49 +00:00 |
|
Mark Haines
|
1ee7280c4c
|
Do the /sync in parallel accross the rooms like /initialSync does
|
2015-12-11 16:48:20 +00:00 |
|
Erik Johnston
|
cde49d3d2b
|
Merge pull request #435 from matrix-org/erikj/search
Include approximate count of search results
|
2015-12-11 16:27:38 +00:00 |
|
Paul Evans
|
e738920156
|
Merge pull request #433 from matrix-org/paul/tiny-fixes
Ensure that the event that gets persisted is the one that was signed
|
2015-12-11 15:29:27 +00:00 |
|
Mark Haines
|
0065e554e0
|
Merge pull request #436 from matrix-org/markjh/pip_instructions
SYN-90: We don't need --proccess-dependency-links
|
2015-12-11 15:11:30 +00:00 |
|
Mark Haines
|
5a3e4e43d8
|
SYN-90: We don't need --proccess-dependency-links
When installing synapse since all its dependencies are on PyPI
|
2015-12-11 14:39:46 +00:00 |
|
Erik Johnston
|
d9a5c56930
|
Include approximate count of search results
|
2015-12-11 11:40:23 +00:00 |
|
Erik Johnston
|
51fb590c0e
|
Use more efficient query form
|
2015-12-11 11:12:57 +00:00 |
|
Matthew Hodgson
|
5577a61090
|
throwaway 1-liner for generating password hashes
|
2015-12-10 19:03:06 +00:00 |
|
David Baker
|
5e909c73d7
|
Store nothing instead of ['dont_notify'] for events with no notification required: much as it would be nice to be able to tell between the event not having been processed and there being no notification for it, this isn't worth filling up the table with ['dont_notify'] I think. Consequently treat the empty actions array as dont_notify and filter dont_notify out of the result.
|
2015-12-10 18:40:28 +00:00 |
|