Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix SYWEB-41 (hopefully) | Matthew Hodgson | 2014-09-18 | 1 | -1/+7 |
| | |||||
* | Fixed missing component dependency which created a crash | Emmanuel ROHEE | 2014-09-18 | 1 | -3/+2 |
| | |||||
* | Added test directory, karma conf, and angular-mocks. Expect it to work? Pah, ↵ | Kegan Dougal | 2014-09-18 | 3 | -0/+2314 |
| | | | | not yet. | ||||
* | Oops. Removed dev logs | Emmanuel ROHEE | 2014-09-18 | 1 | -1/+0 |
| | |||||
* | SYWEB-14: BF: rooms invitations were not visible in recents after ↵ | Emmanuel ROHEE | 2014-09-18 | 3 | -3/+22 |
| | | | | launching/refreshing the web page | ||||
* | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-18 | 4 | -3/+10 |
|\ | |||||
| * | Bump Changelog and version v0.3.2 | Erik Johnston | 2014-09-18 | 3 | -2/+9 |
| | | |||||
| * | undefined is empty. Fixed bug where empty bingWords with old accounts which ↵ | Kegan Dougal | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | hadn't logged in didn't send notifications. | ||||
* | | fix wordwrap | Matthew Hodgson | 2014-09-18 | 1 | -2/+2 |
| | | |||||
* | | fix binger description | Matthew Hodgson | 2014-09-18 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-18 | 5 | -21/+17 |
|\| | |||||
| * | Bump changelog and versions v0.3.1 | Erik Johnston | 2014-09-18 | 3 | -2/+11 |
| | | |||||
| * | SYWEB-40: Only local rooms are shown in the recents list. | Emmanuel ROHEE | 2014-09-18 | 1 | -7/+0 |
| | | | | | | | | 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... | ||||
| * | Reverted patches done for SYWEB-40 | Emmanuel ROHEE | 2014-09-18 | 2 | -12/+6 |
| | | |||||
* | | Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-18 | 23 | -298/+1064 |
|\ \ | |/ |/| | | | | | Conflicts: tests/handlers/test_profile.py | ||||
| * | Merge branch 'develop' into test-sqlite-memory | Paul "LeoNerd" Evans | 2014-09-17 | 40 | -452/+1259 |
| |\ | |||||
| * | | Remark on remaining storage modules that still need unit tests | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -0/+5 |
| | | | |||||
| * | | Neaten more of the storage layer tests with assertObjectHasAttributes; more ↵ | Paul "LeoNerd" Evans | 2014-09-17 | 3 | -20/+22 |
| | | | | | | | | | | | | standardisation on test layout | ||||
| * | | Unit tests for (some) room events via the RoomStore | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -0/+85 |
| | | | |||||
| * | | Use new assertObjectHasAttributes() in tests/storage/test_room.py | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -3/+6 |
| | | | |||||
| * | | Added a useful unit test primitive for asserting object attributes | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -0/+11 |
| | | | |||||
| * | | More RoomStore tests | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -4/+40 |
| | | | |||||
| * | | Print expected-vs-actual data types on typecheck failure from check_json() | Paul "LeoNerd" Evans | 2014-09-17 | 1 | -1/+2 |
| | | | |||||
| * | | Initial pass at a RoomStore test | Paul "LeoNerd" Evans | 2014-09-15 | 1 | -0/+53 |
| | | | |||||
| * | | Also unittest RoomMemberStore's joined_hosts_for_room() | Paul "LeoNerd" Evans | 2014-09-15 | 1 | -0/+48 |
| | | | |||||
| * | | Use new 'tests.unittest' in new storage level tests | Paul "LeoNerd" Evans | 2014-09-15 | 5 | -5/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into test-sqlite-memory | Paul "LeoNerd" Evans | 2014-09-15 | 44 | -108/+269 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into test-sqlite-memory | Paul "LeoNerd" Evans | 2014-09-12 | 32 | -3833/+7332 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/pdu.py | ||||
| * | | | | Initial hack at some RoomMemberStore unit tests | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -0/+109 |
| | | | | | |||||
| * | | | | More accurate docs / clearer paramter names in RoomMemberStore | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -6/+7 |
| | | | | | |||||
| * | | | | Revert recent changes to RoomMemberStore | Paul "LeoNerd" Evans | 2014-09-12 | 2 | -28/+10 |
| | | | | | |||||
| * | | | | Now don't need the other logger.debug() call in _execute | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | Logging of all SQL queries via the 'synapse.storage.SQL' logger | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -2/+43 |
| | | | | | |||||
| * | | | | Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool | Paul "LeoNerd" Evans | 2014-09-12 | 8 | -33/+42 |
| | | | | | |||||
| * | | | | Add a better _store_room_member_txn() method that takes separated fields ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -8/+21 |
| | | | | | | | | | | | | | | | | | | | | instead of an event object; also add FIXME comment about a big bug in the logic | ||||
| * | | | | Rename _store_room_member_txn to _store_room_member_from_event_txn so we can ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | create another, more sensible function of that name | ||||
| * | | | | Unit-test for RegistrationStore using SQLiteMemoryDbPool | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -0/+69 |
| | | | | | |||||
| * | | | | Perform PresenceInvitesTestCase against real SQLiteMemoryDbPool | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -78/+98 |
| | | | | | |||||
| * | | | | Need to prepare() the SQLiteMemoryDbPool before passing it to HomeServer ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 6 | -18/+24 |
| | | | | | | | | | | | | | | | | | | | | constructor, as DataStore's constructor will want it ready | ||||
| * | | | | Start of converting PresenceHandler unit tests to use SQLiteMemoryDbPool - ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -46/+27 |
| | | | | | | | | | | | | | | | | | | | | just the 'State' test case for now | ||||
| * | | | | Unit-test DirectoryHandler against (real) SQLite memory store, not mocked ↵ | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -15/+12 |
| | | | | | | | | | | | | | | | | | | | | storage layer | ||||
| * | | | | Added unit tests of DirectoryStore | Paul "LeoNerd" Evans | 2014-09-11 | 1 | -0/+66 |
| | | | | | |||||
| * | | | | Test ProfileHandler against the real datastore layer using SQLite :memory: | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -25/+25 |
| | | | | | |||||
| * | | | | Added unit tests for PresenceDataStore too | Paul "LeoNerd" Evans | 2014-09-10 | 2 | -2/+166 |
| | | | | | |||||
| * | | | | Remember to kill now-dead import in test_profile.py | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Move SQLiteMemoryDbPool implementation into tests.utils | Paul "LeoNerd" Evans | 2014-09-10 | 2 | -27/+15 |
| | | | | | |||||
| * | | | | It's considered polite to actually wait for DB prepare before running tests | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Also test avatar_url profile field | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | Tiny trivial PoC unit-test using SQLite in :memory: mode | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -0/+78 |
| | | | | | |||||
| * | | | | prepare_database() on db_conn, not plain name, so we can pass in the ↵ | Paul "LeoNerd" Evans | 2014-09-10 | 2 | -32/+35 |
| | | | | | | | | | | | | | | | | | | | | connection from outside | ||||
| * | | | | Make sure not to open our TCP ports until /after/ the DB is nicely prepared ↵ | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | ready for use | ||||
| * | | | | No need for a tiny run() function any more, just use reactor.run() directly | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -6/+2 |
| | | | | | |||||
| * | | | | Move database preparing code out of homserver.py into storage where it belongs | Paul "LeoNerd" Evans | 2014-09-10 | 3 | -64/+71 |
| | | | | | |||||
* | | | | | Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse v0.3.0 | Erik Johnston | 2014-09-18 | 68 | -623/+1807 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.3.0 | Erik Johnston | 2014-09-18 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it ↵ | Kegan Dougal | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | plays nicer with federation. | ||||
| | * | | | | | Patch for SYWEB-40 : isStateEvent is not being set correctly, and really ↵ | Kegan Dougal | 2014-09-18 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | | | Still add the room to the filtered list even if you can't work out the ↵ | Kegan Dougal | 2014-09-18 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | number of users in the room. | ||||
| * | | | | | | Update Change log | Erik Johnston | 2014-09-18 | 1 | -2/+29 |
| | | | | | | | |||||
| * | | | | | | SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it ↵ | Kegan Dougal | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | plays nicer with federation. | ||||
| * | | | | | | Update version in UPGRADE | Erik Johnston | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Patch for SYWEB-40 : isStateEvent is not being set correctly, and really ↵ | Kegan Dougal | 2014-09-18 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | Still add the room to the filtered list even if you can't work out the ↵ | Kegan Dougal | 2014-09-18 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | number of users in the room. | ||||
| * | | | | | | unbreak calls in firefox | David Baker | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | add note to upgrade.rst about web client spec breaking change. | David Baker | 2014-09-17 | 1 | -0/+8 |
| | | | | | | | |||||
| * | | | | | | Bump versions | Erik Johnston | 2014-09-17 | 2 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | Create room entries for public rooms too so their public state is ↵ | Kegan Dougal | 2014-09-17 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | transferred over correctly when you join it. | ||||
| * | | | | | webclient SYWEB-3 : Public rooms are bold. Can't think of a nicer way which ↵ | Kegan Dougal | 2014-09-17 | 4 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | doesn't clutter the recents list. | ||||
| * | | | | | SYWEB-30: BF: When switching between rooms, pagination flickered between the ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -2/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | top of the room before jumping to the bottom of the page | ||||
| * | | | | | SYWEB-3 : Added 'visibility' key to rooms returned via /initialSync | Kegan Dougal | 2014-09-17 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | SYWEB-22: Format emote('/me') messages correctly in desktop notification | Emmanuel ROHEE | 2014-09-17 | 1 | -1/+7 |
| | | | | | | |||||
| * | | | | | SYN-40: When a user updates their displayname or avatar update all their ↵ | Erik Johnston | 2014-09-17 | 3 | -3/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | join events for all the rooms they are currently in. | ||||
| * | | | | | BF: edit the actual room name not the displayed room name (which has been ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | computed) | ||||
| * | | | | | SYWEB-15: Always show the room alias as well as its name in the UI | Emmanuel ROHEE | 2014-09-17 | 1 | -54/+56 |
| | | | | | | |||||
| * | | | | | SYWEB-7: Use sessionStorage to make per-room history survives when the user ↵ | Emmanuel ROHEE | 2014-09-17 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | navigates through rooms | ||||
| * | | | | | SYWEB-7: Up & down keys let user step through the history as per readline or ↵ | Emmanuel ROHEE | 2014-09-17 | 2 | -3/+72 |
| | |_|_|/ | |/| | | | | | | | | | | | | | xchat | ||||
| * | | | | WEB-35: joins/parts should trigger desktop notifications | Emmanuel ROHEE | 2014-09-17 | 1 | -4/+18 |
| | | | | | |||||
| * | | | | Bugfix when content isn't a string. | Kegan Dougal | 2014-09-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Don't bing for sent messages. Handle cases where the member is unknown ↵ | Kegan Dougal | 2014-09-16 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | rather than erroring out. | ||||
| * | | | | Added basic RegExp support. | Kegan Dougal | 2014-09-16 | 2 | -5/+3 |
| | | | | | |||||
| * | | | | WEB-27: We don't need to show the user-count in Recents in the room ↵ | Emmanuel ROHEE | 2014-09-16 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | sidepanel - takes up too much room | ||||
| * | | | | Bing on all the things if there are 0 bing words. | Kegan Dougal | 2014-09-16 | 2 | -0/+7 |
| | | | | | |||||
| * | | | | hidden/minimise/focus disaster disclaimer with the TODO | Kegan Dougal | 2014-09-16 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Added utility function containsBingWord and hook up some css to it. | Kegan Dougal | 2014-09-16 | 3 | -31/+46 |
| | | | | | |||||
| * | | | | Added bing detection logic. Persist the display name of the user in ↵ | Kegan Dougal | 2014-09-16 | 4 | -7/+44 |
| | | | | | | | | | | | | | | | | | | | | localstorage for use when binging. | ||||
| * | | | | Move the notification logic out of an individual room controller and into ↵ | Kegan Dougal | 2014-09-16 | 2 | -17/+19 |
| | | | | | | | | | | | | | | | | | | | | the general event handler, so we can notify for >1 room. | ||||
| * | | | | Added a section on bing words if you enable desktop notifications. | Kegan Dougal | 2014-09-16 | 3 | -2/+19 |
| | | | | | |||||
| * | | | | Time out calls from both ends properly. | David Baker | 2014-09-16 | 2 | -8/+20 |
| | | | | | |||||
| * | | | | Fixed scroll flickering when opening the room | Emmanuel ROHEE | 2014-09-16 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | If an initialSync has been already done on a room, we do not need to ↵ | Emmanuel ROHEE | 2014-09-16 | 1 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | paginate back to get more messages | ||||
| * | | | | WEB-29: Improve room page content loading | Emmanuel ROHEE | 2014-09-16 | 3 | -8/+26 |
| | | | | | | | | | | | | | | | | | | | | InitialSync: load the 30 last messages of each room so that a full page of messages can be displayed without additionnal request | ||||
| * | | | | Update spec with the lifetime field. | David Baker | 2014-09-16 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Use event age to recognise which calls are current and which aren't and ↵ | David Baker | 2014-09-16 | 4 | -16/+79 |
| | | | | | | | | | | | | | | | | | | | | hence support answering calls that were placed before we loaded the page. | ||||
| * | | | | Comment out password reset for now, until the mechanism is fully discussed ↵ | Kegan Dougal | 2014-09-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | (IS token auth vs HS auth) | ||||
| * | | | | Added support for the HS to send emails. Use it to send password resets. ↵ | Kegan Dougal | 2014-09-16 | 4 | -2/+130 |
| | | | | | | | | | | | | | | | | | | | | Added email_smtp_server and email_from_address config args. Added emailutils. | ||||
| * | | | | Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need ↵ | Kegan Dougal | 2014-09-16 | 2 | -1/+50 |
| | | | | | | | | | | | | | | | | | | | | to send email. | ||||
| * | | | | Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation | Emmanuel ROHEE | 2014-09-16 | 28 | -233/+709 |
| |\ \ \ \ | |||||
| | * | | | | Fix bug where we didn't always get 'prev_content' key | Erik Johnston | 2014-09-15 | 1 | -4/+1 |
| | | | | | | |||||
| | * | | | | Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than ↵ | Erik Johnston | 2014-09-15 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | the reverse. Don't transmit age_ts to clients for now. | ||||
| | * | | | | Correctly handle receiving 'missing' Pdus from federation, rather than just ↵ | Erik Johnston | 2014-09-15 | 3 | -13/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | discarding them. | ||||
| | * | | | | Improve logging in federation handler. | Erik Johnston | 2014-09-15 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Fix unit tests after adding extra argument on put_json | Erik Johnston | 2014-09-15 | 3 | -10/+28 |
| | | | | | | |||||
| | * | | | | Fix 'age' key to update on retries | Erik Johnston | 2014-09-15 | 3 | -8/+41 |
| | | | | | | |||||
| | * | | | | More helpful 400 error messages. | Kegan Dougal | 2014-09-15 | 1 | -1/+5 |
| | | | | | | |||||
| | * | | | | Updated CHANGES and UPGRADE to reflect registration API changes. | Kegan Dougal | 2014-09-15 | 2 | -0/+34 |
| | | | | | | |||||
| | * | | | | Be consistent when associating keys with login types for registration/login. | Kegan Dougal | 2014-09-15 | 4 | -4/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-09-15 | 11 | -16/+52 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | registration-api-changes in preparation for re-merge to develop. | ||||
| | | * | | | Correctly handle the 'age' key in events and pdus | Erik Johnston | 2014-09-15 | 10 | -15/+51 |
| | | | | | | |||||
| | * | | | | Update spec to include m.login.email.identity | Kegan Dougal | 2014-09-15 | 1 | -1/+26 |
| | | | | | | |||||
| | * | | | | Fix unit tests. | Kegan Dougal | 2014-09-15 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | Updated cmdclient to use new registration logic. | Kegan Dougal | 2014-09-15 | 1 | -11/+26 |
| | | | | | | |||||
| | * | | | | Make captcha work again with the new registration logic. | Kegan Dougal | 2014-09-15 | 2 | -1/+22 |
| | | | | | | |||||
| | * | | | | Updated webclient to support the new registration logic. | Kegan Dougal | 2014-09-15 | 1 | -23/+120 |
| | | | | | | |||||
| | * | | | | Split out password/captcha/email logic. | Kegan Dougal | 2014-09-15 | 2 | -140/+217 |
| | | | | | | |||||
| | * | | | | Added LoginType constants. Created general structure for processing ↵ | Kegan Dougal | 2014-09-15 | 2 | -20/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | registrations. | ||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Kegan Dougal | 2014-09-15 | 73 | -3922/+8162 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | registration-api-changes | ||||
| | * | | | | | Updated spec and api docs to desired new format. | Kegan Dougal | 2014-09-08 | 2 | -33/+73 |
| | | | | | | | |||||
| * | | | | | | Filter room where the user has been banned | Emmanuel ROHEE | 2014-09-15 | 2 | -5/+29 |
| | | | | | | | |||||
| * | | | | | | Recents must not show temporary fake messages | Emmanuel ROHEE | 2014-09-15 | 4 | -10/+32 |
| | | | | | | | |||||
| * | | | | | | Recents uses data directly from $rootscope.events | Emmanuel ROHEE | 2014-09-15 | 4 | -171/+95 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | BF: inviter field has moved to the room root object | Emmanuel ROHEE | 2014-09-15 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | BF: presence and eventMap were not reset at logout. | Emmanuel ROHEE | 2014-09-15 | 1 | -10/+14 |
| | | | | | |||||
| * | | | | Use "white-space: pre-wrap" for "Text will wrap when necessary, and on line ↵ | Emmanuel ROHEE | 2014-09-15 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | breaks" | ||||
| * | | | | Merge remote-tracking branch 'origin/master' into develop | Emmanuel ROHEE | 2014-09-15 | 3 | -3/+6 |
| |\ \ \ \ | |||||
| * | | | | | Define a CLOS-like 'around' modifier as a decorator, to neaten up the ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -10/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | 'orig_*' noise of wrapping the setUp()/tearDown() methods | ||||
| * | | | | | Add some docstrings | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | Additionally look first for a 'loglevel' attribute on the running test ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | method, before the TestCase | ||||
| * | | | | | Define a (class) decorator for easily setting a DEBUG logging level on a ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | TestCase | ||||
| * | | | | | Allow a TestCase to set a 'loglevel' attribute, which overrides the logging ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 1 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | level while that testcase runs | ||||
| * | | | | | Have all unit tests import from our own subclass of trial's unittest ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 21 | -61/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | TestCase; set up logging in ONE PLACE ONLY | ||||
| * | | | | | Update CHANGES.rst v0.2.3 | Erik Johnston | 2014-09-12 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-12 | 4 | -2/+23 |
| |\ \ \ \ \ | |||||
| * | | | | | | Update the spec document to replace the candidate message with the ↵ | David Baker | 2014-09-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | candidates message. | ||||
| * | | | | | | Send multiple candidates at once instead of all individually. Changes spec ↵ | David Baker | 2014-09-12 | 2 | -9/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to include multiple candidates in a candidate(s) message. | ||||
* | | | | | | | freenode verification | Matthew Hodgson | 2014-09-17 | 1 | -0/+1 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | unbreak wordwrapping by breaking multiline paste for now | Matthew Hodgson | 2014-09-13 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | always scroll to bottom when entering a room | Matthew Hodgson | 2014-09-13 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | more wishlist | Matthew Hodgson | 2014-09-13 | 1 | -0/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | Spellcheck | Erik Johnston | 2014-09-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add note about glare support | Erik Johnston | 2014-09-12 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse | Erik Johnston | 2014-09-12 | 61 | -3887/+8091 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: webclient/room/room-controller.js | ||||
| * | | | | | Bump version and change log | Erik Johnston | 2014-09-12 | 3 | -2/+21 |
| |/ / / / | |||||
| * | | | | Fix bug where we relied on the current_state_events being updated when we ↵ | Erik Johnston | 2014-09-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | are handling type specific persistence | ||||
| * | | | | Fix bug where we no longer stored user_id on Pdus | Erik Johnston | 2014-09-12 | 1 | -1/+7 |
| | |_|/ | |/| | | |||||
| * | | | Make the state resolution use actual power levels rather than taking them ↵ | Erik Johnston | 2014-09-12 | 5 | -127/+194 |
| | | | | | | | | | | | | | | | | from a Pdu key. | ||||
| * | | | Fix bug where we incorrectly removed a remote host from the list of hosts in ↵ | Erik Johnston | 2014-09-12 | 1 | -12/+45 |
| | | | | | | | | | | | | | | | | a room when any user from that host left that room even if they weren't the last user from that host in that room | ||||
| * | | | Fix bug where we didn't return a tuple when expected. | Erik Johnston | 2014-09-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Clean data when user logs out | Emmanuel ROHEE | 2014-09-12 | 4 | -11/+36 |
| | | | | |||||
| * | | | Retry sending events that fail to send. | David Baker | 2014-09-12 | 1 | -11/+28 |
| | | | | |||||
| * | | | Fixed displayname resolution of emote sender | Emmanuel ROHEE | 2014-09-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed public room name and users count alignement | Emmanuel ROHEE | 2014-09-12 | 2 | -25/+46 |
| | | | | | | | | | | | | | | | | Put data into a table to ease layout and manage long strings | ||||
| * | | | Some words about glare | David Baker | 2014-09-12 | 1 | -1/+27 |
| | | | | |||||
| * | | | Always pick the incoming call if we've not yet sent out our invite, ↵ | David Baker | 2014-09-12 | 2 | -5/+14 |
| | | | | | | | | | | | | | | | | otherwise the remorte party will see their call get rejected and our call won't come in until our user clicks allow. | ||||
| * | | | Remove the local AV stream from ourselves when handing it off to a new call ↵ | David Baker | 2014-09-12 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | or we'll close it when we hang up. | ||||
| * | | | CSS m.room.topic and m.room.name events in the history | Emmanuel ROHEE | 2014-09-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Handle NAME_EVENT to get room name update event | Emmanuel ROHEE | 2014-09-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | (TODO: recents needs to be directly plugged to $rootScope.events.rooms) | ||||
| * | | | Added edition of room name | Emmanuel ROHEE | 2014-09-12 | 4 | -12/+61 |
| | | | | |||||
| * | | | Show room name updates in room history and recents. | Emmanuel ROHEE | 2014-09-12 | 4 | -38/+50 |
| | | | | | | | | | | | | | | | | Update it with the latest value | ||||
| * | | | BF: temp workaround while /initialSync on a particular room is not available | Emmanuel ROHEE | 2014-09-12 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | initRoom on a new room is not called. Call it for any received events | ||||
| * | | | few fixes for errors in glare conditions. still seem to end up with no audio ↵ | David Baker | 2014-09-11 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | if both calls are placed at the same time. | ||||
| * | | | Put back the line that adds the stream to the invite, otherwise ↵ | David Baker | 2014-09-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | caller->callee audio won't work... | ||||
| * | | | Fix bug where web client wold break trying to add the earliest token without ↵ | David Baker | 2014-09-11 | 1 | -12/+1 |
| | | | | | | | | | | | | | | | | having initialised the room if your first page of history contained only events which didn't call initRoom. Just call initRoom in handleMessages since we use it there rather than leaving it to the individual event handling methods. | ||||
| * | | | Clearly show when an user cannot join a room. | Emmanuel ROHEE | 2014-09-11 | 2 | -10/+39 |
| | | | | | | | | | | | | | | | | In realtime show who kicked or banned him. | ||||
| * | | | start towards glare support (currently not much better but no worse than ↵ | David Baker | 2014-09-11 | 3 | -60/+116 |
| | | | | | | | | | | | | | | | | before) including fixing a lot of self/var self/this fails that caused chaos when we started to have more than one call in play. | ||||
| * | | | Added support of copy/paste of multi lines content | Emmanuel ROHEE | 2014-09-11 | 2 | -1/+7 |
| | | | | |||||
| * | | | Use autofill-event.js to workaround browsers issue: Form model doesn't ↵ | Emmanuel ROHEE | 2014-09-11 | 2 | -0/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | update on autocomplete https://github.com/angular/angular.js/issues/1460 | ||||
| * | | | Invite: reset the input when the invitation has been done | Emmanuel ROHEE | 2014-09-11 | 2 | -5/+6 |
| | | | | |||||
| * | | | Enable enter key in the invite input | Emmanuel ROHEE | 2014-09-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | On member avatar mouseover, show user_id and power level | Emmanuel ROHEE | 2014-09-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Room topic: if the request fails, show the error in the feedback | Emmanuel ROHEE | 2014-09-11 | 1 | -1/+8 |
| | | | | |||||
| * | | | BF: made input autofocus work when opening the room topic input | Emmanuel ROHEE | 2014-09-11 | 2 | -2/+6 |
| | | | | |||||
| * | | | Show room topic change in the chat history and in the recents | Emmanuel ROHEE | 2014-09-11 | 4 | -4/+35 |
| | | | | |||||
| * | | | getRoomEventIndex: improved speed for what it is used | Emmanuel ROHEE | 2014-09-11 | 1 | -3/+4 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/develop' into webclient_initialSync | Emmanuel ROHEE | 2014-09-10 | 13 | -3434/+6381 |
| |\ \ \ | |||||
| | * | | | Animation on call end icon. | David Baker | 2014-09-10 | 4 | -16/+14 |
| | | | | | |||||
| | * | | | Upgrade angularjs to 1.3.0-rc1 since this is new development | David Baker | 2014-09-10 | 8 | -3414/+6346 |
| | | |/ | | |/| | |||||
| | * | | Add text for incoming calls | David Baker | 2014-09-10 | 1 | -0/+1 |
| | | | | |||||
| | * | | Show mxid in call bar for users with no displayname | David Baker | 2014-09-10 | 1 | -1/+6 |
| | | | | |||||
| | * | | Less buggy rejection of calls when busy | David Baker | 2014-09-10 | 2 | -13/+20 |
| | | | | |||||
| | * | | reject calls if there's already a call in progress | David Baker | 2014-09-10 | 1 | -0/+4 |
| | | | | |||||
| * | | | Show echoed emote with transparency | Emmanuel ROHEE | 2014-09-10 | 1 | -1/+4 |
| | | | | |||||
| * | | | Reenabled transparent echo message. It turns to opaque without flickering now. | Emmanuel ROHEE | 2014-09-10 | 2 | -19/+40 |
| | | | | |||||
| * | | | Clean previous request feedback when doing a new request | Emmanuel ROHEE | 2014-09-10 | 1 | -0/+3 |
| | | | | |||||
| * | | | BF: Made /op work when providing no power value. 50 is used as default in ↵ | Emmanuel ROHEE | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | this case | ||||
| * | | | Made users count auto updating. Do show it if the info is not available ↵ | Emmanuel ROHEE | 2014-09-10 | 2 | -12/+30 |
| | | | | | | | | | | | | | | | | (ex:user has not joined the room yet) | ||||
| * | | | Member event: store use the the latest one | Emmanuel ROHEE | 2014-09-10 | 1 | -2/+7 |
| | | | | |||||
| * | | | Removed wrong comments about recents-controller.js: it uses $rootScope.rooms ↵ | Emmanuel ROHEE | 2014-09-10 | 2 | -25/+2 |
| | | | | | | | | | | | | | | | | not $rootScope.events.rooms managed by event-handler-service.js and used by other controllers | ||||
| * | | | dedup events: state events conflict with messages events. Do not consider ↵ | Emmanuel ROHEE | 2014-09-10 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | them in deduplication | ||||
| * | | | Reenabled handle of room states events in initialSync but do not add them to ↵ | Emmanuel ROHEE | 2014-09-10 | 2 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | the displayed messages in the room page. Show the m.room.member events only when they come from room.messages (from initialSync of pagination) not from room.state. | ||||
| * | | | Presence events do not have event id. Do not discard them | Emmanuel ROHEE | 2014-09-10 | 1 | -2/+2 |
| | | | | |||||
| * | | | Improved requests: pagination is done from the data received in initialSync | Emmanuel ROHEE | 2014-09-10 | 3 | -15/+38 |
| |/ / | |||||
| * | | More rst formatting. | Kegan Dougal | 2014-09-09 | 1 | -5/+6 |
| | | | |||||
| * | | Extra restrictions to make parsing easier. | Kegan Dougal | 2014-09-09 | 1 | -1/+8 |
| | | | |||||
| * | | Tyops | Kegan Dougal | 2014-09-09 | 1 | -7/+7 |
| | | | |||||
| * | | Added initial draft for human-readable ID rules. | Kegan Dougal | 2014-09-09 | 1 | -0/+71 |
| | | | |||||
| * | | Move model to client-server for now. | Kegan Dougal | 2014-09-09 | 7 | -0/+0 |
| | | | |||||
| * | | Hangup call if user denies media access. | David Baker | 2014-09-09 | 2 | -8/+2 |
| | | | |||||
| * | | Don't try setting up the call if the user has canceled it before allowing ↵ | David Baker | 2014-09-09 | 1 | -0/+4 |
| | | | | | | | | | | | | permission. | ||||
| * | | Don't break if you press the hangup button before allowing media permission. | David Baker | 2014-09-09 | 2 | -2/+3 |
| | | | |||||
| * | | Don't play an engaged tone if we hang up locally. | David Baker | 2014-09-09 | 3 | -5/+18 |
| | | | |||||
| * | | Fix bug where we used an unbound local variable if we ended up rolling back ↵ | Erik Johnston | 2014-09-09 | 1 | -4/+1 |
| | | | | | | | | | | | | the persist_event transaction | ||||
| * | | Improved room page loading flow: do pagination only when the members list is ↵ | Emmanuel ROHEE | 2014-09-09 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | available. Killed an unexpected pagination trigger when the page load: paginateMore | ||||
| * | | When the user has been kicked or banned from a room, remove the room from ↵ | Emmanuel ROHEE | 2014-09-09 | 1 | -1/+8 |
| | | | | | | | | | | | | his recents list | ||||
| * | | Made recents list display something when joining a room which we do not have ↵ | Emmanuel ROHEE | 2014-09-09 | 1 | -0/+8 |
| | | | | | | | | | | | | state data yet | ||||
| * | | BF: prevent joined messages to be displayed twice when joining a room. | Emmanuel ROHEE | 2014-09-09 | 1 | -4/+16 |
| | | | | | | | | | | | | Do this by synchronizing the m.room.member joined event from the events stream and the start of the pagination | ||||
| * | | make calls work in Firefox | David Baker | 2014-09-09 | 1 | -8/+21 |
| | | | |||||
| * | | Removed historical code: recents does not need to manage presences. It is ↵ | Emmanuel ROHEE | 2014-09-09 | 1 | -6/+0 |
| | | | | | | | | | | | | already done by initialSync in eventStreamService | ||||
| * | | BF: Made the grey background of the current room cover all the cell width | Emmanuel ROHEE | 2014-09-09 | 1 | -1/+1 |
| | | | |||||
| * | | Show call invites in the message table | David Baker | 2014-09-09 | 2 | -0/+7 |
| | | | |||||
| * | | CSS tweakage | Kegan Dougal | 2014-09-08 | 1 | -0/+3 |
| | | | |||||
| * | | Display a 'Set Topic' button if there is no topic or it's a 0-len string. | Kegan Dougal | 2014-09-08 | 3 | -11/+30 |
| | | | |||||
| * | | Add ability to set topic by double-clicking on the topic text then hitting ↵ | Kegan Dougal | 2014-09-08 | 5 | -1/+59 |
| | | | | | | | | | | | | enter. | ||||
| * | | Fixed bug which displayed an older room topic because it was being returned ↵ | Kegan Dougal | 2014-09-08 | 1 | -1/+13 |
| | | | | | | | | | | | | from /initialSync messages key. Check the ts of the event before clobbering state. | ||||
| * | | long topic is long. CSS support it | Kegan Dougal | 2014-09-08 | 1 | -0/+4 |
| | | | |||||
| * | | Display public room topics if they exist on the public room list. | Kegan Dougal | 2014-09-08 | 2 | -0/+10 |
| | | | |||||
| * | | Display the room topic in the room, underneath the name of the room. | Kegan Dougal | 2014-09-08 | 3 | -8/+33 |
| | | | |||||
| * | | Update jsfiddles to have more helpful error messages when there is no ↵ | Kegan Dougal | 2014-09-08 | 4 | -5/+30 |
| | | | | | | | | | | | | connection when logging in. | ||||
| * | | Add slightly helpful advice on how to generate config if you don'y already ↵ | Erik Johnston | 2014-09-08 | 1 | -0/+1 |
| | | | | | | | | | | | | have one | ||||
| * | | Don't autogen config in synctl for the same reasons we don't turn of ↵ | Erik Johnston | 2014-09-08 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | --generate-config by default on the homeserver - it is liable to confuse people who have moved the config file or have chosen a non standard location. Also, don't override log file location. | ||||
| * | | Apparently we can't do txn.rollback(), so raise and catch an exception instead. | Erik Johnston | 2014-09-08 | 1 | -11/+19 |
| | | | |||||
| * | | Added demo.details | Kegan Dougal | 2014-09-08 | 1 | -0/+7 |
| | | | |||||
| * | | Updated jsfiddle links to point to github | Kegan Dougal | 2014-09-08 | 1 | -5/+5 |
| | | | |||||
| * | | Bodge to default to '1 users' when you create a room, which is better than ↵ | Kegan Dougal | 2014-09-08 | 2 | -1/+6 |
| | | | | | | | | | | | | blindly assuming a recents controller is writing to rootScope.rooms and setting numUsersInRoom there. | ||||
| * | | Added big massive TODOs on a huge design problem with initial sync | Kegan Dougal | 2014-09-08 | 2 | -1/+20 |
| | | | |||||
| * | | Float right the num users, apply room highlight to user count. | Kegan Dougal | 2014-09-08 | 2 | -1/+7 |
| | | | |||||
| * | | Better checks are better. | Kegan Dougal | 2014-09-08 | 1 | -1/+1 |
| | | | |||||
| * | | Added num_joined_users key to /publicRooms for each room. Show this ↵ | Kegan Dougal | 2014-09-08 | 4 | -2/+15 |
| | | | | | | | | | | | | information in the webclient. | ||||
| * | | Handle the case where we don't have a common ancestor | Erik Johnston | 2014-09-08 | 2 | -9/+42 |
| | | | |||||
| * | | Added number of users in recent rooms. | Kegan Dougal | 2014-09-08 | 2 | -0/+16 |
| | | | |||||
| * | | Fix bug in state handling where we incorrectly identified a missing pdu. ↵ | Erik Johnston | 2014-09-08 | 3 | -67/+267 |
| | | | | | | | | | | | | Update tests to catch this case. | ||||
| * | | Make #matrix public rooms bold to make them stand out from the other public ↵ | Kegan Dougal | 2014-09-08 | 2 | -1/+8 |
| | | | | | | | | | | | | rooms. Ideally this would be metadata in /publicRooms to say something like 'featured channel', but for now, just make it a client side check. | ||||
| * | | Sort the public room list by display name. | Kegan Dougal | 2014-09-08 | 1 | -1/+1 |
| | | | |||||
| * | | Rollback if we try and insert duplicate events | Erik Johnston | 2014-09-08 | 1 | -0/+1 |
| |/ | |||||
| * | Added /join description | Emmanuel ROHEE | 2014-09-08 | 1 | -0/+1 |
| | | |||||
| * | matrixService.rooms must be renamed matrixService.initialSync now | Emmanuel ROHEE | 2014-09-08 | 2 | -3/+4 |
| | | |||||
| * | App startup improvements: | Emmanuel ROHEE | 2014-09-08 | 3 | -39/+39 |
| | | | | | | | | | | | | | | - do one and only one initialSync when the app starts. (recents-controller does not do its own anymore) - initialSync: get only the last message per room instead of default number of messages (10) Prevent recents-controller from loosing its data each time the page URL changes | ||||
| * | add sounds to the calling interface | David Baker | 2014-09-08 | 11 | -14/+75 |
| | | |||||
| * | Merge branch 'origin/release-v0.2.2' into develop | Emmanuel ROHEE | 2014-09-08 | 0 | -0/+0 |
| |\ | |||||
| * | | fix embarassing bug where in-progress messages get vaped when the previous ↵ | Matthew Hodgson | 2014-09-08 | 1 | -1/+3 |
| | | | | | | | | | | | | one gets delivered | ||||
| * | | fix desktop notifs, which were broken in eab463fd | Matthew Hodgson | 2014-09-08 | 2 | -3/+3 |
| | | | |||||
| * | | Center recaptcha dialog. | Kegan Dougal | 2014-09-08 | 1 | -0/+4 |
| | | | |||||
| * | | Remove disabled change from CHANGES | Erik Johnston | 2014-09-08 | 1 | -1/+0 |
| | | | |||||
| * | | disable broken event dup suppression, and fix echo for /me | Matthew Hodgson | 2014-09-08 | 2 | -16/+25 |
| | | | |||||
| * | | Set the room_alias field when we encounter a new one, rather than only from ↵ | Kegan Dougal | 2014-09-08 | 1 | -2/+1 |
| | | | | | | | | | | | | local storage. | ||||
| * | | Use the room_display_name when presenting on the home page, and not the ↵ | Kegan Dougal | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | room_alias which may not be set. | ||||
| * | | https when loading recaptcha js | Kegan Dougal | 2014-09-08 | 1 | -1/+1 |
| | | | |||||
| * | | Fix race in presence handler where we evicted things from cache while ↵ | Erik Johnston | 2014-09-08 | 1 | -2/+3 |
| | | | | | | | | | | | | handling a key therein | ||||
| * | | Bump version and changelog | Erik Johnston | 2014-09-08 | 3 | -2/+23 |
| | | | |||||
| * | | Minor spec tweaks. | Kegan Dougal | 2014-09-08 | 1 | -3/+5 |
| | | | |||||
| * | | Revert "BF: Made notification work again (forgot to renamed "offline" to ↵ | Emmanuel ROHEE | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | "unavailable")" This reverts commit c3f9d8e41bf2d23f676a10ec4579434a94b1fc39. |