OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
37,617 Commits
215 Branches
561 Tags
480 MiB
Commit Graph

37617 Commits (18d406421befb98910acd48b666a6e0fcc489dd5)

Author SHA1 Message Date
Travis Ralston 18d406421b
Merge pull request #6806 from SimonBrandner/task/remove-message_send_failed 
Remove `message_send_failed` dispatch
 2021-09-14 13:10:07 -06:00
Travis Ralston 333418232d
Merge pull request #6808 from SimonBrandner/task/context_menus-ts 
Convert `/context_menus` and `/avatars` to TS
 2021-09-14 13:07:15 -06:00
David Baker f6b0b12c60 fix lockfile 2021-09-14 18:47:01 +01:00
Šimon Brandner 6972cb248f
Merge remote-tracking branch 'upstream/develop' into task/remove-message_send_failed 2021-09-14 19:31:12 +02:00
Eric Eastwood fddc20dd89
Remove replies from hidden events when shown with `messages.ViewSourceEvent` (#6796) 
As discovered in https://github.com/vector-im/element-web/issues/10391#is

Previously, if you turned on the `showHiddenEventsInTimeline` labs flag, edit (`m.replace`) events
that also have a `m.in_reply_to` field, will show the reply in the timeline.

ex.
```
{
  "type": "m.room.message",
  "content": {
    "body": " * foo",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo",
      "msgtype": "m.text"
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$yvuev9bF2nLRf8fscG55njpVjY3FHJzWgZ4BKI9_0eg",
      "m.in_reply_to": {
        "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
      }
    }
  }
}
```
 2021-09-14 12:28:28 -05:00
Šimon Brandner 0f55fde03a
Convert StatusMessageContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:19 +02:00
Šimon Brandner 11e61075b4
Convert GenericTextContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:18 +02:00
Šimon Brandner 8e4529d6ce
Convert GenericElementContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:18 +02:00
Šimon Brandner 5baaa6b77e
Convert MemberStatusMessageAvatar to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:12 +02:00
Šimon Brandner db25147a19
Remove message_send_failed as it was unused 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 17:49:18 +02:00
RiotRobot 85fea9cfd0 Merge branch 'master' into develop 2021-09-14 16:02:04 +01:00
RiotRobot 36e8af2978 Merge branch 'release-v3.30.0' 2021-09-14 15:59:56 +01:00
RiotRobot c3089a1097 v3.30.0 2021-09-14 15:56:23 +01:00
RiotRobot 2eeb3cecd9 Prepare changelog for v3.30.0 2021-09-14 15:56:22 +01:00
Michael Telatynski 9928079b82
Merge pull request #6797 from matrix-org/t3chguy/fix/19025 2021-09-14 15:56:20 +01:00
Michael Telatynski 1298fddebf
Merge pull request #6800 from matrix-org/t3chguy/fix/18694 
Simplify Space Panel layout and fix some edge cases
 2021-09-14 15:55:44 +01:00
RiotRobot 4ea0385061 Upgrade matrix-js-sdk to 12.5.0 2021-09-14 15:54:30 +01:00
Michael Telatynski 6900fb79c2
Merge pull request #6798 from matrix-org/t3chguy/fix/randoms 2021-09-14 15:53:02 +01:00
Michael Telatynski 4a4c68b71c
Merge pull request #6803 from matrix-org/t3chguy/fix/19034 
Stop spinner on space preview if the join fails
 2021-09-14 15:52:37 +01:00
Michael Telatynski 919270ff0c
Update src/stores/SpaceStore.tsx 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-09-14 15:50:51 +01:00
David Baker 07d29f64fa
Merge pull request #6802 from matrix-org/dbkr/18997_rel 
Fix autocomplete not having y-scroll
 2021-09-14 15:32:50 +01:00
David Baker d081d3af9e
Merge pull request #6801 from matrix-org/dbkr/19012_rel_2 
Fix emoji picker and stickerpicker not appearing correctly when opened
 2021-09-14 15:32:32 +01:00
Michael Telatynski 60f43f0171 Stop spinner on space preview if the join fails 2021-09-14 15:12:25 +01:00
Dariusz Niemczyk cb6368f885 Fix autocomplete not having y-scroll 
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.

Fix https://github.com/vector-im/element-web/issues/18997
 2021-09-14 15:08:40 +01:00
Dariusz Niemczyk 769c9cd780 Add a better comment describing the behavior 2021-09-14 15:03:59 +01:00
Dariusz Niemczyk 8505f292b2 Fix invalid ContextualMenu positions 2021-09-14 15:03:52 +01:00
Michael Telatynski 6672be91a1 Simplify Space Panel layout 2021-09-14 15:00:44 +01:00
Michael Telatynski f59baf1efb Tidy some types 2021-09-14 14:41:55 +01:00
Michael Telatynski 5048e41e8b Space Hierarchy react to known local rooms changing names 2021-09-14 14:41:51 +01:00
Michael Telatynski e37f6b96d7 Fix RoomTile subscribing to wrong event emitter for room name 2021-09-14 14:36:11 +01:00
Michael Telatynski e3ec00bcdf Fix space create menu eating first character of name in private space creation 2021-09-14 14:35:33 +01:00
Michael Telatynski ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Dariusz Niemczyk 74e4cc9680
Merge pull request #6793 from matrix-org/palid/fix/19012 
Fix emoji picker and stickerpicker not appearing correctly when opened
 2021-09-14 14:56:49 +02:00
Dariusz Niemczyk 42a1048fde
Merge pull request #6794 from matrix-org/palid/fix/18997 
Fix autocomplete not having y-scroll
 2021-09-14 14:53:06 +02:00
Dariusz Niemczyk 60174c9836
Add a better comment describing the behavior 2021-09-14 14:51:17 +02:00
Dariusz Niemczyk 527e1eb462
Fix autocomplete not having y-scroll 
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.

Fix https://github.com/vector-im/element-web/issues/18997
 2021-09-14 14:45:47 +02:00
Michael Telatynski 87c9551507 Fix edge cases around joining new room which does not belong to active space 2021-09-14 12:49:18 +01:00
Michael Telatynski 0ee77e2d17
Merge pull request #6791 from matrix-org/t3chguy/fix/19003 2021-09-14 11:48:27 +01:00
Michael Telatynski 3c44969645 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19003 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-09-14 11:42:51 +01:00
Michael Telatynski be58a5e623
Merge pull request #6790 from matrix-org/t3chguy/fix/19007 
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
 2021-09-14 09:07:37 +01:00
Michael Telatynski 73a2225b10
Merge pull request #6792 from matrix-org/t3chguy/fix/19005 
Fix automatic field population in space create menu not validating
 2021-09-14 09:06:49 +01:00
Travis Ralston 298fb49017
Merge pull request #6783 from matrix-org/madlittlemods/12876-optimize-input-field-transition 
Optimize input label transition on focus
 2021-09-13 20:57:41 -06:00
Dariusz Niemczyk ceafa83392
Fix invalid ContextualMenu positions 2021-09-13 22:11:58 +02:00
Dariusz Niemczyk e913f03a67
Add missing types 2021-09-13 22:11:43 +02:00
Travis Ralston 6249a1be5f
Merge pull request #6768 from AndrewFerr/develop 
Set dark theme colors for auth components
 2021-09-13 11:14:31 -06:00
Michael Telatynski 4a470e4341 Fix automatic field population in space create menu not validating 2021-09-13 17:15:52 +01:00
Michael Telatynski b6b099f6c8 Fix broken edge case with public space creation with no alias 2021-09-13 16:27:46 +01:00
Michael Telatynski e3a2c25421
Merge pull request #6786 from aaronraimist/fix18990 2021-09-13 14:11:36 +01:00
Michael Telatynski d75820a491 Hide mute/unmute button in UserInfo for Spaces as it makes no sense 2021-09-13 13:49:24 +01:00
RiotRobot f9e17621af Merge branch 'master' into develop 2021-09-13 13:00:40 +01:00