OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
30,202 Commits
214 Branches
562 Tags
496 MiB
Commit Graph

30202 Commits (6dc1c918cf52b9caa29329f3d29e0ce77232bed0)

Author SHA1 Message Date
Travis Ralston 55592d365c Merge branch 'develop' into travis/msc-send-widget-events 2020-11-18 15:57:53 -07:00
Weblate a2bb984ca9 Merge branch 'origin/develop' into Weblate. 2020-11-18 22:46:16 +00:00
Marcelo Filho 8aacef9d35 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2640 of 2640 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-11-18 22:46:16 +00:00
Travis Ralston 3467d44d43
Merge pull request #5166 from Glandos/patch-1 
Push name to the end, near text, in IRC layout
 2020-11-18 15:46:07 -07:00
Travis Ralston c62c0190c3 Merge branch 'develop' into patch-1 2020-11-18 15:31:39 -07:00
Weblate 571b6cb5c5 Merge branch 'origin/develop' into Weblate. 2020-11-18 22:24:20 +00:00
Travis Ralston 9bcb6876d3
Merge pull request #5325 from matrix-org/t3chguy/fix/3434 
Disable notifications for the room you have recently been active in
 2020-11-18 15:24:14 -07:00
Weblate ce9f5972b4 Merge branch 'origin/develop' into Weblate. 2020-11-18 22:24:07 +00:00
Travis Ralston 57562560d2
Merge pull request #5331 from Transfusion/invisible_rooms_notif_badge 
Search through the list of unfiltered rooms rather than the rooms in the state which are already filtered by the search text
 2020-11-18 15:24:01 -07:00
Weblate 2e657da9d6 Merge branch 'origin/develop' into Weblate. 2020-11-18 22:21:39 +00:00
Travis Ralston 9ca448e8a2
Merge pull request #5353 from resynth1943/lighter-blockquotes-in-dark-mode 
Lighten blockquote colour in dark mode
 2020-11-18 15:21:33 -07:00
Weblate a4b4207d7a Merge branch 'origin/develop' into Weblate. 2020-11-18 22:21:16 +00: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
Weblate 81fbb8a852 Merge branch 'origin/develop' into Weblate. 2020-11-18 22:20:20 +00:00
XoseM 69b81fa420 Translated using Weblate (Galician) 
Currently translated at 100.0% (2639 of 2639 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-11-18 22:20:20 +00:00
Marcelo Filho 89ab6b0ab2 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2639 of 2639 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-11-18 22:20:18 +00:00
Travis Ralston e4c7ab5cc4
Merge pull request #5253 from miterion/develop 
Add keyboard shortcut to close the current conversation
 2020-11-18 15:20:08 -07:00
Heiko Carrasco 3fd13b89b8
Merge branch 'develop' into develop 2020-11-18 20:14:25 +01:00
J. Ryan Stinnett f7e2d70ddf Tweak video component code style 2020-11-18 17:41:54 +00:00
RiotRobot e85ca92904 v3.9.0-rc.1 2020-11-18 16:27:04 +00:00
RiotRobot 19656c7eb8 Prepare changelog for v3.9.0-rc.1 2020-11-18 16:27:03 +00:00
RiotRobot 2880083cbb Upgrade matrix-js-sdk to 9.2.0-rc.1 2020-11-18 15:59:28 +00:00
Weblate 816b385063 Merge branch 'origin/develop' into Weblate. 2020-11-18 15:49:58 +00:00
Besnik Bleta afdba16dac Translated using Weblate (Albanian) 
Currently translated at 99.8% (2637 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2020-11-18 15:49:58 +00: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 de23924740
Merge pull request #5429 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2020-11-18 15:22:57 +00:00
Weblate 2e8bd4c826 Merge branch 'origin/develop' into Weblate. 2020-11-18 15:21:17 +00:00
random e4e6254c8d Translated using Weblate (Italian) 
Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2020-11-18 15:21:17 +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
David Baker 41e885dd67 Merge remote-tracking branch 'origin/develop' into dbkr/new_look_callview 2020-11-18 14:28:03 +00:00
David Baker a2d58e2f1f Make new in-call UI work 
* Buttons on the main view will disappear after 1 second of the user
not moving the mouse over the call view.
 * PIP view has no buttons, and not moveable yet
 * No call status in room view yet
 * Room status bar is still there currently
 2020-11-18 14:22:38 +00:00
Weblate b8f9745285 Merge branch 'origin/develop' into Weblate. 2020-11-18 13:37:56 +00:00
Priit Jõerüüt 760cb8e00a Translated using Weblate (Estonian) 
Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-11-18 13:37:56 +00:00
XoseM 37bd251ecf Translated using Weblate (Galician) 
Currently translated at 100.0% (2642 of 2642 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-11-18 13:37:53 +00:00
Michael Telatynski 2d363a195f
Merge pull request #5427 from matrix-org/t3chguy_15707 
Shrink new room intro top margin to half for encryption bubble tile
 2020-11-18 13:37:43 +00:00
Michael Telatynski 3ee25dadd4 Shrink new room intro top margin to half for encryption bubble tile 2020-11-18 13:09:43 +00:00
Weblate 16da3bcb9f Merge branch 'origin/develop' into Weblate. 2020-11-18 10:07:39 +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
Weblate b5bc7cc7ce Merge branch 'origin/develop' into Weblate. 2020-11-18 03:42:40 +00:00
Travis Ralston 3ce45ef185
Merge pull request #5424 from matrix-org/travis/fix-dms 
Fix DM logic to always pick a more reliable DM room
 2020-11-17 20:42:30 -07:00
Travis Ralston a212dab84c Developer design a permissions dialog 2020-11-17 20:38:59 -07:00
macekj ba8d02a808 add quick shortcut emoji feature and tests 
Signed-off-by: macekj <macekj@umich.edu>
 2020-11-17 17:36:58 -05:00
Weblate 6cc5d44174 Merge branch 'origin/develop' into Weblate. 2020-11-17 15:35:29 +00: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
Travis Ralston 94550546eb Merge branch 'develop' into travis/msc-send-widget-events 2020-11-16 15:08:52 -07:00
Travis Ralston 91b1c8b817 Fix DM logic to always pick a more reliable DM room 
Fixes https://github.com/vector-im/element-web/issues/15605
 2020-11-16 15:07:09 -07:00
Weblate d8b7c96ec9 Merge branch 'origin/develop' into Weblate. 2020-11-16 17:21:13 +00:00