cd86aa7d9e
Merge pull request #1745 from matrix-org/t3chguy/fix/17686
2021-07-23 09:09:15 +01:00
2bd99b5cb0
Merge pull request #1771 from matrix-org/j94/functional-members
...
Functional members
2021-07-21 18:25:14 -06:00
82d248cb8e
Merge pull request #1802 from matrix-org/dbkr/yarn_upgrade_210721
...
yarn upgrade
2021-07-21 16:58:49 +01:00
ce2803ebaa
yarn upgrade
2021-07-21 15:37:19 +01:00
e85038e888
Merge pull request #1801 from matrix-org/gsouquet/localecompare-perf
...
Improve calculateRoomName performances by using Intl.Collator
2021-07-21 15:28:22 +01:00
a87858840b
Merge pull request #1798 from matrix-org/t3chguy/eslint
2021-07-21 14:53:12 +01:00
f708c47385
Improve calculateRoomName performances by using Intl.Collator
2021-07-21 14:18:22 +02:00
9eb918f701
Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/fix/17686
2021-07-21 10:56:21 +01:00
b4bffd2700
Merge remote-tracking branch 'origin/develop' into j94/functional-members
2021-07-21 11:23:22 +02:00
fb315ac75b
Merge pull request #1799 from matrix-org/travis/error1
...
Actually print IndexedDB command error if there is one
2021-07-20 07:38:43 -06:00
afa67688f8
Add test for service member who is not a room member
2021-07-20 12:51:08 +02:00
0c06e47782
Update eslint-plugin-matrix-org
2021-07-20 09:15:26 +01:00
ea646c673b
Actually print idb command error if there is one
2021-07-19 23:31:39 -06:00
5cf6684129
Conform to new typescript eslint rules
2021-07-19 22:47:32 +01:00
cb2b9619ab
Replace .indexOf() !== -1 with .includes() for readability
2021-07-19 18:22:29 +02:00
b8c2a57829
Add test with multiple service_members
2021-07-19 18:17:39 +02:00
718a22f574
Merge branch 'j94/functional-members' of github.com:matrix-org/matrix-js-sdk into j94/functional-members
2021-07-19 18:01:05 +02:00
324cd886a2
Merge remote-tracking branch 'origin/develop' into j94/functional-members
2021-07-19 18:00:59 +02:00
4cf655785e
Add tests
2021-07-19 17:59:11 +02:00
f686d70157
Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/fix/17686
2021-07-19 16:47:39 +01:00
b936b4a2ce
Resetting package fields for development
2021-07-19 15:52:47 +01:00
026839d7e7
Merge branch 'master' into develop
2021-07-19 15:52:46 +01:00
830a4a741e
v12.1.0
2021-07-19 15:49:55 +01:00
a3d9ed19a4
Prepare changelog for v12.1.0
2021-07-19 15:49:54 +01:00
8f9f5fd5b0
Merge pull request #1796 from matrix-org/dbkr/upgrade_eslint_plugin_matrix_org
...
Update eslint-plugin-matrix-org
2021-07-19 15:33:45 +01:00
805267f97f
Update eslint-plugin-matrix-org
2021-07-19 15:23:20 +01:00
4a1cd159a4
Update event.ts
2021-07-19 11:53:43 +02:00
7129c7c7af
Update src/models/room.ts
...
Co-authored-by: Travis Ralston <travisr@matrix.org >
2021-07-19 10:56:15 +02:00
ecc9fda28b
Merge pull request #1778 from matrix-org/travis/notifications-2
...
Add minimal types for "notification settings" UI
2021-07-16 23:53:13 -06:00
7f7c3cbea5
Fix exclusion types
2021-07-16 23:48:41 -06:00
fc8cd39d1a
Optionalize opts
2021-07-16 16:32:49 -06:00
589c66bb12
Re-appease linter
2021-07-16 16:30:06 -06:00
16fe5a91d5
Consolidate types
2021-07-16 16:27:50 -06:00
b57b7a65ee
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:26:05 -06:00
69415ba2c3
Merge pull request #1791 from matrix-org/t3chguy/querystring
2021-07-16 19:57:22 +01:00
9b81b805be
create utility to decode qs into objects
2021-07-16 13:07:01 +01:00
8379bb818e
Switch from url to URL constructor
2021-07-16 13:01:27 +01:00
c62f2a0965
Merge pull request #1789 from matrix-org/t3chguy/fix/18008
2021-07-16 11:06:56 +01:00
d383e71aca
Switch callEventHandler from listening on event to Room.timeline
...
so that it doesn't end up processing ephemerals, account data, remote echoes, etc etc
2021-07-15 17:44:17 +01:00
dbe93f598a
Merge pull request #1787 from matrix-org/dbkr/new_changelogs
...
Contributing guidelines for new changelog generation
2021-07-15 14:12:20 +01:00
2bc5f7132d
Merge remote-tracking branch 'origin/develop' into dbkr/new_changelogs
2021-07-15 14:07:51 +01:00
b17f339011
Merge pull request #1786 from matrix-org/dbkr/fix_contributing_link
...
Fix link to CONTRIBUTING.md
2021-07-15 14:06:20 +01:00
e2b04d543a
Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/fix/17686
...
Conflicts:
src/@types/partials.ts
src/client.ts
2021-07-15 10:03:05 +01:00
0601f98265
Merge pull request #1788 from SimonBrandner/feature/hidden-rrs
...
Use an unstable prefix for MSC2885: Hidden read receipts
2021-07-15 08:46:54 +01:00
bae5650e7a
Fix MSC number
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-15 09:41:40 +02:00
ff40b4dc4a
Fix MSC number
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-15 09:41:35 +02:00
6098f74d8f
Merge pull request #1782 from psrpinto/fix/naming
2021-07-15 08:07:05 +01:00
45c153321c
Use X-Breaking-Change
...
Apparently we already have this label in react SDK (for some reason)
so let's use it. Plus, it's clearer that it's for changes rather than
issues that cause things to break.
2021-07-14 22:46:22 +01:00
19aedebff1
Update other label mentions
2021-07-14 22:16:00 +01:00
5392f616b4
Use existing issues labels / scheme
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com >
2021-07-14 22:15:18 +01:00
Michael Telatynski