OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
19,629 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

15668 Commits (ecf51a05697d7a73b665472603ab2b0f921611cb)

Author SHA1 Message Date
Michael Telatynski ecf51a0569 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-28 16:28:53 +00:00
Michael Telatynski 6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus 
 Conflicts:
	src/components/views/context_menus/RoomTileContextMenu.js
 2019-11-28 16:25:59 +00:00
Travis Ralston 25809c54a7
Merge pull request #3682 from matrix-org/travis/fix-calltype-i18n 
Improve translatable strings for calls
 2019-11-28 09:16:52 -07:00
Travis Ralston 01ba4aca45
Merge pull request #3680 from matrix-org/travis/fix-list-diff 
Don't assume that diffs will have an appropriate child node
 2019-11-28 09:10:43 -07:00
Travis Ralston fde116458c
Words are hard 2019-11-28 09:08:24 -07:00
Travis Ralston 90a1cb68eb
Merge pull request #3681 from matrix-org/travis/fix-jitsi 
Fix persisted widgets getting stuck at loading screens
 2019-11-28 09:06:44 -07:00
Travis Ralston 96ffe94876 Merge remote-tracking branch 'origin/develop' into t3chguy/clear_notifications 2019-11-27 19:27:52 -07:00
Travis Ralston 3b5aa5e9b8
Update src/RoomInvite.js 
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-27 16:57:44 -07:00
Travis Ralston 97515511ce Improve translatable strings for calls 
Fixes https://github.com/vector-im/riot-web/issues/11507
 2019-11-27 13:03:51 -07:00
Travis Ralston 7b013ecc69 Fix persisted widgets getting stuck at loading screens 
The widget itself is rendered underneath the loading screen, so we just have to disable the loading state.

This commit also removes the "is" attribute because React 16 includes unknown attributes: https://reactjs.org/blog/2017/09/08/dom-attributes-in-react-16.html

Fixes https://github.com/vector-im/riot-web/issues/11536
 2019-11-27 12:54:31 -07:00
Travis Ralston 673e6c3162 Don't assume that diffs will have an appropriate child node 
Fixes https://github.com/vector-im/riot-web/issues/11497

This is a regression from react-sdk v1.5.0 where the diff feature was added in the first place. It only affects lists.
 2019-11-27 12:26:43 -07:00
Travis Ralston 275bd33a6c Move the description into the relevant branch 2019-11-27 10:48:05 -07:00
Travis Ralston d6821ecb99 Fix multi-invite error dialog messaging 
Fixes https://github.com/vector-im/riot-web/issues/11515
 2019-11-27 10:44:36 -07:00
Travis Ralston fbba55ab05
Merge pull request #3670 from matrix-org/travis/toggle-communities 
Make the communities button behave more like a toggle
 2019-11-27 07:52:05 -07:00
David Baker dd7b08ec25
Merge pull request #3674 from matrix-org/dbkr/read_marker_css_transition 
Change read markers to use CSS transitions
 2019-11-27 09:18:53 +00:00
David Baker a2e3f64963 Change read markers to use CSS transitions 
Removes one of the two places we use Velocity, so we're one step
closer to getting rid of it for good.

Should therefore fix the fact that Velocity is leaking data entries
and therefore <hr> elements.

Hopefully also makes the logic in getEventTiles incrementally simpler,
if still somwewhat byzantine.
 2019-11-26 19:06:02 +00:00
Travis Ralston 9f1df0ce8f
Merge pull request #3669 from matrix-org/travis/breadcrumb-upgrades 
Update breadcrumbs when we do eventually see upgraded rooms
 2019-11-26 10:33:07 -07:00
Travis Ralston d50d8877e0 Appease the linter 2019-11-26 09:56:04 -07:00
Travis Ralston 4cec7c41b1 Fix override behaviour of system vs defined themes 
Fixes https://github.com/vector-im/riot-web/issues/11509
 2019-11-26 09:52:35 -07:00
Matthew Hodgson 9f455fae4b
Merge branch 'develop' into matthew/fix_logging 2019-11-26 10:19:48 +00:00
Matthew Hodgson 9fd45d1f14 console.log doesn't take %s substitutions 2019-11-26 01:14:03 +00:00
Travis Ralston 1ff39f2524 Make the communities button behave more like a toggle 
Fixes https://github.com/vector-im/riot-web/issues/10771

Clicking the button should toggle between your last page (room in our case) and the communities stuff.
 2019-11-25 16:51:48 -07:00
