Dima/matrix-js-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 137c6919f6 Fix undefined logger in webstorage.js J. Ryan Stinnett 2019-05-31 10:01:32 +01:00
  • 842ce30190 Fix lint error in login.spec.js J. Ryan Stinnett 2019-05-31 09:54:11 +01:00
  • df1539040c Fix lint error in login.spec.js J. Ryan Stinnett 2019-05-31 09:54:11 +01:00
  • 2a04459bb2 fix(login): saves access_token and user_id after login for all login types Sergii Stotskyi 2019-05-28 17:45:02 +03:00
  • 6367bf7c75 Merge pull request #931 from matrix-org/jryans/key-backup-base-x J. Ryan Stinnett 2019-05-30 18:29:17 +01:00
  • a0456dc430 Merge pull request #924 from jkasun/loglevel-extend Travis Ralston 2019-05-30 11:20:49 -06:00
  • 52ec831b16 Merge pull request #930 from stalniy/fix/save-login-state Travis Ralston 2019-05-30 11:20:01 -06:00
  • 8263062fab Fix recovery key encoding for base-x 3.0.5 J. Ryan Stinnett 2019-05-30 15:34:59 +01:00
  • 9a2bf78a8e logger.dir changed to a log janith 2019-05-30 12:58:32 +05:30
  • cb16f7a60b Minor Fixes janith 2019-05-30 09:35:37 +05:30
  • ad84631ddb Change logger import to ES6 janith 2019-05-30 09:27:25 +05:30
  • 95131c7658 add test for syncing trust on another user Hubert Chathi 2019-05-29 17:01:25 -04:00
  • 936eef194a minor fixes to tests Hubert Chathi 2019-05-29 17:01:13 -04:00
  • 941d871daf fix check for empty cross-signing repsonse Hubert Chathi 2019-05-29 16:59:51 -04:00
  • 609ee663fa use the right path for logger Hubert Chathi 2019-05-29 16:58:49 -04:00
  • d78426d708 Merge branch 'master' into develop RiotRobot 2019-05-29 15:53:51 +01:00
  • a9543df6db v1.2.0 v1.2.0 RiotRobot 2019-05-29 15:52:20 +01:00
  • aae388be93 Prepare changelog for v1.2.0 RiotRobot 2019-05-29 15:52:19 +01:00
  • 53804cac5c save cross-signing keys from sync and verify new keys for user Hubert Chathi 2019-05-28 22:28:54 -04:00
  • 4ef970b4da fix(login): saves access_token and user_id after login for all login types Sergii Stotskyi 2019-05-28 17:45:02 +03:00
  • b199f133b3 fixup readme Travis Ralston 2019-05-27 10:41:04 -06:00
  • 7d1b183a1b Merge pull request #929 from spantaleev/fix-non-integer-media-sizes Travis Ralston 2019-05-27 08:37:03 -06:00
  • 49d119e92e Do not try to request thumbnails with non-integer sizes Slavi Pantaleev 2019-05-27 11:19:11 +03:00
  • feed1da570 Merge branch 'develop' into loglevel-extend Janith Kasun 2019-05-24 18:00:40 +05:30
  • 193ad9e09d use 3 keys for cross-signing Hubert Chathi 2019-05-23 18:18:21 -04:00
  • a3ad835d84 Merge pull request #928 from matrix-org/revert-927-travis/wk-discovery Travis Ralston 2019-05-23 14:47:48 -06:00
  • f8afee8ebd Revert "Add a bunch of debugging to .well-known IS validation" Travis Ralston 2019-05-23 14:47:38 -06:00
  • 7e955fc312 Merge pull request #927 from matrix-org/travis/wk-discovery Travis Ralston 2019-05-23 14:19:33 -06:00
  • eebf92366f Add a bunch of debugging to .well-known IS validation Travis Ralston 2019-05-23 14:00:17 -06:00
  • 3c23e166a7 Upgrade jsdoc RiotRobot 2019-05-23 16:28:26 +01:00
  • 26a8439ce4 Upgrade jsdoc RiotRobot 2019-05-23 16:28:26 +01:00
  • 2c2e8fa1ac v1.2.0-rc.1 v1.2.0-rc.1 RiotRobot 2019-05-23 16:11:35 +01:00
  • ddc2fa74b9 Prepare changelog for v1.2.0-rc.1 RiotRobot 2019-05-23 16:11:35 +01:00
  • 93d51b83c3 Merge pull request #926 from matrix-org/dbkr/uiauth_send_email David Baker 2019-05-22 14:24:08 +01:00
  • f83eae4a46 typing hard David Baker 2019-05-22 13:11:05 +01:00
  • 87c6d11fca PR feedback David Baker 2019-05-22 13:09:24 +01:00
  • e87ac86e48 interactive-auth now handles requesting email tokens David Baker 2019-05-22 11:51:05 +01:00
  • de8063a43a Merge branch 'develop' into loglevel-extend Janith Kasun 2019-05-19 09:40:38 +05:30
  • a73dabcb67 Console logging to loglevel jkasun 2019-05-19 09:29:40 +05:30
  • 7782e81101 Merge pull request #923 from matrix-org/bwindels/caneditcheckfix Bruno Windels 2019-05-17 12:32:45 +00:00
  • aa70687d9e allow access to unreplaced message content Bruno Windels 2019-05-17 13:25:21 +01:00
  • 38d32de06b Merge pull request #922 from matrix-org/bwindels/editedmarker Bruno Windels 2019-05-17 11:04:00 +00:00
  • 7720c72b73 correct return type Bruno Windels 2019-05-17 12:03:36 +01:00
  • ff9505073f add method to retrieve replacing event Bruno Windels 2019-05-17 11:56:28 +01:00
  • 21ee1c31a7 Merge pull request #921 from matrix-org/dbkr/really_log_useful_info_on_verify_failure David Baker 2019-05-17 10:18:34 +01:00
  • fd01ba1fcf More logging when signature verification fails David Baker 2019-05-17 10:08:27 +01:00
  • fbf53524ed Merge pull request #920 from matrix-org/bwindels/message-editing-local-echo Bruno Windels 2019-05-16 15:22:12 +00:00
  • 1f2a701ace remove double newline Bruno Windels 2019-05-16 16:14:53 +01:00
  • 0b87a573b3 reduce indenting by returning early, also actually pass replacement! Bruno Windels 2019-05-16 16:14:19 +01:00
  • 74438716af PR feedback/cleanup Bruno Windels 2019-05-16 15:54:15 +01:00
  • d10b348e74 clear event replacement on redaction Bruno Windels 2019-05-16 15:53:46 +01:00
  • 68e9be47d9 check if an incoming event is the target of a Relations Bruno Windels 2019-05-16 15:49:55 +01:00
  • bddd03c2fd separate setTargetEvent method Bruno Windels 2019-05-16 15:27:14 +01:00
  • e23ba50dd8 only call aggregation code for local echo for relations Bruno Windels 2019-05-16 14:42:09 +01:00
  • 261ab7ae68 don't block local echo for m.replace anymore! Bruno Windels 2019-05-16 14:40:55 +01:00
  • 21c8c76dc3 helper method to get sending status of event or replacement Bruno Windels 2019-05-16 14:40:39 +01:00
  • 266d0f9d05 remove flag for edits as it's not handled separately anymore Bruno Windels 2019-05-16 14:40:17 +01:00
  • 69d25c1498 emit from MatrixEvent.makeReplaced instead of Room Bruno Windels 2019-05-16 14:37:49 +01:00
  • 3cd2b3925a re-evaluate last replacement on redaction and local echo cancellation Bruno Windels 2019-05-16 14:36:38 +01:00
  • 33e9eb371e use relation handling in timelineset for replacements Bruno Windels 2019-05-16 14:35:50 +01:00
  • 07572d1e8d helper method to get last valid replacement Bruno Windels 2019-05-16 14:34:08 +01:00
  • dde4f558f3 set targetEvent on Relations, once known Bruno Windels 2019-05-16 14:33:04 +01:00
  • 79d2574ea7 Merge pull request #919 from matrix-org/jryans/reactions-status-bar J. Ryan Stinnett 2019-05-16 13:39:41 +01:00
  • 51fb5c4a15 Update aggregation by sender on remove J. Ryan Stinnett 2019-05-16 12:38:09 +01:00
  • 875c6b973b Remove cancelled relations from the relations collection J. Ryan Stinnett 2019-05-16 12:28:13 +01:00
  • 21e1312dd7 Allow relations into the pending event list J. Ryan Stinnett 2019-05-16 10:35:36 +01:00
  • a722ef3b03 Merge pull request #916 from matrix-org/jryans/stringify-events J. Ryan Stinnett 2019-05-16 09:44:39 +01:00
  • 80ba5d29f2 Add stringify helper to summarise events when debugging J. Ryan Stinnett 2019-05-15 12:58:07 +01:00
  • a35e6a0f54 Merge pull request #918 from matrix-org/bwindels/message-edit-editor3 Bruno Windels 2019-05-15 17:21:03 +00:00
  • bdc1958c08 Merge pull request #917 from matrix-org/jryans/encrypted-reactions J. Ryan Stinnett 2019-05-15 17:26:07 +01:00
  • 3f2bac71c6 filter out replacements for senders that are not the original sender Bruno Windels 2019-05-15 15:52:37 +01:00
  • 6b9a11b697 Wait until decrypt before aggregating J. Ryan Stinnett 2019-05-15 14:20:34 +01:00
  • f17ecba519 Add getRelation helper J. Ryan Stinnett 2019-05-15 13:42:06 +01:00
  • ce0b014a5a Merge pull request #914 from matrix-org/bwindels/message-edit-editor2 Bruno Windels 2019-05-15 14:11:38 +00:00
  • ad48d2997e prevent earlier replacements from messing things up Bruno Windels 2019-05-15 14:54:52 +01:00
  • 1c1781ce76 make replacements work in e2e rooms Bruno Windels 2019-05-15 14:54:21 +01:00
  • 5fd001354a replace content when replacing instead of evaluating in getContent Bruno Windels 2019-05-15 14:53:44 +01:00
  • a18bdad44f dont replace a redacted event Bruno Windels 2019-05-15 13:56:13 +01:00
  • 600dff62e8 detect relations on encrypted events properly Bruno Windels 2019-05-15 13:56:00 +01:00
  • db7a402e9b mark original event as replaced instead of replacing the event object Bruno Windels 2019-05-15 11:47:00 +01:00
  • 0e53f9052f Merge pull request #913 from matrix-org/bwindels/message-edit-editor Bruno Windels 2019-05-15 09:22:34 +00:00
  • 62e69cacb7 remove leftover code, fix lint Bruno Windels 2019-05-14 15:52:02 +01:00
  • 852c88c341 add unstableClientRelationReplacements in js-sdk Bruno Windels 2019-05-14 15:33:49 +01:00
  • 455f52f1f5 remove logging Bruno Windels 2019-05-14 15:25:47 +01:00
  • df6012c58d completely avoid local echo for edits for now Bruno Windels 2019-05-14 15:25:07 +01:00
  • f68a3dde46 cleanup Bruno Windels 2019-05-14 15:24:57 +01:00
  • 25e6b1cac8 handle m.replace relations in room, emit Room.replaceEvent Bruno Windels 2019-05-14 15:24:36 +01:00
  • 4ad20526db Merge pull request #912 from matrix-org/travis/wk/timeouts Travis Ralston 2019-05-14 08:24:09 -06:00
  • 18cd017f58 support marking an as replacing another Bruno Windels 2019-05-14 15:23:22 +01:00
  • 0161664b6c add support for replacing an existing event in a timeline(set) Bruno Windels 2019-05-14 15:22:46 +01:00
  • 25df31bf96 Use a short timeout for .well-known requests Travis Ralston 2019-05-13 18:39:59 -06:00
  • 09438b440e Fix spelling error in txnId for redactions Travis Ralston 2019-05-13 13:43:44 -06:00
  • 6a5f5b249e Merge pull request #911 from matrix-org/jryans/aggregations J. Ryan Stinnett 2019-05-13 15:20:15 +01:00
  • 3a20114c39 Change to event-level beforeRedaction event for efficiency J. Ryan Stinnett 2019-05-13 14:35:39 +01:00
  • f411d50253 Clarify before redaction event timing J. Ryan Stinnett 2019-05-13 14:17:23 +01:00
  • 00851df25c Always add pending relation events to the timeline sets directly J. Ryan Stinnett 2019-05-10 16:33:49 +01:00
  • 8822d255b3 Fix indentation in src/models/event.js J. Ryan Stinnett 2019-05-10 16:10:12 +01:00
  • 4b4ba86167 Add Relations.add event for additional relations in collection J. Ryan Stinnett 2019-05-09 18:29:50 +01:00
  • 7ea820f6e1 Add Event.relationsCreated event to listen for future relations collections J. Ryan Stinnett 2019-05-09 17:57:00 +01:00
  • 53d8cf0852 Update relation collections after redaction J. Ryan Stinnett 2019-05-09 15:08:16 +01:00