Matthew Hodgson
3a7375f15e
fix binger description
2014-09-18 15:25:11 +01:00
Erik Johnston
79a5fb469b
Merge branch 'master' of github.com:matrix-org/synapse into develop
2014-09-18 14:52:19 +01:00
Erik Johnston
9fd0c74e90
Bump changelog and versions
2014-09-18 14:46:23 +01:00
Erik Johnston
335e5d131c
Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop
...
Conflicts:
tests/handlers/test_profile.py
2014-09-18 14:31:47 +01:00
Emmanuel ROHEE
b7d42c1e93
SYWEB-40: Only local rooms are shown in the recents list.
...
Removed an old patch that deduplicated join events. This patch is now useless. Plus it is buggy since it compared event.content and event.prev_content only on the membership field whereas these objects contain more data now like displayname...
2014-09-18 15:28:52 +02:00
Emmanuel ROHEE
0db0528e8e
Reverted patches done for SYWEB-40
2014-09-18 15:19:35 +02:00
Erik Johnston
704e7e9f44
Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse
2014-09-18 13:05:07 +01:00
Erik Johnston
c58f7f293d
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.3.0
2014-09-18 12:03:30 +01:00
Erik Johnston
19095552aa
Update Change log
2014-09-18 12:03:08 +01:00
Kegan Dougal
a64ff63a41
SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it plays nicer with federation.
2014-09-18 12:02:52 +01:00
Erik Johnston
17db2b27bf
Update version in UPGRADE
2014-09-18 12:02:52 +01:00
Kegan Dougal
ac8d73b258
Patch for SYWEB-40 : isStateEvent is not being set correctly, and really shouldn't be a configurable arg in the first place. As a result of being undefined, the events.rooms[rid].members object was not being updated in some cases, which combined with the recents-filter bug ( 32808e4), caused federated rooms to not appear in the recents list.
2014-09-18 12:02:52 +01:00
Kegan Dougal
a6f5c88b47
Still add the room to the filtered list even if you can't work out the number of users in the room.
2014-09-18 12:02:51 +01:00
David Baker
1c0408de08
unbreak calls in firefox
2014-09-18 11:59:27 +01:00
Kegan Dougal
9cebfd9d90
SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it plays nicer with federation.
2014-09-18 11:35:59 +01:00
Kegan Dougal
fbf221ae6d
Patch for SYWEB-40 : isStateEvent is not being set correctly, and really shouldn't be a configurable arg in the first place. As a result of being undefined, the events.rooms[rid].members object was not being updated in some cases, which combined with the recents-filter bug ( 32808e4), caused federated rooms to not appear in the recents list.
2014-09-18 10:35:44 +01:00
Kegan Dougal
32808e4111
Still add the room to the filtered list even if you can't work out the number of users in the room.
2014-09-18 10:05:34 +01:00
Matthew Hodgson
9f94f9de48
freenode verification
2014-09-17 23:53:53 +01:00
Paul "LeoNerd" Evans
4571cf7baa
Merge branch 'develop' into test-sqlite-memory
2014-09-17 18:27:47 +01:00
Paul "LeoNerd" Evans
bfae582fa3
Remark on remaining storage modules that still need unit tests
2014-09-17 18:27:30 +01:00
David Baker
575852e6b5
add note to upgrade.rst about web client spec breaking change.
2014-09-17 17:51:22 +01:00
Erik Johnston
10b4291b54
Bump versions
2014-09-17 17:49:01 +01:00
Paul "LeoNerd" Evans
bcf5121937
Neaten more of the storage layer tests with assertObjectHasAttributes; more standardisation on test layout
2014-09-17 16:58:59 +01:00
Kegan Dougal
aeaeceb92c
Create room entries for public rooms too so their public state is transferred over correctly when you join it.
2014-09-17 16:38:40 +01:00
Kegan Dougal
16f55d4275
webclient SYWEB-3 : Public rooms are bold. Can't think of a nicer way which doesn't clutter the recents list.
2014-09-17 16:38:40 +01:00
Paul "LeoNerd" Evans
b588ce920d
Unit tests for (some) room events via the RoomStore
2014-09-17 16:31:11 +01:00
Emmanuel ROHEE
246f5d2e20
SYWEB-30: BF: When switching between rooms, pagination flickered between the top of the room before jumping to the bottom of the page
2014-09-17 17:13:07 +02:00
Kegan Dougal
c707b7d128
SYWEB-3 : Added 'visibility' key to rooms returned via /initialSync
2014-09-17 16:09:07 +01:00
Paul "LeoNerd" Evans
ba41ca45fa
Use new assertObjectHasAttributes() in tests/storage/test_room.py
2014-09-17 16:04:05 +01:00
Paul "LeoNerd" Evans
7aacd6834a
Added a useful unit test primitive for asserting object attributes
2014-09-17 15:56:40 +01:00
Paul "LeoNerd" Evans
de14853237
More RoomStore tests
2014-09-17 15:33:10 +01:00
Paul "LeoNerd" Evans
9973298e2a
Print expected-vs-actual data types on typecheck failure from check_json()
2014-09-17 15:27:45 +01:00
Emmanuel ROHEE
65c37cc852
SYWEB-22: Format emote('/me') messages correctly in desktop notification
2014-09-17 16:13:09 +02:00
Erik Johnston
b6818fd4d2
SYN-40: When a user updates their displayname or avatar update all their join events for all the rooms they are currently in.
2014-09-17 15:05:14 +01:00
Emmanuel ROHEE
fe7af80198
BF: edit the actual room name not the displayed room name (which has been computed)
2014-09-17 15:46:12 +02:00
Emmanuel ROHEE
9aed6a06cf
SYWEB-15: Always show the room alias as well as its name in the UI
2014-09-17 15:38:20 +02:00
Emmanuel ROHEE
b3a0961c6c
SYWEB-7: Use sessionStorage to make per-room history survives when the user navigates through rooms
2014-09-17 14:38:33 +02:00
Emmanuel ROHEE
d9a9a47075
SYWEB-7: Up & down keys let user step through the history as per readline or xchat
2014-09-17 14:18:39 +02:00
Emmanuel ROHEE
f9bb000ccf
WEB-35: joins/parts should trigger desktop notifications
2014-09-17 09:41:21 +02:00
Kegan Dougal
d6c0cff3bd
Bugfix when content isn't a string.
2014-09-16 16:31:16 +01:00
Kegan Dougal
95e171e19a
Don't bing for sent messages. Handle cases where the member is unknown rather than erroring out.
2014-09-16 16:23:20 +01:00
Kegan Dougal
d7b206cc93
Added basic RegExp support.
2014-09-16 16:10:48 +01:00
Emmanuel ROHEE
06dfbdf7c8
WEB-27: We don't need to show the user-count in Recents in the room sidepanel - takes up too much room
2014-09-16 17:07:47 +02:00
Kegan Dougal
3395a3305f
Bing on all the things if there are 0 bing words.
2014-09-16 15:47:29 +01:00
Kegan Dougal
5aaa3c09c1
hidden/minimise/focus disaster disclaimer with the TODO
2014-09-16 15:35:23 +01:00
Kegan Dougal
b36a0c71d1
Added utility function containsBingWord and hook up some css to it.
2014-09-16 15:35:23 +01:00
Kegan Dougal
a402e0c5e6
Added bing detection logic. Persist the display name of the user in localstorage for use when binging.
2014-09-16 15:35:23 +01:00
Kegan Dougal
660364d6a7
Move the notification logic out of an individual room controller and into the general event handler, so we can notify for >1 room.
2014-09-16 15:35:23 +01:00
Kegan Dougal
b170fe921e
Added a section on bing words if you enable desktop notifications.
2014-09-16 15:35:23 +01:00
David Baker
84372cef4a
Time out calls from both ends properly.
2014-09-16 15:26:22 +01:00