Travis Ralston 9df227dbd0 Update breadcrumbs when we do eventually see upgraded rooms 
Fixes https://github.com/vector-im/riot-web/issues/11469
 2019-11-25 16:21:09 -07:00
Damir Jelić 21a15fdcb4 EventIndex: Move the checkpoint loading logic into the init method. 
The checkpoints don't seem to be loaded anymore in the onSync method,
the reason why this has stopped working is left unexplored since loading
the checkpoints makes most sense during the initialization step anyways.
 2019-11-25 18:11:50 +01:00
J. Ryan Stinnett 4039d60a43
Merge pull request #3668 from matrix-org/jryans/tweak-cs-lab-name 
Clarify that cross-signing is in development
 2019-11-25 16:37:04 +00:00
Travis Ralston 98693d2dbc
Merge pull request #3665 from matrix-org/travis/fix-flashing 
Hide tooltips with CSS when they aren't visible
 2019-11-25 09:13:43 -07:00
J. Ryan Stinnett 54294e4927 Clarify that cross-signing is in development 
In an attempt to clarify the state of this highly anticipated feature, this
updates the labs flag name to match.

Part of https://github.com/vector-im/riot-web/issues/11492
 2019-11-25 14:30:13 +00:00
Bruno Windels 694f2cb1dc make sure the toast container is always in the document 2019-11-25 13:20:20 +01:00
Bruno Windels 422ab81185 a11y adjustments for toasts 2019-11-25 12:31:57 +01:00
Jeff Huang 56a7de5157 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-11-25 09:55:45 +00:00
Travis Ralston 11fec80370 Hide tooltips with CSS when they aren't visible 
Fixes https://github.com/vector-im/riot-web/issues/11456
 2019-11-24 20:52:22 -07:00
dreboy30 4fb6e4b983 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 68.8% (1321 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2019-11-24 19:45:36 +00:00
dreboy30 1607bc329b Translated using Weblate (Portuguese) 
Currently translated at 34.5% (663 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2019-11-24 19:45:36 +00:00
Andrew 00fd329bfe Translated using Weblate (Italian) 
Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-11-24 19:45:34 +00:00
Szimszon 1c02fa573f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-11-24 19:45:33 +00:00
Kévin C 95e02899b4 Translated using Weblate (French) 
Currently translated at 100.0% (1921 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-11-24 19:45:32 +00:00
Nathan Follens d867f41f56 Translated using Weblate (Dutch) 
Currently translated at 93.4% (1794 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-11-24 19:45:31 +00:00
Keunes 8254261f26 Translated using Weblate (Dutch) 
Currently translated at 93.4% (1794 of 1921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-11-22 18:48:50 +00:00
Weblate edbe7045d7 Merge branch 'origin/develop' into Weblate. 2019-11-22 16:59:21 +00:00
David Baker 7f7e51627c
Merge pull request #3664 from matrix-org/dbkr/nullcheck_thumbnail_file 
Null check on thumbnail_file
 2019-11-22 16:59:15 +00:00
Weblate d3820b61f6 Merge branch 'origin/develop' into Weblate. 2019-11-22 16:52:53 +00:00
Bruno Windels 15b5ad7451
Merge pull request #3662 from matrix-org/bwindels/itsadoubledate 
Fix double date separator for room upgrade tiles
 2019-11-22 16:52:47 +00:00
David Baker aae3150383 Null check on thumbnail_file 2019-11-22 16:50:32 +00:00
Weblate 0bd1952108 Merge branch 'origin/develop' into Weblate. 2019-11-22 16:39:30 +00:00
random fab7dfd8e8 Translated using Weblate (Italian) 
Currently translated at 99.9% (1916 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-11-22 16:39:29 +00:00
Stanislav Lukeš 9bb98e2b9c Translated using Weblate (Czech) 
Currently translated at 95.8% (1837 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2019-11-22 16:39:27 +00:00
Slavi Pantaleev f1d096e7aa Translated using Weblate (Bulgarian) 
Currently translated at 95.9% (1840 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-11-22 16:39:27 +00:00
Bruno Windels 4a684d01a4
Merge pull request #3661 from matrix-org/bwindels/verif-toasts 
Show incoming verification requests in in-app notifications
 2019-11-22 16:39:18 +00:00
Bruno Windels 32b6fccbfc fix double date separator 2019-11-22 17:26:14 +01:00
Bruno Windels 309633181d use FormButton in verification request tile too and dedupe styles 2019-11-22 16:32:50 +01:00