PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
29546 commits 1 branch 0 tags 338 MiB
Commit graph

2125 commits

Author SHA1 Message Date
Travis Ralston
ddd8bdc00e Move all the capability copy to its own class 2020-11-19 11:15:42 -07:00
Travis Ralston
55592d365c Merge branch 'develop' into travis/msc-send-widget-events 2020-11-18 15:57:53 -07:00
Travis Ralston
df6218ef4a
Merge pull request #5364 from mkenigs/mxc-imgs 
Specify community description img must be mxc urls
 2020-11-18 15:21:09 -07:00
Heiko Carrasco
3fd13b89b8
Merge branch 'develop' into develop 2020-11-18 20:14:25 +01:00
Michael Telatynski
11fb081f7a
Merge pull request #5423 from matrix-org/t3chguy/sso 
Redirect user home from auth screens if they are already logged in
 2020-11-18 15:49:47 +00:00
J. Ryan Stinnett
23d039b961
Merge pull request #5428 from matrix-org/jryans/fix-message-search-summary 
Fix message search summary text
 2020-11-18 15:21:04 +00:00
J. Ryan Stinnett
14e64c10a3 Restore numeric count as well for better pluralisation 2020-11-18 15:16:35 +00:00
J. Ryan Stinnett
95a436cdaf Use room(s) style in message 2020-11-18 14:57:31 +00:00
J. Ryan Stinnett
a2a07b528a Fix message search summary text 
This repairs the message search summary text, which regressed in
https://github.com/matrix-org/matrix-react-sdk/pull/5416. We can't use the `one`
/ `other` syntax here since there are two numbers and they are both strings.

Fixes https://github.com/vector-im/element-web/issues/15766
 2020-11-18 14:46:46 +00:00
Michael Telatynski
9b2143742a
Merge pull request #5418 from matrix-org/t3chguy/fix/muggle-hustle 
Small delight tweaks to improve rough corners in the app
 2020-11-18 10:07:31 +00:00
Travis Ralston
a212dab84c Developer design a permissions dialog 2020-11-17 20:38:59 -07:00
Michael Telatynski
e05fcc8d34
Merge pull request #5408 from matrix-org/t3chguy/fix/15400 
Update styling of the Analytics toast
 2020-11-17 15:35:20 +00:00
Michael Telatynski
c6ecd59114 i18n 2020-11-16 16:30:23 +00:00
Michael Telatynski
24a393342d
Merge pull request #5416 from matrix-org/t3chguy/fix/14852 
Fix poorly i18n'd string
 2020-11-12 10:43:22 +00:00
Michael Telatynski
bf62960e1a
Merge pull request #5413 from matrix-org/t3chguy/fix/11415 
Change how we expose Role in User Info and hide in DMs
 2020-11-11 18:15:46 +00:00
Michael Telatynski
a2958f8f99 i18n 2020-11-11 17:04:10 +00:00
Michael Telatynski
a481f3bdf1 Iterate the filtering prompt 2020-11-11 17:04:09 +00:00
Michael Telatynski
d3fee540c5 Update Room List filter copy 2020-11-11 17:04:09 +00:00
Michael Telatynski
71e2536d02 sort file i18n 2020-11-11 16:51:56 +00:00
Michael Telatynski
979faf23e8 Fix poorly i18n'd string 2020-11-11 16:49:51 +00:00
Michael Telatynski
0766519467
Merge pull request #5398 from matrix-org/t3chguy/fix/8141 
Improvements around new room empty space interactions
 2020-11-10 13:09:59 +00:00
Michael Telatynski
db3f125e26 Change how we expose Role in User Info and hide in DMs 2020-11-10 12:03:50 +00:00
David Baker
50bce642d5
Merge pull request #5366 from matrix-org/dbkr/call_hold 
Implement call hold
 2020-11-10 08:41:34 +00:00
Michael Telatynski
36ef9ec341 Update styling of the Analytics toast to try and decrease number of users blindly pressing No 2020-11-09 14:21:45 +00:00
Aaron Raimist
d121f8a357
Allow country names to be translated 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-11-08 22:33:15 -06:00
Michael Telatynski
c269577037 i18n 2020-11-05 15:51:36 +00:00
Michael Telatynski
2fdfe9346f Update copy on the Encryption Enabled bubble tile and room creation ELS to cater better in general but specifically for DMs 2020-11-04 17:50:59 +00:00
Matthew Hodgson
ced58b9ecf apostrophe!! 2020-11-04 14:54:53 +00:00
Michael Telatynski
5a8525dd93
Merge pull request #5387 from matrix-org/t3chguy/fix/13066 
Invite / Create DM UX tweaks
 2020-11-04 14:01:21 +00:00
Michael Telatynski
5c9acc364f
Merge pull request #5383 from matrix-org/t3chguy/fix/15604 
Tweaks to toasts and post-registration landing
 2020-11-04 13:59:51 +00:00
Michael Telatynski
f583978c42
Merge pull request #5392 from matrix-org/t3chguy/fix/15543 
Hide prompt to add email for notifications if 3pid ui feature is off
 2020-11-04 09:19:29 +00:00
Michael Telatynski
a51307af25 i18n 2020-11-03 23:25:06 +00:00
Michael Telatynski
0da23e2cbd Fix copy for call hangup previews 2020-11-03 15:22:23 +00:00
Michael Telatynski
0221c4aebf i18n 2020-11-03 14:56:16 +00:00
Michael Telatynski
3a6420b40d i18n 2020-11-02 17:26:00 +00:00
David Baker
7796621e8d Merge remote-tracking branch 'origin/develop' into dbkr/call_hold 2020-10-30 16:49:42 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly 
Initial Countly work
 2020-10-30 13:07:58 +00:00
Michael Telatynski
b01055f962 Tidy up and fix some edge cases 2020-10-30 10:26:15 +00:00
David Baker
f828c6d494 Implement call hold 
Currently just by adding /holdcall and /unholdcall slash commands

The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.

Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
 2020-10-29 17:56:24 +00:00
Michael Telatynski
c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Matthew Kenigsberg
24ba566877 Specify community description img must be mxc urls 
Closes vector-im/element-web#7100

Signed-off-by: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
 2020-10-28 18:34:54 -05:00
Travis Ralston
09b02d0120 Fix i18n 2020-10-28 10:50:38 -06:00
Michael Telatynski
0004dd4475 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-10-22 21:40:05 +01:00
David Baker
fa1a956733
Merge pull request #5345 from matrix-org/dbkr/select_answer 
Support 'answered elsewhere'
 2020-10-21 13:42:23 +01:00
David Baker
765fdf93e6 Support 'answered elsewhere' 
Show a dialog for now, telling the user someone beat them to it.

Only useful with https://github.com/matrix-org/matrix-js-sdk/pull/1522
(but can be merged safely without).
 2020-10-21 11:54:48 +01:00
Michael Telatynski
b6fd2a0691 Iterate the Modal Widget Dialog paddings and phishing warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:22 +01:00
Michael Telatynski
00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 
 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts
 2020-10-19 19:46:07 +01:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
David Baker
b10f7a47fd
Merge pull request #5324 from matrix-org/dbkr/hang_up_your_hangups 
Support rejecting calls
 2020-10-19 09:57:13 +01:00
Michael Telatynski
da7a02b545 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-16 12:23:10 +01:00