OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
27,486 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

27486 Commits (b990a0dd3a270b986a6d4e0cd44b3ecdd5b62b33)

Author SHA1 Message Date
Michael Telatynski b990a0dd3a
Merge pull request #5102 from matrix-org/t3chguy/14938 
Try to close notification on all platforms which support it, not just electron
 2020-08-12 16:02:02 +01:00
Michael Telatynski cacb0af5a2
Merge pull request #5101 from matrix-org/t3chguy/fix/14934 
Fix exception when stripping replies from an event with a non-string body
 2020-08-12 16:01:41 +01:00
Jorik Schellekens 0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00
J. Ryan Stinnett 0c76af19f0
Merge pull request #5100 from matrix-org/jryans/remove-rebranding-toast 
Remove rebranding toast
 2020-08-12 15:18:44 +01:00
J. Ryan Stinnett 2e76e19f37 Remove rebrand toast from tests 2020-08-12 14:58:55 +01:00
J. Ryan Stinnett 1a68d2bb7c Update more types 2020-08-12 14:57:26 +01:00
J. Ryan Stinnett 83867b893f Update types 2020-08-12 14:53:31 +01:00
J. Ryan Stinnett d3e9502ab0
Merge pull request #5098 from matrix-org/travis/room-list/regen-preview 
Generate previews for rooms when the option changes
 2020-08-12 14:41:32 +01:00
Michael Telatynski 7fe9fcf050 Try to close notification on all platforms which support it, not just electron 2020-08-12 12:16:28 +01:00
Michael Telatynski 718eeb4a81 Fix exception when stripping replies from an event with a null body 2020-08-12 10:40:25 +01:00
J. Ryan Stinnett 9e429ee669 Remove rebranding toast 
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.

Fixes https://github.com/vector-im/element-web/issues/14931
 2020-08-11 14:27:53 +01:00
Travis Ralston d866b2d9ef Generate previews for rooms when the option changes 
Fixes https://github.com/vector-im/element-web/issues/14853

This likely regressed in https://github.com/matrix-org/matrix-react-sdk/pull/5048 when the message preview information was made state, and the component wasn't updating the preview when the control flags changed.
 2020-08-10 20:52:05 -06:00
Michael Telatynski be2d0c9de7
Merge pull request #5095 from matrix-org/t3chguy/fix/14906 
Fix Bridge Settings tab
 2020-08-10 16:34:24 +01:00
J. Ryan Stinnett 538e222d1f
Merge pull request #5081 from matrix-org/msuess/fix-edit-multiple-widget-instances 
get screen type from app prop
 2020-08-10 14:14:25 +01:00
J. Ryan Stinnett d076d6351f
Merge pull request #5093 from matrix-org/jryans/rebrand-rageshakes 
Update rageshake app name
 2020-08-10 11:11:37 +01:00
Michael Telatynski 4799f0ee43
Merge pull request #5085 from matrix-org/t3chguy/notifications11 
Factor out Iconized Context menu for reusability
 2020-08-08 11:41:28 +01:00
Michael Telatynski 5c0d332e9d Convert Bridge Settings Tab to Typescript 2020-08-08 11:38:57 +01:00
Michael Telatynski f784500b1c Fix Bridge Settings Tab 2020-08-08 11:28:44 +01:00
Michael Telatynski fee808a75e fix indentation 2020-08-08 11:16:28 +01:00
Michael Telatynski fe2f29d78e
Merge pull request #5088 from matrix-org/t3chguy/notifications/14880 
Decouple Audible notifications from Desktop notifications
 2020-08-08 10:49:39 +01:00
Michael Telatynski a095f858b0
Merge pull request #5087 from matrix-org/t3chguy/fix/14868 
Make the room sublist show more/less buttons treeitems
 2020-08-08 10:46:57 +01:00
J. Ryan Stinnett 286624a89e
Merge pull request #5092 from matrix-org/jryans/defer-cross-signing-setup 
Share and debug master cross-signing key
 2020-08-07 16:06:35 +01:00
J. Ryan Stinnett 9e40e079ff Use an explicit list of keys to share 2020-08-07 15:54:05 +01:00
J. Ryan Stinnett f03ed868bd Update rageshake app name 
Fixes https://github.com/vector-im/element-web/issues/14892
 2020-08-06 17:54:54 +01:00
