mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
34561 commits 215 branches 561 tags 411 MiB
Commit graph

34561 commits

This branch
This branch
All branches
Author SHA1 Message Date
Germain Souquet
10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Germain Souquet
870857f321 Right hand side border radius 2021-07-07 13:00:31 +02:00
Germain
b916b789aa
Merge pull request #6324 from matrix-org/gsouquet/fix-lockfile 
Update lockfile with correct dependencies
 2021-07-07 11:15:36 +01:00
Germain Souquet
06337e72fa Update lockfile with correct dependencies 2021-07-07 12:10:35 +02:00
David Baker
e1fb811088
Merge pull request #6321 from matrix-org/dbkr/clarify_abbreviations 
Clarify the keys we use when submitting rageshakes
 2021-07-07 11:06:39 +01:00
Germain Souquet
7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
David Baker
984dc40f9c Clarify the keys we use when submitting rageshakes 
'pk' is a bit opaque in a context with both private keys and public keys
 2021-07-07 10:54:21 +01:00
Germain Souquet
b0a1fc7b97 Updated color scheme and spacing 2021-07-07 11:23:38 +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
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +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
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
Germain Souquet
925d434d53 Linting fix in TypeScript interface 2021-07-05 09:19:19 +02:00
Germain Souquet
8d34767768 Fix i18n after deprecation 2021-07-05 09:18:16 +02:00
Germain
92fcfbd8f6
Merge pull request #6313 from robintown/fix-image-rotation 
Fix being able to un-rotate images
 2021-07-05 07:22:05 +01:00
Robin Townsend
055f3a72ad Fix being able to un-rotate images 
Since 0 is falsy, this made it impossible to return images to 0 degrees
of rotation.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-03 15:18:47 -04:00
Germain Souquet
b5ff7eb7d2 Migrate VerificationShowSas to TypeScript 2021-07-03 12:43:18 +01:00
Germain Souquet
103caffb5b Delete unused VerificationQREmojiOPtions 2021-07-03 12:35:14 +01:00
Germain Souquet
a1135783bc Migrate VerificationComplete to TypeScript 2021-07-03 12:32:08 +01:00
Germain Souquet
b18691a1cb Migrate VerificationCancelled to TypeScript 2021-07-03 12:31:10 +01:00
Germain Souquet
66dde68377 Migrate VectorPushRulesDefinitions to TypeScript 2021-07-03 12:29:13 +01:00
Germain Souquet
d5cebf5e8d Migrate index to TypeScript 2021-07-03 12:22:58 +01:00
Germain Souquet
e7743e2a57 Migrate RoomScrollStateStore to TypeScript 2021-07-03 12:21:00 +01:00
Germain Souquet
ef4d58c0d9 Migrate SetIntegrationManager to TypeScript 2021-07-03 12:08:56 +01:00
Germain Souquet
ef2848664f Migrate InlineTermsAgreement to TypeScript 2021-07-03 12:03:00 +01:00
Germain Souquet
f4ec197513 Migrate ForgotPassword to TypeScript 2021-07-03 11:55:10 +01:00
Germain Souquet
298a338676 Migrate CompleteSecurity to TypeScript 2021-07-03 11:38:51 +01:00
Germain Souquet
dbd102541e Migrate E2eSetup to TypeScript 2021-07-03 11:37:06 +01:00
David Baker
9bb4e4ca4a
Merge pull request #6312 from matrix-org/dbkr/my_icon_is_too_big 
Fix icon size in passphrase prompt
 2021-07-02 20:56:59 +01:00
David Baker
0cee0db9df Fix icon size in passphrase prompt 2021-07-02 20:38:07 +01:00
Germain Souquet
df64a076d9 Deprecate unused PulsedAvatar 2021-07-02 15:24:30 +01:00
Germain Souquet
a22baa1b2b move file drop image animation to compositor 2021-07-02 15:23:27 +01:00
Germain Souquet
a093ea6357 Move RightPanel animation to compositor 2021-07-02 15:23:03 +01:00
Michael Telatynski
3287d3dd53
Merge pull request #6305 from matrix-org/t3chguy/ts/11 2021-07-02 15:08:53 +01:00
Germain Souquet
aac0989005 Make beta dot animation run on the compositor 2021-07-02 14:58:59 +01:00
Michael Telatynski
b17d72c399 fix duplicate import 2021-07-02 14:54:10 +01:00
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Michael Telatynski
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10 2021-07-02 09:51:58 +01:00
David Baker
780c413b5d
Merge pull request #6306 from matrix-org/dbkr/ts_semicolons 
Comply with new member-delimiter-style rule
 2021-07-01 23:53:57 +01:00
David Baker
1fe0c2ab88 Bump eslint plugin version 2021-07-01 23:45:08 +01:00