mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
35215 commits 214 branches 561 tags 414 MiB
Commit graph

35215 commits

This branch
This branch
All branches
Author SHA1 Message Date
Germain Souquet
6d9ac1de17 Fix font slider preview for message bubbles 2021-07-21 09:34:30 +02: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
Michael Telatynski
770de8f6b5
Merge pull request #6408 from matrix-org/t3chguy/eslint 2021-07-20 11:23:36 +01: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
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
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
Š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
Robin Townsend
f8a922eaa1 Apply code review suggestions 
including filling in gaps in emoji shortcode coverage.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 15:09:15 -04:00
Michael Telatynski
b6feaf74bc
Merge pull request #6407 from robintown/uppercase-avatar-placeholders 2021-07-19 17:56:25 +01:00
Robin Townsend
b36c748940 Fix avatar placeholders not getting capitalized 
Regressed by 096d0a7d12.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 12:48:44 -04:00
Travis Ralston
4856559661
Merge pull request #6406 from matrix-org/travis/notifications-ui-order 
Revert order of notification setting radios
 2021-07-19 10:24:06 -06:00
Travis Ralston
6862d97961 APPEASE THY JSON 2021-07-19 10:18:15 -06:00
Travis Ralston
b31043b5eb Revert order of notification setting radios 
Follow-on from https://github.com/matrix-org/matrix-react-sdk/pull/6352
Fixes https://github.com/vector-im/element-web/issues/18048
 2021-07-19 10:15:42 -06:00
Travis Ralston
097cc858ce Remove hover effect from files in the files panel 2021-07-19 10:07:16 -06:00
RiotRobot
676d2aa187 Resetting package fields for development 2021-07-19 16:16:18 +01:00
RiotRobot
13731177a3 Merge branch 'master' into develop 2021-07-19 16:14:58 +01:00
RiotRobot
e7ad33db0f v3.26.0 2021-07-19 16:00:26 +01:00
RiotRobot
4d11d5d5ea Prepare changelog for v3.26.0 2021-07-19 16:00:25 +01:00
Michael Telatynski
a3e5d76064
Merge pull request #6397 from matrix-org/t3chguy/fix/18040 
Respect compound emojis in default avatar initial generation
 2021-07-19 15:58:40 +01:00
RiotRobot
3335ffa069 Upgrade matrix-js-sdk to 12.1.0 2021-07-19 15:54:25 +01:00
Dariusz Niemczyk
5acc7fe8d4
Make errorText properly optional instead of null 2021-07-19 16:49:39 +02:00
David Baker
96ddfefc03
Merge pull request #6403 from matrix-org/dbkr/upgrade_eslint_plugin_matrix_org 
Update eslint-plugin-matrix-org
 2021-07-19 15:34:21 +01:00