OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
34,723 Commits
202 Branches
546 Tags
420 MiB
Commit Graph

34723 Commits (9b6495903cb25f3f32051948af2061bf27b8c6b6)

Author SHA1 Message Date
Šimon Brandner d017f3d06c
Merge remote-tracking branch 'upstream/develop' into feature/proper-codeblock-colors 2021-07-07 18:37:00 +02:00
Germain 209cafb1f5
Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire 2021-07-07 16:30:54 +01:00
Šimon Brandner 14303a4ca8
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 17:20:31 +02:00
Šimon Brandner f91b35a0a0
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 17:12:19 +02:00
Michael Telatynski 25dab1eb64
Merge pull request #6307 from matrix-org/t3chguy/fix/17858 
Fix instances of the Edit Message Composer's save button being wrongly disabled
 2021-07-07 16:03:27 +01:00
Germain 33930c296f
Merge pull request #6327 from matrix-org/gsouquet/ci-pure-lockfile 
Do not generate a lockfile when running in CI
 2021-07-07 15:23:20 +01:00
Germain Souquet 5fb7dbee3e Do not generate a lockfile when running in CI 2021-07-07 16:11:47 +02:00
Michael Telatynski 30fa5419db
Revert "ignore hash/fragment when de-duplicating links for url previews" 2021-07-07 14:30:08 +01:00
Šimon Brandner 5b5ef5e04c
Handle servers from settings 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 13:59:02 +02:00
Šimon Brandner 255ab49ccb
Handle edge cases 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 13:48:48 +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
Šimon Brandner b94dc2d0e5
Remember the last used server for room directory searches 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:51 +02:00
Šimon Brandner 1220ad37ce
Remove the usage of symbol 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:44 +02: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
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
Š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
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
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