Commit Graph

  • b90984a7f6 Use member.powerLevel instead of duplicating the user power level calculation. David Baker 2016-03-16 10:38:16 +00:00
  • 57006b7366 Check member hasn't left the room David Baker 2016-03-16 10:35:29 +00:00
  • db9ba52873 make presence work when peeking. fixes https://github.com/vector-im/vector-web/issues/780 Matthew Hodgson 2016-03-15 21:50:18 +00:00
  • 08b49c733a Merge pull request #101 from matrix-org/rav/remove_crypto_specialcase Richard van der Hoff 2016-03-15 17:26:54 +00:00
  • 0f38764709 No point throwing the exception if we return the original promise David Baker 2016-03-15 16:17:41 +00:00
  • 6040b50ceb Fix another unit test Richard van der Hoff 2016-03-15 15:49:21 +00:00
  • b88a207bde Fix broken unit test Richard van der Hoff 2016-03-15 15:39:29 +00:00
  • 07bbe358ea Clean up a codepath that was only used for crypto messages Richard van der Hoff 2016-03-15 15:07:26 +00:00
  • 39a5765888 Test tghat Session.logged_out is fired David Baker 2016-03-15 14:50:37 +00:00
  • 9f91995f4e Fix tests by returning the original promise to avoid the extra trip around the event loop. David Baker 2016-03-15 14:15:15 +00:00
  • 85f2754300 Make the client object be an event emitter rather than a matrixclient to avoid us being tempted to gut wrench stuff directly into the Matrix Client. David Baker 2016-03-15 11:05:05 +00:00
  • 5833654aa6 Add Session.logged_out event that fires whenever the current session is no longer valid and the user needs to log in again. Also null check _syncApi before trying to stop it. David Baker 2016-03-15 10:45:08 +00:00
  • 899ff6cea2 Merge pull request #99 from matrix-org/dbkr/sync_dont_tightloop David Baker 2016-03-15 10:34:44 +00:00
  • 3752429b65 Fix the tests to tick the clock to 'wait' for sync retries. David Baker 2016-03-14 17:49:36 +00:00
  • d13fbd0e3e fix lint David Baker 2016-03-14 17:13:01 +00:00
  • 5e18c84e53 Add a delay before we start polling the connectivity check endpoint to avoid tightlooping if the conn check succeeds but /sync etc fails. David Baker 2016-03-14 16:50:00 +00:00
  • fc1d5c86f9 Merge pull request #98 from matrix-org/rav/keep_paginating Richard van der Hoff 2016-03-14 15:48:17 +00:00
  • c3ea913ae8 Try again if a pagination request gives us no new messages Richard van der Hoff 2016-03-14 14:47:29 +00:00
  • f2336aaedf Merge to master before develop Richard van der Hoff 2016-03-11 12:17:29 +00:00
  • 16ab2fd82a Add uglifyjs to devDependencies Richard van der Hoff 2016-03-11 12:15:00 +00:00
  • 295fda027c Build 0.4.1 v0.4.1 Richard van der Hoff 2016-03-11 12:00:44 +00:00
  • 28e6f00766 Prep r0.4.1 Richard van der Hoff 2016-03-11 11:50:47 +00:00
  • b1988de753 Merge branch 'master' into develop Richard van der Hoff 2016-03-11 11:27:52 +00:00
  • 0302eefd3c Update RELEASING.md Kegsay 2016-03-11 11:05:55 +00:00
  • 8ad5605e49 Update RELEASING.md Kegsay 2016-03-11 11:03:00 +00:00
  • 4b5539fe53 Create RELEASING.md Kegsay 2016-03-11 10:58:39 +00:00
  • b0becbc8d5 Merge pull request #97 from matrix-org/rav/updates_on_send_fail Richard van der Hoff 2016-03-10 14:19:30 +00:00
  • 4ae353d3d3 Raise localEchoUpdated events in more places Richard van der Hoff 2016-03-10 12:07:27 +00:00
  • b4b8b4bfb8 Merge pull request #95 from matrix-org/rav/raise_event_on_remote_echo Richard van der Hoff 2016-03-08 16:40:03 +00:00
  • 909a8a0648 Merge pull request #96 from matrix-org/rav/no_pagination_tightloop Richard van der Hoff 2016-03-08 16:39:46 +00:00
  • 234c227fd5 Work around confused timelines causing pagination loops Richard van der Hoff 2016-03-08 15:38:00 +00:00
  • 78eded3bbd Emit an event when a local-echo is turned into a proper event Richard van der Hoff 2016-03-08 15:00:19 +00:00
  • f324e4c72f lint David Baker 2016-03-03 17:48:23 +00:00
  • 9328a12ccb Add maySendStateEvent method, ported from react-sdk (but fixed). Plus tests. David Baker 2016-03-03 17:44:27 +00:00
  • 51380f8116 Merge pull request #93 from matrix-org/rav/another_timeline_race Richard van der Hoff 2016-03-02 11:41:20 +00:00
  • cfd96969fc Add unit tests for setting the pagination token on sync Richard van der Hoff 2016-03-01 13:58:29 +00:00
  • 0034bdf4ad Set the back-pagination token before raising Room.timelineReset Richard van der Hoff 2016-03-01 13:35:22 +00:00
  • 00af1ce7d2 Merge pull request #92 from matrix-org/rav/sync_left_rooms_test Richard van der Hoff 2016-03-01 13:19:12 +00:00
  • 76f84c54db Add a unit test for syncLeftRooms Richard van der Hoff 2016-03-01 12:09:40 +00:00
  • bb4766c8c6 Merge pull request #90 from matrix-org/markjh/change_push_actions Mark Haines 2016-03-01 10:10:38 +00:00
  • e287e7591b Merge pull request #91 from matrix-org/rav/fix_stuck_pagination_after_join Richard van der Hoff 2016-03-01 09:10:21 +00:00
  • 48f7aca121 Merge pull request #89 from matrix-org/dbkr/invite_name_from_member_event David Baker 2016-02-29 18:05:27 +00:00
  • a14f9e6d1c Don't reset the timeline when we join a room after peeking Richard van der Hoff 2016-02-29 17:25:20 +00:00
  • 5fefcd8ce3 pep8 David Baker 2016-02-29 13:53:55 +00:00
  • 76f1d24c7b Make room name generation slightly more sane and add unit tests fir invite naming. David Baker 2016-02-29 13:51:55 +00:00
  • 066dd77aba Add setPushRuleActions method for setting the actions for push notification rules Mark Haines 2016-02-26 16:47:22 +00:00
  • 45a3bf63b2 Use our inviter's member event to get their display name if it exists. David Baker 2016-02-26 14:11:10 +00:00
  • 75f2efffac Merge pull request #88 from matrix-org/rav/optimise_timeline_load Richard van der Hoff 2016-02-26 13:27:40 +00:00
  • 0584ec3319 Merge pull request #87 from matrix-org/rav/reset_timeline Richard van der Hoff 2016-02-26 13:27:25 +00:00
  • 38e81ba61a TimelineWindow.load: make the livetimeline case quicker Richard van der Hoff 2016-02-26 12:39:38 +00:00
  • 164e4814af Merge remote-tracking branch 'origin/develop' into rav/reset_timeline Richard van der Hoff 2016-02-25 18:35:53 +00:00
  • abf908b14f Fire a 'Room.timelineReset' event when we get a gappy sync Richard van der Hoff 2016-02-25 13:15:18 +00:00
  • 1deb2e27d8 .npmignore which includes git-revision.txt Richard van der Hoff 2016-02-25 17:50:54 +00:00
  • 848ffe8a40 Merge branch 'master' into develop Richard van der Hoff 2016-02-25 17:29:39 +00:00
  • 79c10c1b68 Remove old tarball before building new one Richard van der Hoff 2016-02-25 17:23:54 +00:00
  • 7e6eb89524 Empty commit to kick jenkins Richard van der Hoff 2016-02-25 17:22:53 +00:00
  • 3d3e52b104 s/version.txt/git-revision.txt/ Richard van der Hoff 2016-02-25 16:48:41 +00:00
  • 05326984df Add a 'version.txt' file to the tarball Richard van der Hoff 2016-02-25 15:21:23 +00:00
  • e97e3c673f jenkins.sh: Run npm pack after build to build tarball Richard van der Hoff 2016-02-25 13:18:10 +00:00
  • f0ae46afc9 add jenkins.sh script Richard van der Hoff 2016-02-25 13:16:25 +00:00
  • aaf4371fae Merge pull request #85 from matrix-org/rav/recreate_filter_on_changes Richard van der Hoff 2016-02-24 17:22:57 +00:00
  • 7728009ef3 Changelog v0.4.0 David Baker 2016-02-24 16:20:46 +00:00
  • 46912431cc make the tests pass again Richard van der Hoff 2016-02-24 16:15:08 +00:00
  • 6a19e08381 lint Richard van der Hoff 2016-02-24 15:58:35 +00:00
  • 43f392955d Check filters before we reuse them Richard van der Hoff 2016-02-24 15:23:42 +00:00
  • 41d2076bd4 Merge branch 'develop' David Baker 2016-02-24 13:52:10 +00:00
  • 670d230f2e Bump to 0.4.0 David Baker 2016-02-24 13:49:58 +00:00
  • 7970f3f5a5 Merge pull request #84 from matrix-org/dbkr/keypair_3pid_invites David Baker 2016-02-23 16:37:48 +00:00
  • 567716c4f7 Use more normal promise structure David Baker 2016-02-23 11:21:29 +00:00
  • 518e41c078 add docs David Baker 2016-02-23 11:08:07 +00:00
  • bd600f65fb Add support for new keypair style 3pid invites (add an option to joinRoom for specifying the signing url) David Baker 2016-02-23 10:11:04 +00:00
  • 363b08c4d8 don't NPE on 50x's - as per BOTS-170 Matthew Hodgson 2016-02-22 10:34:43 +00:00
  • 2150bdc444 fix tests Matthew Hodgson 2016-02-19 17:59:26 +00:00
  • 5886b3358d f1x l1nt Matthew Hodgson 2016-02-19 17:56:55 +00:00
  • 8b887d8559 name 3PID invite rooms better Matthew Hodgson 2016-02-19 17:45:52 +00:00
  • 7278c38fa6 Merge pull request #83 from matrix-org/rav/fix_context_event_ordering Richard van der Hoff 2016-02-19 17:12:48 +00:00
  • 24ae4a8d1a Interpret the response from /context correctly Richard van der Hoff 2016-02-19 17:03:47 +00:00
  • 923b9cad39 Merge pull request #82 from matrix-org/real_receipts David Baker 2016-02-19 16:20:04 +00:00
  • e9f6e41550 Local echos are fake too. David Baker 2016-02-19 16:18:29 +00:00
  • 2950417f70 Add docs to appease jslint David Baker 2016-02-19 15:35:36 +00:00
  • 39f641a851 Address PR comments David Baker 2016-02-19 15:22:38 +00:00
  • 95fff38dbb Add a param to getEventReadUpTo to have it ignore implicit read receipts. Store real receipts separately to make this work. David Baker 2016-02-19 14:42:07 +00:00
  • 785326376a Merge pull request #80 from matrix-org/rav/keep_redactions Richard van der Hoff 2016-02-17 21:41:42 +00:00
  • 1baf14861c Merge pull request #81 from matrix-org/rav/fix_timeline_after_join Richard van der Hoff 2016-02-17 12:23:29 +00:00
  • 8e47fe2968 Fix lint Richard van der Hoff 2016-02-16 22:32:50 +00:00
  • 88827fab84 EventTimeline: Fix baseIndex after removing the last event Richard van der Hoff 2016-02-16 22:22:26 +00:00
  • ab0a06eea7 More delinting Richard van der Hoff 2016-02-16 16:19:32 +00:00
  • 6a6db36088 delintificate Richard van der Hoff 2016-02-16 16:14:45 +00:00
  • 6f3bdcfbb6 Remember to propagate Room.redaction Richard van der Hoff 2016-02-16 16:03:40 +00:00
  • 4c6d0a5128 Redactions: only remove the keys that are specced for removal Richard van der Hoff 2016-02-16 16:03:18 +00:00
  • 5eff278454 Keep redacted events in the timeline Richard van der Hoff 2016-02-16 12:05:13 +00:00
  • c8d1e210a3 Merge pull request #79 from matrix-org/dbkr/new_reconnection_logic David Baker 2016-02-10 11:17:29 +00:00
  • 8614632e54 No ES6 in the JS SDK and other lint warnings. David Baker 2016-02-10 10:48:03 +00:00
  • c3796c61cd Use a promise for when the connection comes back David Baker 2016-02-10 10:40:42 +00:00
  • 6224aff882 improve comment as per PR review David Baker 2016-02-10 10:09:39 +00:00
  • e506a1b2de Oops: set keepAliveTimer! David Baker 2016-02-09 17:39:30 +00:00
  • b40a6d1481 remember bound function as it returns a new reference each time David Baker 2016-02-09 17:06:20 +00:00
  • 5c8f73019e lint David Baker 2016-02-09 16:22:12 +00:00
  • 3cfc4f8ba5 Add short delay to treating a 400 as a success to avoid hammering in a loop. David Baker 2016-02-09 16:17:52 +00:00
  • 4d46251b15 Just use the keepalive logic to recover from lost internet connections. David Baker 2016-02-09 16:08:14 +00:00