Commit graph

35452 commits

Author SHA1 Message Date
Germain
745a8d3860
Explain isSmall proper for CountryDropdown
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-20 17:18:33 +01:00
Michael Telatynski
91cf27e252
Merge pull request #6401 from Palid/fix/15142/fix-grecaptcha-race-condition 2021-07-20 16:38:19 +01:00
Dariusz Niemczyk
44b8bace47
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition
* develop: (141 commits)
  delint
  Doc some values
  Remove useless image reference
  Revert accidental renaming of dispatcherRef
  Fix event highlighthing
  Move some code around for clarity
  Constrain emoji skins type even further
  Delint
  i18n irc and fix lint from merge conflict
  Remove unwanted coma in EventTile
  fix three lints
  lint fix
  not sure how these happened :/
  remove unused prop
  Update eslint-plugin-matrix-org
  Fix placeholder centering
  Make emoji skins type more specific
  Rename some variables since their purpose has changed
  Conform to new react and typescript eslint rules
  Apply code review suggestions
  ...
2021-07-20 17:33:05 +02:00
Travis Ralston
7ea17aee3c
Merge pull request #6386 from matrix-org/travis/voice-messages/download
Move download button for media to the action bar
2021-07-20 09:08:50 -06:00
Travis Ralston
7892539a9b delint 2021-07-20 09:03:26 -06:00
Travis Ralston
5994111e5d Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download 2021-07-20 08:55:53 -06:00
Travis Ralston
44e240e12d Doc some values 2021-07-20 08:55:07 -06:00
Travis Ralston
32d8da2c74 Remove useless image reference 2021-07-20 08:52:55 -06:00
Travis Ralston
4a877300da
Merge pull request #6405 from matrix-org/travis/files-hover
Remove hover effect from files in the files panel
2021-07-20 07:38:04 -06:00
Michael Telatynski
340d09d457
Merge pull request #6415 from matrix-org/t3chguy-patch-1
Revert accidental renaming of dispatcherRef
2021-07-20 14:02:19 +01:00
Michael Telatynski
ad50d23cc2
Revert accidental renaming of dispatcherRef 2021-07-20 13:56:49 +01:00
David Baker
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile
Add VoIP event tiles
2021-07-20 13:31:53 +01:00
Šimon Brandner
9e5b149291
Fix event highlighthing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 14:23:28 +02:00
Michael Telatynski
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates 2021-07-20 12:57:00 +01:00
Robin Townsend
cc40dd7998 Move some code around for clarity
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-20 07:47:31 -04:00
Robin Townsend
bd80201643 Constrain emoji skins type even further
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-20 07:46:54 -04:00
Šimon Brandner
6cb1c5d918
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:20:30 +02:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Šimon Brandner
c3399b110d
Fix setTimeout retrun type?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:48:38 +02:00
Šimon Brandner
333608c4c4
sdk.getComponent shall die
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:42:21 +02:00
Šimon Brandner
73187156d4
Disable eslint line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:38:14 +02:00
Šimon Brandner
b1f4ba28d7
Merge remote-tracking branch 'upstream/develop' into ts/address-stuff 2021-07-20 12:31:18 +02:00
Šimon Brandner
3cb7a6ab78
Improve more typing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:30:41 +02:00
Šimon Brandner
1fc5138cfe
Convert AppPermission to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:27:20 +02:00
Michael Telatynski
770de8f6b5
Merge pull request #6408 from matrix-org/t3chguy/eslint 2021-07-20 11:23:36 +01:00
Germain Souquet
596fb774e3 Remove sdk.getComponent instructions 2021-07-20 12:22:32 +02:00
Michael Telatynski
b94886a291 i18n irc and fix lint from merge conflict 2021-07-20 11:18:27 +01:00
J. Ryan Stinnett
364bee9ebd
Merge pull request #6414 from matrix-org/gsouquet/fix-jsx-coma
Remove unwanted coma in EventTile
2021-07-20 11:16:54 +01:00
Šimon Brandner
48949af961
Improve typing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:16:33 +02:00
Šimon Brandner
93ab4dc787
UserAddressType -> IUserAddress
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:16:27 +02:00
Michael Telatynski
d3934ff7da
Merge branch 'develop' into t3chguy/eslint 2021-07-20 11:08:13 +01:00
Germain Souquet
e38682d75c Remove unwanted coma in EventTile 2021-07-20 12:05:18 +02:00
Šimon Brandner
a747bbbae7
Convert AddressPickerDialog to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:01:08 +02:00
Šimon Brandner
156901ce62
Convert AddressTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:01:08 +02:00
Šimon Brandner
28871ee07d
Convert AddressSelector to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:01:07 +02:00
Šimon Brandner
8bbd91547d
Convert ActionButton to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 12:01:02 +02:00
Michael Telatynski
9fe9534e01 fix three lints 2021-07-20 10:33:52 +01:00
Germain
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635 2021-07-20 10:22:41 +01:00
Germain Souquet
dd65d47fba lint fix 2021-07-20 11:12:17 +02:00
Michael Telatynski
848b83015d not sure how these happened :/ 2021-07-20 09:37:54 +01:00
Michael Telatynski
e6869797d7 remove unused prop 2021-07-20 09:27:32 +01:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Michael Telatynski
53b0ef20f4 Update eslint-plugin-matrix-org 2021-07-20 09:15:25 +01:00
Michael Telatynski
e11e17eb85
Merge pull request #6411 from SimonBrandner/fix/sticker-placeholder/18014 2021-07-20 09:11:28 +01:00
Germain Souquet
fdd98bbf3f linter fix 2021-07-20 09:55:26 +02:00
Germain Souquet
bb03fd90c8 Merge branch 'develop' into gsouqet/ts-migration-1 2021-07-20 09:02:48 +02:00
Šimon Brandner
5db20d9431
Fix placeholder centering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 08:54:32 +02:00
Robin Townsend
e9963cd22c Make emoji skins type more specific
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-19 21:57:03 -04:00
Robin Townsend
5614ef1675 Rename some variables since their purpose has changed
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-19 21:54:25 -04:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00