Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
63,001 Commits 1 Branch 646 Tags
bb41616d5f9fc6d47c735d4794de1fa46766cb7a
Commit Graph

63001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Šimon Brandner b5bad0cc23 Add comments 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:28:29 +02:00
Šimon Brandner 2cd2015e36 Use atom-one-light for light theme 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:24:59 +02:00
Šimon Brandner f8307a92d8 Use atom-one-dark for dark theme 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:24:48 +02:00
Šimon Brandner 9d12439ee7 Give codeblocks a background color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 09:22:56 +02:00
Šimon Brandner 8c1721fc35 Remove the old codeblock code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 09:22:50 +02:00
Šimon Brandner 0b52ad48bb Show "Open chat" if DM already exists 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-06 21:56:53 +02:00
Šimon Brandner 2760a36f47 Convert a few files to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-06 21:41:02 +02:00
Michael Telatynski 2397d0ec8b Merge pull request #6318 from SimonBrandner/fix/image-view-context-menu/17892 2021-07-06 20:22:49 +01:00
Šimon Brandner 38a061a2df Fix ImageView context menu 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-06 20:59:12 +02:00
Germain Souquet d6c3a22a25 fix lockfiles 2021-07-06 15:10:33 +02:00
Germain Souquet fbac730c62 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 15:09:55 +02:00
Germain Souquet 894bce7813 Update lockfile 2021-07-06 14:54:06 +02:00
Germain Souquet a5cec34bad Merge branch 'develop' into t3chguy/fix/17686 2021-07-06 14:53:40 +02:00
Germain 0ed325c628 Merge pull request #17888 from vector-im/gsouquet/fix-lockfile 
Fix lockfile to match listed dependencies
 2021-07-06 13:43:40 +01:00
Germain Souquet dc17bfe598 Update benchmark action for lockfile diff 2021-07-06 14:37:39 +02:00
Germain Souquet 4d4e2c6230 Fix lockfile to match listed dependencies 2021-07-06 14:16:55 +02:00
Germain Souquet 7e6d3780ce Update benchmark action for lockfile diff 2021-07-06 14:00:43 +02:00
Michael Telatynski d004163177 Fix 2 new NPEs 2021-07-06 12:05:30 +01:00
Michael Telatynski 06284fe73d Update e2e tests 2021-07-06 12:05:06 +01:00
Germain 7d6342fa40 Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Michael Telatynski 04c923bd75 fix tests by including client field on the Room stub and stubbing getJoinedMemberCount 2021-07-06 11:35:56 +01:00
Michael Telatynski 9d8acd1af0 stub getJoinRule 2021-07-06 10:44:09 +01:00
Michael Telatynski 0ca4a958f7 fix getCapabilities stub 2021-07-06 10:34:50 +01:00
Michael Telatynski 3301763f12 stub getCapabilities in tests 2021-07-06 10:19:33 +01:00
Michael Telatynski 64d1d169cf Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-07-06 10:12:07 +01:00
Michael Telatynski eb9f4c609a Make CreateRoomDialog capable of creating restricted rooms in spaces 2021-07-06 10:10:47 +01:00
Michael Telatynski c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski 692347843d Track restricted join rule support in the SpaceStore for sync access 2021-07-06 10:09:35 +01:00
Michael Telatynski 82100df9ea Bring dropdown styling into closer line with rest of our styling 2021-07-06 10:08:57 +01:00
Michael Telatynski 44bbf60973 Convert Dropdown to Typescript 2021-07-06 09:56:02 +01:00
Germain Souquet edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
a5r0n e30e3722ae Translated using Weblate (Hebrew) 
Currently translated at 94.2% (33 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/he/
 2021-07-06 05:34:49 +00:00
RiotRobot 4c28a7f485 back to develop dependencies 2021-07-05 16:41:50 +01:00
RiotRobot 0b5e7da2d9 Merge branch 'master' into develop 2021-07-05 16:39:17 +01:00
RiotRobot 6d46ed8082 v1.7.32 v1.7.32 2021-07-05 16:33:39 +01:00
RiotRobot 682247241f Prepare changelog for v1.7.32 2021-07-05 16:33:38 +01:00
RiotRobot 538837decf Upgrade matrix-react-sdk to 3.25.0 2021-07-05 16:30:38 +01:00
RiotRobot 56fbfc1648 Upgrade matrix-js-sdk to 12.0.1 2021-07-05 16:30:20 +01:00
RiotRobot 7b4fd161e5 Reset fields for development 2021-07-05 16:27:07 +01:00
RiotRobot f1b4d72cec Merge branch 'master' into develop 2021-07-05 16:25:02 +01:00
Germain Souquet de875bbe1d fix avatar position and outline 2021-07-05 16:22:18 +02:00
RiotRobot 8baa92f2b1 v3.25.0 2021-07-05 15:07:00 +01:00
RiotRobot 24d0906653 Prepare changelog for v3.25.0 2021-07-05 15:06:59 +01:00
RiotRobot 2fa2877aed Upgrade matrix-js-sdk to 12.0.1 2021-07-05 15:00:00 +01:00
David Baker 21f4004af0 Merge pull request #6316 from matrix-org/dbkr/fix-17843-rel 
Remove reminescent references to the tinter
 2021-07-05 14:46:36 +01:00
Germain Souquet 1551657d56 Remove Tinter reference 2021-07-05 14:36:52 +01:00
Germain Souquet 9999b01c75 Remove reminescent references to the tinter 2021-07-05 14:36:39 +01:00
Michael Telatynski 1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-07-05 13:06:22 +01:00
Germain 1b95762910 Merge pull request #6310 from matrix-org/gsouquet/faster-animations 2021-07-05 12:21:49 +01:00
Germain 47b297c2db Merge pull request #5742 from SimonBrandner/reorganize-preferences 2021-07-05 09:33:21 +01:00