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

30692 Commits (d28521123e55d383b812b91a1a23945b0240e9c6)

Author SHA1 Message Date
Weblate d28521123e Merge branch 'origin/develop' into Weblate. 2021-01-28 12:50:00 +00:00
J. Ryan Stinnett 4920614ca5
Merge pull request #5529 from SimonBrandner/hide-local-feed 
Hide local video if it is muted
 2021-01-28 12:49:52 +00:00
Weblate e5d3784d93 Merge branch 'origin/develop' into Weblate. 2021-01-28 12:44:43 +00:00
J. Ryan Stinnett 5758cd8bcc
Merge pull request #5518 from blattersturm/pr/irc-layout-width 
Don't use name width in reply thread for IRC layout
 2021-01-28 12:44:36 +00:00
Weblate 5f5fc6acea Merge branch 'origin/develop' into Weblate. 2021-01-28 12:42:55 +00:00
J. Ryan Stinnett 60eade5008
Merge pull request #5554 from czeidler/code-style-update 
Update code_style.md
 2021-01-28 12:42:50 +00:00
Weblate 8336cbda71 Merge branch 'origin/develop' into Weblate. 2021-01-28 12:35:30 +00:00
J. Ryan Stinnett 6cbff674d3
Merge pull request #5569 from SimonBrandner/fix-czech-letters 
Fix Czech capital letters like ŠČŘ...
 2021-01-28 12:35:22 +00:00
Weblate 4f96064a1d Merge branch 'origin/develop' into Weblate. 2021-01-28 12:33:38 +00:00
J. Ryan Stinnett 5431dc7331
Merge pull request #5548 from SimonBrandner/add-search-shortcut 
Add optional search shortcut
 2021-01-28 12:33:32 +00:00
Weblate 1499f9a209 Merge branch 'origin/develop' into Weblate. 2021-01-28 12:25:56 +00:00
J. Ryan Stinnett 08d495eee8
Merge pull request #5584 from 2580ayush2580/ayush25805 
Fix Sudden 'find a room' UI shows up when the only room moves to favourites
 2021-01-28 12:25:47 +00:00
