Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • efc5cf2889 Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE Richard van der Hoff 2017-06-21 21:49:41 +01:00
  • ebcf78c816 Merge pull request #1133 from matrix-org/rav/use_worker_to_clear_storage David Baker 2017-06-21 18:30:00 +01:00
  • e9ab667d29 Use the web worker when clearing js-sdk stores Richard van der Hoff 2017-06-21 17:43:34 +01:00
  • dcd0103acb Fix ability to invite users with caps in their user IDs Luke Barnard 2017-06-20 15:46:54 +01:00
  • 2db24f373c Fix another race with first-sync David Baker 2017-06-21 11:27:18 +01:00
  • a62f6d1094 Make the indexeddb worker script work again David Baker 2017-06-21 14:04:43 +01:00
  • a06eb5dfe1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-21 14:04:40 +00:00
  • 7d3f75ef87 Merge pull request #4355 from vector-im/t3chguy/electron/windows_icon_instability David Baker 2017-06-21 15:04:36 +01:00
  • 72e73c05ac Merge pull request #1127 from matrix-org/t3chguy/reset_favicon_on_logout David Baker 2017-06-21 14:58:26 +01:00
  • a7ca8ae4fb Merge pull request #1132 from matrix-org/dbkr/put_indexeddb_worker_back David Baker 2017-06-21 14:42:01 +01:00
  • 54ef2dd39b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-21 13:14:18 +00:00
  • b51101038f Translated using Weblate (Hungarian) Szimszon 2017-06-20 20:26:00 +00:00
  • 79ad89c673 Merge pull request #4373 from vector-im/luke/fix-pwd-nagbar-_t David Baker 2017-06-21 14:14:15 +01:00
  • e193fa5be5 Make the indexeddb worker script work again David Baker 2017-06-21 14:04:43 +01:00
  • 0fffd367c0 Added translation using Weblate (Italian) David Baker 2017-06-21 12:55:00 +00:00
  • a0de81a008 Added translation using Weblate (Belarusian) David Baker 2017-06-21 12:54:31 +00:00
  • 71b65078fc Added translation using Weblate (Norwegian Bokmål) David Baker 2017-06-21 12:50:18 +00:00
  • 7aabc7e352 Added translation using Weblate (Polish) David Baker 2017-06-21 12:48:48 +00:00
  • 57f97a58af Added translation using Weblate (Esperanto) David Baker 2017-06-21 12:48:18 +00:00
  • e43eacb1e5 Added translation using Weblate (Turkish) David Baker 2017-06-21 12:43:37 +00:00
  • e7dd6fa714 Translated using Weblate (Korean) IMIN 2017-06-21 11:49:53 +00:00
  • 879ca79c72 Merge pull request #1131 from matrix-org/dbkr/another_first_sync_race Richard van der Hoff 2017-06-21 11:46:19 +01:00
  • 9ef9d09d44 Fix another race with first-sync David Baker 2017-06-21 11:27:18 +01:00
  • a46a0c0949 Translated using Weblate (Ukrainian) strixaluco 2017-06-21 01:26:17 +00:00
  • a13b766bad Translated using Weblate (Ukrainian) Walter 2017-06-20 16:57:15 +00:00
  • 969c7c93d6 Translated using Weblate (Greek) Tom Tryfonidis 2017-06-20 20:22:08 +00:00
  • 7c3742682e Translated using Weblate (Greek) Tom Tryfonidis 2017-06-20 20:21:37 +00:00
  • a5fffe4afa fix ambiguity Michael Telatynski 2017-06-20 20:15:25 +01:00
  • aade0d557d Fix key url in readme Valentin Sundermann 2017-06-20 20:50:18 +02:00
  • 36d10e7bb6 move favicon reset stuff here where its more general Michael Telatynski 2017-06-20 18:47:35 +01:00
  • a2a26a9ac9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout Michael Telatynski 2017-06-20 18:43:50 +01:00
  • d441ba1fd0 Merge pull request #1129 from matrix-org/luke/fix-logout Matthew Hodgson 2017-06-20 18:43:33 +01:00
  • 7f6a252bcb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout Michael Telatynski 2017-06-20 18:39:59 +01:00
  • d1c97d8f9a Translated using Weblate (Hungarian) Szimszon 2017-06-20 17:13:14 +00:00
  • 0c43a46198 Translated using Weblate (Hungarian) Szimszon 2017-06-20 17:08:25 +00:00
  • 2cb2c44bd8 Remove unused logging Richard Lewis 2017-06-20 17:57:48 +01:00
  • 68473e118f Ensure that Scalar Messaging is started and stopped on component mount / unmount Richard Lewis 2017-06-20 17:56:45 +01:00
  • ae8ad6969a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-20 16:55:46 +00:00
  • 6d62bf0e25 Translated using Weblate (Ukrainian) Walter 2017-06-20 16:54:42 +00:00
  • 26a27a6de4 Merge pull request #4376 from vector-im/rav/test_log_cleanups Richard van der Hoff 2017-06-20 17:55:42 +01:00
  • 1cd152e5f7 Merge pull request #1130 from matrix-org/rav/log_fixes Richard van der Hoff 2017-06-20 17:55:07 +01:00
  • 51cfad5b9f Translated using Weblate (Russian) Walter 2017-06-20 16:46:38 +00:00
  • 4aea5908c5 Translated using Weblate (Russian) Walter 2017-06-20 16:42:47 +00:00
  • ca3399df77 Clean up some log outputs from the integ tests Richard van der Hoff 2017-06-20 17:41:21 +01:00
  • cd73139af5 Various logging cleanups Richard van der Hoff 2017-06-20 17:38:02 +01:00
  • 4fbe688f53 Translated using Weblate (German) Krombel 2017-06-20 16:19:59 +00:00
  • 3320df4cdd Don't allow UserSettings to render if !MatrixClientPeg.get() Luke Barnard 2017-06-20 17:11:17 +01:00
  • c4a3211cfc Use _tJsx for PasswordNagBar (because it has <u>) Luke Barnard 2017-06-20 16:28:40 +01:00
  • d9f662c06e Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-20 15:24:12 +00:00
  • abf21675d5 Add some more logging to the tests Richard van der Hoff 2017-06-20 15:35:01 +01:00
  • 8a17e3543a Translated using Weblate (Polish) marekjedrzejewski 2017-06-20 15:17:37 +00:00
  • b712a15a14 move in case it is racey ---- somehow? Michael Telatynski 2017-06-20 16:15:42 +01:00
  • c70ad2fa65 Translated using Weblate (German) Krombel 2017-06-20 15:15:04 +00:00
  • f7a22cccb6 Merge pull request #1128 from matrix-org/luke/fix-invite-user-id-case Luke Barnard 2017-06-20 16:03:49 +01:00
  • 8f8b28425d Fix json fail David Baker 2017-06-20 15:55:04 +01:00
  • 2c2091438e Fix ability to invite users with caps in their user IDs Luke Barnard 2017-06-20 15:46:54 +01:00
  • 04aed416d2 Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout Michael Telatynski 2017-06-20 15:37:05 +01:00
  • 5460b0f5b2 reset page subtitle on_logged_out Michael Telatynski 2017-06-20 15:31:12 +01:00
  • 029a882928 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-20 14:25:31 +00:00
  • 1b8e5f8a05 Translated using Weblate (Hungarian) Szimszon 2017-06-20 14:21:32 +00:00
  • 5efee2d1bf Translated using Weblate (French) Brendan Abolivier 2017-06-20 14:14:02 +00:00
  • 8a0000675a Translated using Weblate (Dutch) Nathan van Beelen 2017-06-20 09:07:31 +00:00
  • 6b5bfe24e6 Merge pull request #4367 from vector-im/luke/redesign-user-settings-pwd-warn Luke Barnard 2017-06-20 15:24:07 +01:00
  • a547e9c200 Merge pull request #1126 from matrix-org/luke/redesign-user-settings-pwd-warn Luke Barnard 2017-06-20 15:23:47 +01:00
  • ae23664a41 Merge branch 'develop' into luke/redesign-user-settings-pwd-warn Luke Barnard 2017-06-20 15:03:10 +01:00
  • c337485d90 Redesign the warning to be red text, move below "Sign out" Luke Barnard 2017-06-20 15:01:53 +01:00
  • bbbb82351f CSS for redeisng of password warning Luke Barnard 2017-06-20 14:33:34 +01:00
  • 67a9b6502b Merge branch 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff Michael Telatynski 2017-06-20 14:33:09 +01:00
  • fe1b0b5cd8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff Michael Telatynski 2017-06-20 14:32:19 +01:00
  • 8dade0d84e Merge pull request #4366 from vector-im/luke/feature-user-settings-password-warning David Baker 2017-06-20 14:31:12 +01:00
  • 499b1c2e70 add missing semicolon Michael Telatynski 2017-06-20 14:05:17 +01:00
  • 6de48d628f Merge pull request #1123 from matrix-org/luke/feature-user-settings-password-warning David Baker 2017-06-20 14:02:20 +01:00
  • a2dc17256a Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff David Baker 2017-06-20 13:44:27 +01:00
  • 4f9c1fe199 Merge branch 'develop' into luke/feature-user-settings-password-warning Luke Barnard 2017-06-20 13:40:34 +01:00
  • c0e12798b6 Merge pull request #1118 from matrix-org/luke/fix-email-cancel-button-text David Baker 2017-06-20 13:36:51 +01:00
  • 047b255e14 Add en_EN translations Luke Barnard 2017-06-20 13:33:38 +01:00
  • 5b6daba182 Add en_EN translations Luke Barnard 2017-06-20 13:33:18 +01:00
  • f15292becf Merge branch 'develop' into luke/fix-email-cancel-button-text Luke Barnard 2017-06-20 13:30:34 +01:00
  • 0c431887b0 Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests Richard van der Hoff 2017-06-20 13:20:58 +01:00
  • 3926e4dd98 Merge branch 'master' into develop David Baker 2017-06-20 13:18:58 +01:00
  • 639b17c663 v0.11.3 v0.11.3 David Baker 2017-06-20 13:15:36 +01:00
  • ea8a49f1b7 Prepare changelog for v0.11.3 David Baker 2017-06-20 13:15:35 +01:00
  • eda3f20b26 v0.11.3 David Baker 2017-06-20 13:13:28 +01:00
  • 6ef32f182a react-sdk 0.9.6 David Baker 2017-06-20 13:13:03 +01:00
  • 6bae293bdf Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2017-06-20 10:19:34 +01:00
  • e469fbc303 Merge branch 'master' into develop David Baker 2017-06-20 13:10:42 +01:00
  • 529e014739 v0.9.6 David Baker 2017-06-20 13:08:06 +01:00
  • 3f5a6236bb Prepare changelog for v0.9.6 David Baker 2017-06-20 13:08:05 +01:00
  • 61c5384855 Fix another infinite spin on register David Baker 2017-06-20 12:03:37 +01:00
  • a7775b283b Merge pull request #1124 from matrix-org/dbkr/fix_register_infinite_spin David Baker 2017-06-20 12:52:02 +01:00
  • e15aedfeb2 Fix another infinite spin on register David Baker 2017-06-20 12:03:37 +01:00
  • d5d29c1c92 Give _t to PasswordNagBar, add CSS for UserSettings password warning Luke Barnard 2017-06-20 11:23:34 +01:00
  • e16d1b3cfb Implement password nag warning in user settings account section Luke Barnard 2017-06-20 11:22:07 +01:00
  • a449588c1c Replace add app dialog with scalar interface Richard Lewis 2017-06-20 10:54:41 +01:00
  • 0e71918ba1 Merge pull request #1119 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2017-06-20 10:05:50 +01:00
  • 556ff24c5f Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2017-06-20 10:19:34 +01:00
  • a05ee01f28 Merge pull request #1119 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2017-06-20 10:05:50 +01:00
  • f5d9af9b0b Translated using Weblate (Ukrainian) strixaluco 2017-06-20 01:34:05 +00:00
  • 3ff0ed52b2 Translated using Weblate (Russian) GrigRUSS 2017-06-19 17:28:59 +00:00
  • dcc9443918 Translated using Weblate (Korean) IMIN 2017-06-20 08:56:41 +00:00