mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-03 20:36:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
17570 commits 217 branches 562 tags 468 MiB
Commit graph

17570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
435f5de4f3 Merge branch 'origin/develop' into Weblate. 2019-08-28 16:44:35 +00:00
Michael Telatynski
7ef087db86
Merge pull request #3354 from matrix-org/t3chguy/avatar_change_cursor_perms 
Don't use cursor: pointer on roomsettings avatar if you can't change it
 2019-08-28 17:44:31 +01:00
Weblate
5b3a651b7b Merge branch 'origin/develop' into Weblate. 2019-08-28 16:17:21 +00:00
Bruno Windels
f119ac4b22
Merge pull request #3349 from matrix-org/bwindels/tab-complete-name 
New composer: support forcing auto complete on name by hitting tab
 2019-08-28 16:17:16 +00:00
Bruno Windels
eddaece43e add visual bell color to theme + choose better value for dark mode 2019-08-28 18:00:57 +02:00
Bruno Windels
29f96e659a remove leftover code 2019-08-28 17:53:03 +02:00
Weblate
927c0b42e7 Merge branch 'origin/develop' into Weblate. 2019-08-28 14:59:51 +00:00
David Baker
665e3f44e1
Merge pull request #3355 from matrix-org/dbkr/email_help_text_update 
Update email help text
 2019-08-28 10:59:47 -04:00
David Baker
aa9c0b24fe re-run i18n 2019-08-28 10:37:57 -04:00
David Baker
c749b6355f Update email help text 
Fixes https://github.com/vector-im/riot-web/issues/10674
 2019-08-28 10:34:50 -04:00
Bruno Windels
85efb71a23 add visual bell when no replacements are available 
also add try/catch in _tabCompleteName so errors don't get swallowed
 2019-08-28 15:53:16 +02:00