Weblate 60bbcf6f11 Merge branch 'origin/develop' into Weblate. 2021-01-28 03:37:21 +00:00
MusiCode1 317b370b59 Translated using Weblate (Hebrew) 
Currently translated at 98.7% (2696 of 2731 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/he/
 2021-01-28 03:37:21 +00:00
Travis Ralston 41068c7849
Merge pull request #5568 from SimonBrandner/fix-15221 
Increase PersistedElement's z-index
 2021-01-27 20:37:11 -07:00
Travis Ralston 41682fa8d2
Update src/components/views/elements/PersistedElement.js 2021-01-27 20:37:04 -07:00
Weblate f01511cfd4 Merge branch 'origin/develop' into Weblate. 2021-01-27 21:59:42 +00:00
Weblate 6f7d4833fe Merge branch 'origin/develop' into Weblate. 2021-01-27 21:59:37 +00:00
MusiCode1 14caa2f0a1 Translated using Weblate (Hebrew) 
Currently translated at 98.5% (2691 of 2731 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/he/
 2021-01-27 21:59:37 +00:00
c-cal dd5911e7e5 Translated using Weblate (French) 
Currently translated at 97.2% (2655 of 2731 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-01-27 21:59:35 +00:00
Travis Ralston 61f6fa0633
Merge pull request #5582 from matrix-org/travis/widgets/fix-jitsi-unpin 
Remove check that prevents Jitsi widgets from being unpinned
 2021-01-27 14:59:34 -07:00
Travis Ralston 3229b1fb4e
Merge pull request #5583 from matrix-org/travis/widgets/jitsi-crash 
Fix Jitsi widgets causing localized tile crashes
 2021-01-27 14:59:27 -07:00
Travis Ralston c1b33d3e2c Fix Jitsi widgets causing localized tile crashes 
Seems to be that as part of the layout work the timing sequence for when `.getRoom().widgets` will work changed. We can get around this with `initIfNeeded` which will no-op in the worst case.

This also includes a copy change to make ended conferences stop lying about where to find the widget. This is work towards https://github.com/vector-im/element-web/issues/15739
 2021-01-27 14:40:04 -07:00
Ayush Kumar 2c11f0bb7c Added condition to hide the 'find a room' UI unless the user is explicitly filtering the list 2021-01-28 03:09:52 +05:30
Travis Ralston 08b067fd68 Remove check that prevents Jitsi widgets from being unpinned 
Later in the code we do a conditional on the widget type to auto-pin the widget, so we don't need this one to force the widget higher.

Fixes https://github.com/vector-im/element-web/issues/16280
 2021-01-27 14:31:48 -07:00
Weblate b6d1342ab6 Merge branch 'origin/develop' into Weblate. 2021-01-27 16:01:13 +00:00
David Baker 33a86f6cbe
Merge pull request #5573 from matrix-org/dbkr/callstats 
Log candidates for calls
 2021-01-27 16:01:06 +00:00
Weblate d2036e93c9 Merge branch 'origin/develop' into Weblate. 2021-01-27 14:01:58 +00:00
Slobodan Simić 4975e0245b Translated using Weblate (Serbian) 
Currently translated at 47.9% (1309 of 2731 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sr/
 2021-01-27 14:01:57 +00:00
J. Ryan Stinnett de507b80f7
Merge pull request #5579 from matrix-org/jryans/upgrade-deps-2021-01 
Upgrade deps 2021-01
 2021-01-27 14:01:47 +00:00
J. Ryan Stinnett 51aab9ca08 Fix import style for commonmark 2021-01-27 13:06:59 +00:00
J. Ryan Stinnett d78bc98521 Resolve linting errors after upgrades 2021-01-27 12:42:39 +00:00
J. Ryan Stinnett 84b1f2e6c6 Resolve typing errors after TypeScript upgrade 2021-01-27 12:42:37 +00:00
J. Ryan Stinnett ea706189a2 Nested upgrades via `yarn upgrade` 2021-01-27 12:34:10 +00:00
J. Ryan Stinnett 0cb266eda2 lolex renamed to @sinonjs/fake-timers 2021-01-27 12:31:37 +00:00
J. Ryan Stinnett ca08475498 Apply all simple major version upgrades 2021-01-27 12:31:37 +00:00
J. Ryan Stinnett f8816e0bda Pin React types to 16.x for now 
This avoids type conflicts from other deps that depends on just `*`. Type deps
needs to be de-duplicated down to a single version to avoid errors (unlike code
deps).
 2021-01-27 12:31:37 +00:00
J. Ryan Stinnett 12c671045d Upgrade to latest minor versions of deps 2021-01-27 12:31:37 +00:00
David Baker 9ac31747f6 This was missing a break somehow 2021-01-27 10:36:40 +00:00
Weblate 075d03227c Merge branch 'origin/develop' into Weblate. 2021-01-27 00:02:33 +00:00
J. Ryan Stinnett 048a3f6ec8
Merge pull request #5566 from 2580ayush2580/ayush25803 
Fix "Continuing without email" dialog bug
 2021-01-27 00:02:26 +00:00
Weblate 831443a0d6 Merge branch 'origin/develop' into Weblate. 2021-01-26 12:12:03 +00:00
RiotRobot 4dbdeb46ad Reset matrix-js-sdk back to develop branch 2021-01-26 12:11:47 +00:00
RiotRobot e21514cea0 Merge branch 'master' into develop 2021-01-26 12:08:24 +00:00
RiotRobot 982c3ceca1 v3.12.1 2021-01-26 12:04:37 +00:00
RiotRobot 1ecd3836da Prepare changelog for v3.12.1 2021-01-26 12:04:37 +00:00
Weblate c001d8c58e Merge branch 'origin/develop' into Weblate. 2021-01-26 11:59:12 +00:00
Samu Voutilainen 1181489cbf Translated using Weblate (Finnish) 
Currently translated at 94.7% (2587 of 2731 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fi/
 2021-01-26 11:59:12 +00:00
Ihor Hordiichuk 36a34008c0 Translated using Weblate (Ukrainian) 
Currently translated at 53.8% (1471 of 2731 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-01-26 11:59:10 +00:00
J. Ryan Stinnett e327551399
Merge pull request #5574 from matrix-org/jryans/verify-require-reg 
Require registration for verification actions
 2021-01-26 11:58:59 +00:00