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

17547 Commits (478675b48097c05e0af075327a16180c706caeb9)

Author SHA1 Message Date
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
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
AA 3618d9a8c7 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:09 +00:00
송태섭 56d0ebaaa0 Translated using Weblate (Korean) 
Currently translated at 66.8% (1167 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-08-26 18:45:05 +00:00
random 81fd3f3769 Translated using Weblate (Italian) 
Currently translated at 100.0% (1747 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-08-26 18:44:58 +00:00
Szimszon c33062ea6b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1747 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-08-26 18:44:58 +00:00
Michael Telatynski 0b9f6cf388
Merge pull request #3346 from matrix-org/t3chguy/react16_4 
Migrate away from React.createClass for async-components. React 16 :D
 2019-08-26 19:44:57 +01:00
Jeff Huang cbb7d2df58 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1747 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-26 18:44:56 +00:00
Michael Telatynski bcbd603874
Merge pull request #3345 from matrix-org/t3chguy/react16_3 
Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D
 2019-08-26 19:44:51 +01:00
Travis Ralston abbc8ffef0 Adjust copy and include identity server changing when terms are pending 
Fixes https://github.com/vector-im/riot-web/issues/10636
Fixes https://github.com/vector-im/riot-web/issues/10635
 2019-08-26 11:26:21 -06:00
Bruno Windels 0273795f5d add transform step to composer to auto-replace emoticons with emoji 2019-08-26 16:16:27 +02:00
Bruno Windels 4fd4ad41c1 improve editor model documentation 2019-08-26 16:16:27 +02:00
Bruno Windels f8f0e77bde add transform step during editor model update 2019-08-26 16:16:27 +02:00
Bruno Windels 0e65f71a37 support incrementing/decrementing doc positions with predicate 2019-08-26 16:16:27 +02:00
Bruno Windels 10291bafe0 add support for selecting ranges in the editor model, and replacing them 
this to support finding emoticons and replacing them with an emoji
 2019-08-26 16:16:27 +02:00
Michael Telatynski d94e2179bf Migrate away from React.createClass for views/dialogs. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-24 11:59:46 +01:00
Michael Telatynski 360cef66c1 Migrate away from React.createClass for async-components. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-24 11:53:28 +01:00
Michael Telatynski accb0abe2d Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-24 11:47:07 +01:00
Weblate fbff7a6f42 Merge branch 'origin/develop' into Weblate. 2019-08-23 18:43:44 +00:00
Michael Telatynski e5d3198f53
Merge pull request #3339 from matrix-org/t3chguy/substitute_handle_global 
Iterate over all instances of variable/tag for _t substitutions
 2019-08-23 19:43:40 +01:00
Weblate 868000cc14 Merge branch 'origin/develop' into Weblate. 2019-08-23 18:15:23 +00:00
Travis Ralston f4ca91d4d3
Merge pull request #3344 from matrix-org/travis/fix-is-terms 
Treat 404 errors on IS as having no terms
 2019-08-23 12:15:19 -06:00
Travis Ralston e8b0c41157 minus ; 2019-08-23 12:01:47 -06:00
Travis Ralston e1552b61fc fix i18n 2019-08-23 12:01:13 -06:00
Travis Ralston c44ae2df4d Treat 404 errors on IS as having no terms 
Fixes https://github.com/vector-im/riot-web/issues/10634
 2019-08-23 11:58:04 -06:00