Bruno Windels
c44fbb73d0 fix bug when replacing range starting at end of previous part 2019-08-28 15:52:39 +02:00
Michael Telatynski
591fa3d8c5 Don't use cursor: pointer on roomsettings avatar if you can't change it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-28 14:46:47 +01:00
Weblate
478675b480 Merge branch 'origin/develop' into Weblate. 2019-08-28 13:18:40 +00:00
random
549e2e4589 Translated using Weblate (Italian) 
Currently translated at 100.0% (1751 of 1751 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-08-28 13:18:40 +00:00
Kévin C
ab3f169125 Translated using Weblate (French) 
Currently translated at 100.0% (1751 of 1751 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-28 13:18:40 +00:00
Jeff Huang
e6f166c2ac Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1751 of 1751 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-28 13:18:39 +00:00
David Baker
86fcaa2af0
Merge pull request #3350 from matrix-org/dbkr/dont_infinite_loop_on_server_change 
Don't infinite loop on server change
 2019-08-28 09:18:35 -04:00
David Baker
ac2b8b874f Don't infinite loop on server change 
ServerConfig assumed that the state was already correct when
checking the given urls against the default, but that is not
neccessarily the case (eg. the validation can return a different
url to what the user entered). This would cause an infinite loop
because it would keep firing onServerConfigChange to change to
the desired URLs but the state would never change.

Fixes part of https://github.com/vector-im/riot-web/issues/10666
 2019-08-27 17:29:56 -04:00
Weblate
f8845d8a68 Merge branch 'origin/develop' into Weblate. 2019-08-27 15:08:22 +00:00
Travis Ralston
8e799b7136
Merge pull request #3341 from matrix-org/travis/tabbed-managers 
Support multiple integration managers behind a labs flag
 2019-08-27 09:08:17 -06:00
Travis Ralston
3eddded039 Merge branch 'develop' into travis/tabbed-managers 2019-08-27 09:07:52 -06:00
Weblate
8292abf571 Merge branch 'origin/develop' into Weblate. 2019-08-27 15:07:14 +00:00
Travis Ralston
971e1ac8c3
Merge pull request #3340 from matrix-org/travis/homeserver-managers 
Support homeserver-configured integration managers
 2019-08-27 09:07:09 -06:00
Bruno Windels
994bcb5c85 dont expect rendered to be called from range.replace() anymore 
as this is now called from the `transform` method, unused in this test
 2019-08-27 16:43:05 +02:00
Bruno Windels
d8bb9ecedf bring insert method inline with transform callback, add docs 
before the insertPartsAt method would call the update callback
on its own, but now we have the concept of a transformation session,
so lets bring the API in line
 2019-08-27 16:43:05 +02:00
Bruno Windels
8e66d382de don't crash on race with room members and initial composer render 
not ideal, but for now this prevents a crash at startup
when a user-pill is persisted in local storage
 2019-08-27 16:43:05 +02:00
Bruno Windels
e0ec827a64 extra docs 2019-08-27 16:43:05 +02:00
Bruno Windels
f5bb872efa some cleanup 2019-08-27 16:43:05 +02:00
Bruno Windels
f02713d08e force completion when hitting tab 
by replacing word before caret with pill-candidate and
forcing auto complete
 2019-08-27 16:43:05 +02:00
Bruno Windels
68c2bb7ca6 introduce transform method so update can be called with a position 
and also for multiple transformations at once. This removes
the need to call the update callback from `replaceRange()` as well
 2019-08-27 16:43:05 +02:00
Bruno Windels
f76a23d5dd return promise from updating autocomplete 
so one can await if needed
 2019-08-27 16:43:05 +02:00
Bruno Windels
0f6465a1db don't close autocomplete when hitting tab 
that's not what the slate impl does and it's not an improvement
 2019-08-27 16:43:05 +02:00
Bruno Windels
713205e0ab close autocomplete when removing auto-completed part 2019-08-27 16:43:05 +02:00
Weblate
31aa3c26be Merge branch 'origin/develop' into Weblate. 2019-08-27 14:40:57 +00:00
Bruno Windels
e0b99b5cc8
Merge pull request #3342 from matrix-org/bwindels/cider-replace-emoticons 
Auto-replace emoticons with emojis in new composer
 2019-08-27 14:40:53 +00:00
Weblate
fdb4c44123 Merge branch 'origin/develop' into Weblate. 2019-08-27 14:27:09 +00:00
송태섭
2611bdabb6 Translated using Weblate (Korean) 
Currently translated at 67.8% (1184 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-08-27 14:27:08 +00:00
Travis Ralston
08339abd35
Merge pull request #3348 from matrix-org/travis/fix-discovery 
Adjust copy and include identity server changing when terms are pending
 2019-08-27 08:27:03 -06:00
Bruno Windels
f10e1d7654 fix jsdoc comments 2019-08-27 09:54:13 +02:00
Bruno Windels
56606a46f4 don't assume preceding space for emoticon at start of document 
also add more inline comments to explain what is going on
 2019-08-27 09:50:36 +02:00
Bruno Windels
5c28b57681 always recalculate position after doing transform step 
as the amount of characters might not have changed,
parts may still have been merged, removed or added which
requires a new position.
 2019-08-27 09:49:22 +02:00
Weblate
161c611a69 Merge branch 'origin/develop' into Weblate. 2019-08-26 18:45:30 +00:00
Michael Telatynski
8bdc1e9446
Merge pull request #3347 from matrix-org/t3chguy/react16_5 
Migrate away from React.createClass for views/dialogs. React 16 :D
 2019-08-26 19:45:26 +01:00
Weblate
6ebff9e34b Merge branch 'origin/develop' into Weblate. 2019-08-26 18:45:16 +00:00
Weblate
378a400166 Merge branch 'origin/develop' into Weblate. 2019-08-26 18:45:14 +00:00
Peter Vágner
7d81ff87a4 Translated using Weblate (Slovak) 
Currently translated at 85.4% (1492 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2019-08-26 18:45:14 +00:00
Walter
ac57835630 Translated using Weblate (Russian) 
Currently translated at 96.9% (1692 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-08-26 18:45:11 +00:00
XN
cfbdf031d4 Translated using Weblate (Polish) 
Currently translated at 79.7% (1392 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-08-26 18:45:11 +00:00
Karol Kosek
fef6e8ed6b Translated using Weblate (Polish) 
Currently translated at 79.7% (1392 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-08-26 18:45:10 +00:00