OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
38,426 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

444 Commits (fe0a68b71ea81230bb662be0c8b89a56c97542bc)

Author SHA1 Message Date
Jaiwanth 208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Michael Telatynski 4335cd03c5 Pluck out JoinRuleSettings styles so they apply in space settings too 2021-09-28 16:30:17 +01:00
Jaiwanth 94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
Steffen Kolmer d76adde1ab Use scss instead of inline styles 2021-08-28 13:41:24 +02:00
Travis Ralston 15c731d574
Merge pull request #6507 from matrix-org/t3chguy/fix/18089 
Allow pagination of the space hierarchy and use new APIs
 2021-08-23 15:51:34 -06:00
Jaiwanth 6a26154271 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-20 15:02:13 +05:30
Dariusz Niemczyk 582b5c90a4
Properly sepearate left column from timeline 2021-08-16 14:26:21 +02:00
Jaiwanth e88edba650
Merge branch 'develop' into export-conversations 2021-08-12 17:10:13 +05:30
Michael Telatynski 0a209afdc2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	res/css/structures/_SpaceHierarchy.scss
	src/components/structures/SpaceHierarchy.tsx
	src/i18n/strings/en_EN.json
 2021-08-12 11:41:03 +01:00
Michael Telatynski 228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski db951b43a3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-10 09:48:22 +01:00
Jaiwanth 45ce352d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:44:13 +05:30
Šimon Brandner 0cad9ed14a
Add _CallViewButtons.scss 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-08 11:15:18 +02:00
Šimon Brandner fe1dfa209a
rethemendex 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 10:13:27 +02:00
Dariusz Niemczyk b6f7c4fe95
Merge pull request #6475 from matrix-org/jitsi-picture-in-picture 
Refactor Calls components into smaller pieces for future Widgets work
 2021-08-06 18:03:30 +02:00
Dariusz Niemczyk 3b002c4c1f
Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture 
* origin/develop: (100 commits)
  Add comments to isRegionalIndicator
  Stop voice messages that are playing when starting a recording
  Properly set style attribute on shared usercontent iframe
  Fix in-call context menus when in PiP mode (#6552)
  Extract tooltipYOffset to a const
  Increase yOffset by 4px away
  i18n
  Post-merge conflict resolution and improve alignment of tooltips
  Fix image & blurhash info when skipping thumbnail due to thresholds
  Skip sending a thumbnail if it is not a sufficient saving over the original
  Null guard space inviter to prevent the app exploding
  Remove seams from pin icon
  Appease Jest
  Fix worklet reference for new webpack pipeline
  i18n
  Update copy
  Fix wrong cursor being used in PiP
  Fix voice feed cut-off
  Use flex-start as it has more universal support
  Wrap cases in {}
  ...
 2021-08-06 13:25:14 +02:00
Šimon Brandner 25c6b216b0
Move LayoutSwitcher CSS to a separate file 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:37:42 +02:00
Michael Telatynski 2d3211ccf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-04 12:14:29 +01:00
Michael Telatynski a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
Šimon Brandner d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 09:21:45 +02:00
Dariusz Niemczyk 3ab54bce6e
Move CallViewHeader css to separate file 2021-08-03 15:21:14 +02:00
Michael Telatynski 9eb0986353 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-07-30 11:34:52 +01:00
Michael Telatynski 259627fba2 Clean up SpaceHierarchy 2021-07-30 11:01:49 +01:00
Jaiwanth 17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
Michael Telatynski 94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071 2021-07-29 15:57:26 +01:00
Michael Telatynski 493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 
 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx
 2021-07-29 15:22:52 +01:00
Michael Telatynski efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
 2021-07-29 15:16:53 +01:00
Michael Telatynski 5d9e421de0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 2021-07-28 17:58:34 +01:00
Michael Telatynski 6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Michael Telatynski 39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
Jaiwanth b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Šimon Brandner b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-25 08:10:01 +02:00
Šimon Brandner 410928745f
IncomingCallBox -> IncomingCallToast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-24 13:46:22 +02:00
Michael Telatynski 7ccc429bea Change spaces beta feedback to not be so beta-centric 2021-07-23 15:47:11 +01:00
Michael Telatynski 010baabfe6 Improve subspaces and some utilities around room/space creation 2021-07-23 08:46:20 +01:00
Šimon Brandner 2841383e82
rethemendex 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 17:10:57 +02:00
Michael Telatynski 18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-07-22 12:44:27 +01:00
Travis Ralston 5386d23008 Fix voice message tile taking up a couple extra px at the bottom 
... by returning it to the default block shape.
 2021-07-21 14:43:26 -06:00
Michael Telatynski 390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-07-21 10:46:41 +01:00
Michael Telatynski 1b2d70d816 Prompt user to leave rooms/subspaces in a space when leaving space 2021-07-21 09:57:10 +01:00
Jaiwanth 1ed316851a Merge upstream and resolve conflicts 2021-07-21 11:35:27 +05:30
Šimon Brandner c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-20 15:48:25 +02:00
Šimon Brandner 66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:24:05 +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
Germain Souquet 06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Michael Telatynski de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
 2021-07-19 16:47:31 +01:00
Jaiwanth fe2cac56f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-19 12:57:27 +05:30
Šimon Brandner 5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:13:51 +02:00
Travis Ralston 942cadc8a3 Merge branch 'develop' into travis/notifications-2 2021-07-16 16:20:23 -06:00
Šimon Brandner 16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:43:33 +02:00