J. Ryan Stinnett 810f07a846 Report master key cache status in rageshakes 2020-08-06 15:26:47 +01:00
J. Ryan Stinnett 4c1956a3c2 Show master key cache status in Settings 2020-08-06 15:25:33 +01:00
J. Ryan Stinnett 060f2cf54f Enable sharing of master cross-signing key 
We've realised it's beneficial to support sharing the master cross-singing key
so that new devices can fully manage cross-signing on your account.

Part of https://github.com/vector-im/element-web/issues/13896
 2020-08-06 15:17:39 +01:00
Michael Telatynski 0da31de5ad
Merge pull request #5086 from matrix-org/t3chguy/notifications12 
Create Map comparison utilities and convert Hooks to Typescript
 2020-08-05 16:28:52 +01:00
RiotRobot 45b79a0b7c Reset matrix-js-sdk back to develop branch 2020-08-05 16:11:28 +01:00
RiotRobot f8cdd51fe3 Merge branch 'master' into develop 2020-08-05 16:10:29 +01:00
RiotRobot f8ed635fbf v3.1.0 2020-08-05 16:05:30 +01:00
RiotRobot 299aa3ed98 Prepare changelog for v3.1.0 2020-08-05 16:05:29 +01:00
RiotRobot 57814a40c1 Upgrade matrix-js-sdk to 8.0.1 2020-08-05 15:50:03 +01:00
J. Ryan Stinnett dd3e6292ac
Merge pull request #5091 from matrix-org/jryans/safari-roomlist-scroll-release 
Fix room list scrolling in Safari
 2020-08-05 14:51:47 +01:00
J. Ryan Stinnett 2f3eff4301
Merge pull request #5090 from matrix-org/jryans/safari-roomlist-scroll 
Fix room list scrolling in Safari
 2020-08-05 14:45:27 +01:00
J. Ryan Stinnett 1e868a256d Fix room list scrolling in Safari 
This sets `flex-basis` properly in Safari so the room list is scrollable.

Fixes https://github.com/vector-im/element-web/issues/14877
 2020-08-05 14:37:09 +01:00
J. Ryan Stinnett af825b4559 Fix room list scrolling in Safari 
This sets `flex-basis` properly in Safari so the room list is scrollable.

Fixes https://github.com/vector-im/element-web/issues/14877
 2020-08-05 14:32:02 +01:00
Jorik Schellekens b871d7e849 Fix room security radios 2020-08-05 13:53:19 +01:00
J. Ryan Stinnett 7748e3ae1a
Merge pull request #5083 from matrix-org/jryans/riot-to-element 
Replace Riot with Element in docs and comments
 2020-08-05 12:25:45 +01:00
Michael Telatynski fca48c0426 improve types 2020-08-05 11:22:43 +01:00
Michael Telatynski 764b94c7ae Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/notifications/14880 
 Conflicts:
	src/@types/global.d.ts
 2020-08-05 11:11:14 +01:00
Michael Telatynski c1e152dba2 Decouple Audible notifications from Desktop notifications 2020-08-05 11:10:12 +01:00
Michael Telatynski d7229064c4 Convert Notifier to typescript 2020-08-05 11:07:10 +01:00
Michael Telatynski f1505833b7 Make the room sublist show more/less buttons treeitems 2020-08-05 09:56:31 +01:00
Michael Telatynski 3675128061
Merge pull request #5027 from matrix-org/t3chguy/room-list/13981 
When the room view isn't active don't highlight it in room list
 2020-08-05 09:29:25 +01:00
Michael Telatynski 6220f50360 delint 2020-08-05 09:28:02 +01:00
Michael Telatynski cd29edb442 Write more typescript defs 2020-08-05 09:13:01 +01:00
Michael Telatynski f5d75bc078 fix comments 2020-08-04 22:03:30 +01:00
Michael Telatynski ed4a427287 Convert hooks to Typescript 2020-08-04 22:00:05 +01:00
Michael Telatynski 93b4ea5be4 Create Maps utility comparison functions 2020-08-04 21:57:37 +01:00