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

Commit Graph

  • 05c667b34b Merge pull request #4332 from vector-im/dbkr/fix_wierd_h2 David Baker 2017-06-16 11:48:31 +01:00
  • 2c186aafae Fix h2 in markdown being weird David Baker 2017-06-16 11:36:24 +01:00
  • 739a120cf0 Merge pull request #1108 from matrix-org/luke/fix-not-showing-next-room-on-reject David Baker 2017-06-16 11:34:10 +01:00
  • 82b2da7833 Correctly inspect state when rejecting invite Luke Barnard 2017-06-16 11:27:47 +01:00
  • 64b555dfe3 Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview David Baker 2017-06-16 11:21:03 +01:00
  • 807f01b57e Make sure to pass the roomAlias to the preview header if we have it Luke Barnard 2017-06-16 11:10:55 +01:00
  • 319cdd56e3 Translated using Weblate (Spanish) Enrique 2017-06-15 18:50:52 +00:00
  • 2477fddc07 Translated using Weblate (Korean) IMIN 2017-06-16 08:55:17 +00:00
  • 3bf7de8d47 Translated using Weblate (German) Bamstam 2017-06-15 18:36:15 +00:00
  • 5da8839ceb Translated using Weblate (Dutch) Silke 2017-06-15 20:00:25 +00:00
  • 34e40c36bd Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-16 09:42:20 +00:00
  • cb14b28eb1 Translated using Weblate (Ukrainian) strixaluco 2017-06-16 08:21:15 +00:00
  • 6be3aefe05 Translated using Weblate (Swedish) Max Sandholm 2017-06-15 16:47:48 +00:00
  • 512c059f4e Translated using Weblate (Spanish) Enrique 2017-06-15 19:02:06 +00:00
  • c57ff5933d Translated using Weblate (Korean) IMIN 2017-06-16 09:42:13 +00:00
  • a0be1706a9 Translated using Weblate (German) Bamstam 2017-06-15 18:44:54 +00:00
  • 3b23fc75ae Merge pull request #1106 from matrix-org/dbkr/reset_captcha_on_unmount David Baker 2017-06-16 10:36:28 +01:00
  • 2a01e638b7 Make sure captcha disappears when container does David Baker 2017-06-16 10:25:51 +01:00
  • 56eb71d19f Merge pull request #1105 from matrix-org/dbkr/fix_url_previews David Baker 2017-06-16 09:34:41 +01:00
  • af6392d7ca Fix URL previews David Baker 2017-06-15 22:57:41 +01:00
  • f0f721aa32 make hiding redactions use new pattern Michael Telatynski 2017-06-15 20:22:38 +01:00
  • cebb7182f0 try to make hiding events work with read markers Michael Telatynski 2017-06-15 20:17:59 +01:00
  • a097357baf Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part Michael Telatynski 2017-06-15 20:10:32 +01:00
  • c53fb08453 pass user settings from above Michael Telatynski 2017-06-15 20:02:17 +01:00
  • 4b34a2b169 modernize imports Michael Telatynski 2017-06-15 19:57:48 +01:00
  • a0a4fe62d5 make hide joins/parts work for MELS and highlighted/permalink event Michael Telatynski 2017-06-15 19:53:34 +01:00
  • f5b2a92e84 Give the login panel a bit longer to appear Richard van der Hoff 2017-06-15 18:17:00 +01:00
  • 7b526308fd Rearrange MatrixChat.render for sanity Richard van der Hoff 2017-06-15 17:36:57 +01:00
  • 90213ce72e MatrixChat: Replace state.{loading,loggedIn,loggingIn} with views Richard van der Hoff 2017-06-14 20:04:55 +01:00
  • 1fcd462660 Tweak tests to match updates to matrixchat Richard van der Hoff 2017-06-13 14:45:05 +01:00
  • 81d0388021 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-15 16:35:46 +00:00
  • 96e76ce42e Translated using Weblate (Ukrainian) strixaluco 2017-06-14 20:37:20 +00:00
  • accb4dc591 Translated using Weblate (Swedish) Max Sandholm 2017-06-15 16:35:28 +00:00
  • 12c2272fcd Translated using Weblate (Russian) Walter 2017-06-15 07:30:52 +00:00
  • dac9e511c9 Translated using Weblate (Korean) IMIN 2017-06-15 15:41:21 +00:00
  • 104cb7b999 v0.11.2-rc.1 v0.11.2-rc.1 David Baker 2017-06-15 17:21:01 +01:00
  • 5b43431bf0 Prepare changelog for v0.11.2-rc.1 David Baker 2017-06-15 17:21:00 +01:00
  • e045b35c86 v0.11.2-rc.1 David Baker 2017-06-15 17:20:22 +01:00
  • cb905e9be7 released js-sdk & react-sdk David Baker 2017-06-15 17:18:33 +01:00
  • 82436758b2 v0.9.5-rc.1 David Baker 2017-06-15 17:17:17 +01:00
  • 1f8566cbdb Prepare changelog for v0.9.5-rc.1 David Baker 2017-06-15 17:17:17 +01:00
  • 198d85a673 js-sdk 0.7.12-rc.1 David Baker 2017-06-15 17:15:26 +01:00
  • ce42a9a06f Replace MatrixChat.state.screen with 'view' Richard van der Hoff 2017-06-09 17:18:45 +01:00
  • 28753c451d Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-15 15:29:41 +00:00
  • 584e4c04da Merge pull request #4313 from vector-im/rav/deflakify_joining_test Richard van der Hoff 2017-06-15 16:29:37 +01:00
  • 854aed746a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-15 15:13:08 +00:00
  • a7a7ffd84b Merge pull request #4315 from vector-im/rav/test_rts_login Richard van der Hoff 2017-06-15 16:13:05 +01:00
  • 1f48b4caa6 Merge pull request #1098 from matrix-org/rav/test_rts_login Richard van der Hoff 2017-06-15 16:12:28 +01:00
  • a28af8bcc6 Extend timeouts in joining tests again Richard van der Hoff 2017-06-15 16:01:26 +01:00
  • 13efd62964 Merge pull request #1100 from matrix-org/luke/fix-show-spinner-on-accept-invite David Baker 2017-06-15 15:54:30 +01:00
  • 43f56483aa Merge branch 'develop' into rav/deflakify_joining_test Richard van der Hoff 2017-06-15 15:48:13 +01:00
  • f3d29b305e Translated using Weblate (Korean) IMIN 2017-06-15 14:39:14 +00:00
  • 9d74001f4f Show a spinner when accepting an invite and waitingForRoom Luke Barnard 2017-06-15 15:32:01 +01:00
  • ca736cfce8 fix test description Richard van der Hoff 2017-06-15 14:54:32 +01:00
  • 269a82c65f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-15 13:52:04 +00:00
  • 680a345ce7 Translated using Weblate (Ukrainian) Alexandr Kornienko 2017-06-15 09:28:58 +00:00
  • 3b6c0e0f67 Translated using Weblate (Korean) IMIN 2017-06-15 13:48:00 +00:00
  • 9de3c71a9b Translated using Weblate (Greek) Tom Tryfonidis 2017-06-15 09:33:35 +00:00
  • 2c8c26a16f Merge pull request #4314 from vector-im/rav/remove_onload_simulator Richard van der Hoff 2017-06-15 14:52:00 +01:00
  • c32b717723 Merge pull request #1099 from matrix-org/luke/fix-spinner-until-room-available David Baker 2017-06-15 14:34:16 +01:00
  • cc46fd34d7 Only stop peeking if at some point we were joined Luke Barnard 2017-06-15 14:21:23 +01:00
  • 8f9bf5f093 Merge branch 'develop' into erikj/group_server David Baker 2017-06-15 14:19:46 +01:00
  • 5c37d591b0 Unbreak auto joining Luke Barnard 2017-06-15 13:35:19 +01:00
  • fc7da536d6 Add forceUpdate for memberships !== join Luke Barnard 2017-06-15 13:32:56 +01:00
  • 30566beb43 Fix if-statement thinko Luke Barnard 2017-06-15 13:28:52 +01:00
  • d55d61e456 Remove redundant isUserJoined Luke Barnard 2017-06-15 12:37:01 +01:00
  • b90ceaa111 Display a spinner until new room object after join success Luke Barnard 2017-06-15 11:49:16 +01:00
  • 559f29d6be Added translation using Weblate (Korean) IMIN 2017-06-15 10:44:22 +00:00
  • 8f3c0d6233 Added translation using Weblate (Korean) IMIN 2017-06-15 10:43:19 +00:00
  • 2172dd5325 Translated using Weblate (Greek) Tom Tryfonidis 2017-06-15 09:39:52 +00:00
  • ca46314613 Translated using Weblate (Greek) Tom Tryfonidis 2017-06-15 09:32:23 +00:00
  • 4f5f32d75c Translated using Weblate (Ukrainian) strixaluco 2017-06-14 20:47:15 +00:00
  • 59d67a483b Added translation using Weblate (Bengali (India)) Olivier Nyssen 2017-06-15 08:57:35 +00:00
  • c5ae1dabe1 Translated using Weblate (Russian) GrigRUSS 2017-06-14 11:24:31 +00:00
  • 6709f922be Added translation using Weblate (Bengali (Bangladesh)) Olivier Nyssen 2017-06-15 04:10:16 +00:00
  • 98e694646c Add a test for the login flow when there is a teamserver Richard van der Hoff 2017-06-15 02:17:24 +01:00
  • 65f351ff22 Clear Lifecycle.RtsClient on MatrixChat.mount Richard van der Hoff 2017-06-15 02:15:13 +01:00
  • 9ff52b182f Allow fetch() to be stubbed for the RtsClient Richard van der Hoff 2017-06-15 01:50:56 +01:00
  • a05bafed6a Remove sarcastic comments Richard van der Hoff 2017-06-14 22:37:28 +01:00
  • 6f2eee1f03 Attempts to deflakify the joining test Richard van der Hoff 2017-06-14 16:07:40 +01:00
  • 9649f279a3 Added translation using Weblate (Hindi) Olivier Nyssen 2017-06-14 21:30:07 +00:00
  • 181ef8ab7e Added translation using Weblate (Indonesian) Olivier Nyssen 2017-06-14 21:29:40 +00:00
  • 5e4e12316b Added translation using Weblate (Ukrainian) strixaluco 2017-06-14 20:20:51 +00:00
  • 4ca009b9f7 Remove onload simulator from loading test Richard van der Hoff 2017-06-14 18:00:02 +01:00
  • 8840625045 Merge pull request #1097 from matrix-org/luke/attempt-fix-peeking-regression David Baker 2017-06-14 17:33:46 +01:00
  • 58554cce53 Remove racey condition Luke Barnard 2017-06-14 17:13:13 +01:00
  • fef525c2e5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-14 16:09:14 +00:00
  • 5ff59b0c23 Tests: delete indexeddbs after running Richard van der Hoff 2017-06-14 17:08:49 +01:00
  • 27d5704978 Improve logging in mock-request Richard van der Hoff 2017-06-14 16:06:39 +01:00
  • 9e3efb54d3 Merge pull request #1096 from matrix-org/dbkr/fix_warm_fuzzy_text_mk_2 Luke Barnard 2017-06-14 16:59:12 +01:00
  • 165b3dbdd3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-14 15:59:03 +00:00
  • 59da904353 Check that we don't register a guest account on /#/login (#4306) Richard van der Hoff 2017-06-14 16:59:00 +01:00
  • e9aac09105 Merge pull request #1092 from matrix-org/rav/no_resume_client_on_login Richard van der Hoff 2017-06-14 16:58:12 +01:00
  • ed5f01d46f Add logging for diagnosis Luke Barnard 2017-06-14 16:53:21 +01:00
  • b5fd78a97f Only attempt to peek once in the lifetime of RoomView Luke Barnard 2017-06-14 16:50:46 +01:00
  • 2d6ba056d1 Attempt to follow closely what RoomView did pre-ILAG Luke Barnard 2017-06-14 16:48:34 +01:00
  • 9ecf82a1f2 Show correct text in set email password dialog (2) David Baker 2017-06-14 16:06:28 +01:00
  • 449c65b784 Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set David Baker 2017-06-14 15:16:36 +01:00
  • 602255f92c Merge pull request #1094 from matrix-org/dbkr/enter_submits_changepassword David Baker 2017-06-14 15:16:11 +01:00
  • 1d4a3ae5a3 Give password confirmation correct title, description Luke Barnard 2017-06-14 14:58:39 +01:00