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

Commit Graph

  • 57ef6f3cf8 Make enter submit change password form David Baker 2017-06-14 14:50:48 +01:00
  • aba0d45db5 Merge pull request #1086 from matrix-org/rob/apps Robert Swain 2017-06-14 15:21:24 +02:00
  • 302233db90 Merge pull request #1093 from matrix-org/luke/undefined-room-alias-if-not-specified-view-room David Baker 2017-06-14 14:17:06 +01:00
  • edb11d805e AppsDrawer: Open add app widget if opening empty drawer Robert Swain 2017-06-14 15:05:29 +02:00
  • 5f020423bc AddAppDialog: Put the submit button inside the form Robert Swain 2017-06-14 15:05:11 +02:00
  • 2d3c886646 AppsDrawer: Generate room alias for vrdemo Robert Swain 2017-06-14 13:27:15 +02:00
  • 9c8ab2691b AppsDrawer: Only append queryParams once Robert Swain 2017-06-14 13:26:43 +02:00
  • 880e7149f3 ModularWidgets: Add a quick VR demo widget Robert Swain 2017-06-14 13:05:43 +02:00
  • f25c081007 When not specified, remove roomAlias state in RoomViewStore Luke Barnard 2017-06-14 12:05:25 +01:00
  • a2322853a1 Translated using Weblate (Russian) GrigRUSS 2017-06-14 10:46:50 +00:00
  • c01df23040 Translated using Weblate (Russian) GrigRUSS 2017-06-14 10:43:54 +00:00
  • d22e99345f Merge branch 'master' into develop David Baker 2017-06-14 11:24:53 +01:00
  • 4edd21ba8a v0.11.1 v0.11.1 David Baker 2017-06-14 11:21:27 +01:00
  • 90cff5d7bf Prepare changelog for v0.11.1 David Baker 2017-06-14 11:21:27 +01:00
  • 9325eef650 v0.11.1 David Baker 2017-06-14 11:20:05 +01:00
  • 7983f9af87 Translated using Weblate (Greek) Tom Tryfonidis 2017-06-14 10:19:45 +00:00
  • f9795232e0 react-sdk 0.9.4 David Baker 2017-06-14 11:19:43 +01:00
  • 74a74bc75d Merge branch 'master' into develop David Baker 2017-06-14 11:18:56 +01:00
  • b916bc97b1 Translated using Weblate (German) Krombel 2017-06-14 10:16:19 +00:00
  • a5aa497287 v0.9.4 David Baker 2017-06-14 11:17:00 +01:00
  • 1b41401ed6 Prepare changelog for v0.9.4 David Baker 2017-06-14 11:17:00 +01:00
  • 5d649626b0 Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login Richard van der Hoff 2017-06-14 11:08:16 +01:00
  • 498ea53995 Don't create a guest login if user went to /login Richard van der Hoff 2017-06-14 10:53:48 +01:00
  • 5c426746b4 Merge pull request #1091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2017-06-14 10:55:24 +01:00
  • c3ef2f86d6 Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2017-06-14 10:55:42 +01:00
  • 11c04abaeb Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2017-06-14 10:55:42 +01:00
  • 2a51aec193 Merge pull request #1091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2017-06-14 10:55:24 +01:00
  • 57dfbc4701 Remove unused imports Luke Barnard 2017-06-14 10:53:02 +01:00
  • 040f28463d Merge pull request #1045 from ollieh/issues/4009 Luke Barnard 2017-06-14 10:40:02 +01:00
  • 5d93c675e1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-14 09:34:58 +00:00
  • 452e35caa1 Translated using Weblate (French) Brendan Abolivier 2017-06-14 09:20:17 +00:00
  • d7fb0093e4 Merge pull request #4292 from vector-im/rav/clear_storage_on_login Richard van der Hoff 2017-06-14 10:34:55 +01:00
  • 9e70884415 Merge pull request #1085 from matrix-org/rav/clear_storage_on_login Richard van der Hoff 2017-06-14 10:34:26 +01:00
  • d5a6ba225a DM guessing: prefer oldest joined member David Baker 2017-06-13 17:35:09 +01:00
  • b4e216ba23 Merge pull request #1087 from matrix-org/dbkr/dm_guess_oldest_joined David Baker 2017-06-14 10:30:46 +01:00
  • 755005b1c6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-14 09:30:04 +00:00
  • 58a323b391 i18n for setting email after password flow Luke Barnard 2017-06-13 18:31:35 +01:00
  • 79c2977f13 Trailing comma Luke Barnard 2017-06-13 18:34:33 +01:00
  • df43c521f3 i18n for setting password flow Luke Barnard 2017-06-13 18:28:43 +01:00
  • 9495d5b631 Translated using Weblate (French) Brendan Abolivier 2017-06-14 09:14:54 +00:00
  • 01e71163da Ask for email address after setting password for the first time Luke Barnard 2017-06-14 09:31:16 +01:00
  • cd8dc5f178 Ask for email address after setting password for the first time Luke Barnard 2017-06-14 09:30:08 +01:00
  • ea9aae3902 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-14 08:57:24 +00:00
  • 23c6ccc536 Translated using Weblate (French) AmandineLP 2017-06-13 23:10:54 +00:00
  • fa9ae945ed Translated using Weblate (Esperanto) Paul Evans 2017-06-13 21:52:40 +00:00
  • 9d42a81709 Merge pull request #4301 from vector-im/luke/set-email-after-password-2 David Baker 2017-06-14 09:57:21 +01:00
  • 0566e5d992 Merge pull request #1090 from matrix-org/luke/set-email-after-password-2 David Baker 2017-06-14 09:57:07 +01:00
  • 46d0e8da96 Translated using Weblate (Greek) Tom Tryfonidis 2017-06-14 08:40:53 +00:00
  • 7ba2d19249 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-14 08:32:39 +00:00
  • 84d89ba519 Translated using Weblate (Russian) Walter 2017-06-13 19:33:38 +00:00
  • 10a4d128c6 Translated using Weblate (German) Bamstam 2017-06-13 19:50:36 +00:00
  • 7756f83c66 Translated using Weblate (Dutch) Justin 2017-06-13 21:58:53 +00:00
  • 4344af58ee Ask for email address after setting password for the first time Luke Barnard 2017-06-14 09:31:16 +01:00
  • 4f55f810af Ask for email address after setting password for the first time Luke Barnard 2017-06-14 09:30:08 +01:00
  • 138555759d Translated using Weblate (French) AmandineLP 2017-06-13 23:06:29 +00:00
  • 6eab420257 Translated using Weblate (French) AmandineLP 2017-06-13 22:18:31 +00:00
  • 71941f4f92 Translated using Weblate (Dutch) Justin 2017-06-13 21:53:36 +00:00
  • fbe5dfce4d Translated using Weblate (German) Krombel 2017-06-13 18:00:18 +00:00
  • acd7cf4439 Merge pull request #1089 from matrix-org/luke/set-email-after-password David Baker 2017-06-13 18:38:39 +01:00
  • a24acaee54 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-13 17:38:24 +00:00
  • 7e272f95ff Translated using Weblate (German) Bamstam 2017-06-13 16:06:09 +00:00
  • 5a9d8b0624 Translated using Weblate (French) Jean 2017-06-13 13:55:43 +00:00
  • 7af2a6c3a6 Merge pull request #4299 from vector-im/luke/set-email-after-password David Baker 2017-06-13 18:38:21 +01:00
  • 31b3b4687a Trailing comma Luke Barnard 2017-06-13 18:34:33 +01:00
  • c8416b0321 i18n for setting email after password flow Luke Barnard 2017-06-13 18:31:35 +01:00
  • aa0ef51932 i18n for setting password flow Luke Barnard 2017-06-13 18:28:43 +01:00
  • 9dad5d0132 Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings Matthew Hodgson 2017-06-13 17:45:56 +01:00
  • f4aadafed9 remove mx_filterFlipColor from verified e2e icon so its not purple :/ Michael Telatynski 2017-06-13 17:39:20 +01:00
  • 5fd45233fb DM guessing: prefer oldest joined member David Baker 2017-06-13 17:35:09 +01:00
  • d67e7289e8 Merge branch 'develop' into rob/apps Robert Swain 2017-06-13 15:50:43 +02:00
  • 03ba3bd431 Merge branch 'rxl881/apps' into rob/apps Robert Swain 2017-06-13 15:41:52 +02:00
  • 91eabbba60 MessageComposer: Trigger Jitsi app from call buttons Robert Swain 2017-06-13 15:35:13 +02:00
  • 5d898dd098 AuxPanel: Add type checking for userId and showApps properties Robert Swain 2017-06-13 15:34:05 +02:00
  • b63edcb390 AppTile: Support deletion of apps from room state Robert Swain 2017-06-13 15:33:17 +02:00
  • bcb2f8408b AppTile: Fix typo in property name Robert Swain 2017-06-13 15:32:40 +02:00
  • 2aa0aa61e3 AddAppDialog: Support adding apps to room state Robert Swain 2017-06-13 15:31:37 +02:00
  • a72cb794f2 AppsDrawer: Populate apps from room state Robert Swain 2017-06-13 15:28:37 +02:00
  • e2759774fc RoomView: Correctly pass userId from matrix client Robert Swain 2017-06-13 15:19:38 +02:00
  • 99b1de7f0e RoomView: Display AppsDrawer if apps in room state Robert Swain 2017-06-13 15:19:06 +02:00
  • 918efe5912 width and height must be int otherwise synapse cries Michael Telatynski 2017-06-13 12:18:48 +01:00
  • bd00c1d4b1 Merge pull request #1083 from matrix-org/t3chguy/width_height_int David Baker 2017-06-13 13:23:12 +01:00
  • 392cd7861d Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener Richard van der Hoff 2017-06-13 13:10:49 +01:00
  • 27b8568fc0 Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2017-06-13 10:52:06 +01:00
  • dfd9f7c27b New icons for riot-ios & riot-translations David Baker 2017-06-13 10:06:10 +01:00
  • 431b482d18 Don't put in spurious newline David Baker 2017-06-13 11:54:28 +01:00
  • aab87233c3 Add script to copy translations between files David Baker 2017-06-13 11:39:37 +01:00
  • 24f1bd1460 Merge new translations David Baker 2017-06-13 10:37:45 +01:00
  • 33f5d81d18 Only process user_directory response if it's for the current query Luke Barnard 2017-06-13 11:03:22 +01:00
  • 35620311b3 Fix regressions with starting a 1-1. Luke Barnard 2017-06-13 10:15:29 +01:00
  • aa07266f12 Test that we handle stored mx_last_room_id correctly Richard van der Hoff 2017-06-13 12:52:35 +01:00
  • 68e1a7be74 Clear persistent storage on login and logout Richard van der Hoff 2017-05-31 17:28:46 +01:00
  • 2e07a0fa12 Merge pull request #1082 from matrix-org/dbkr/copy_translations David Baker 2017-06-13 12:49:47 +01:00
  • 939f6d0798 Factor createMatrixClient out from MatrixClientPeg Richard van der Hoff 2017-06-13 12:46:49 +01:00
  • 1ea9ed5d8c remove RoomViewStore listener from MatrixChat on unmount Richard van der Hoff 2017-06-13 09:45:07 +01:00
  • ad7c835471 width and height must be int otherwise synapse cries Michael Telatynski 2017-06-13 12:18:48 +01:00
  • 70fd9b0283 Translated using Weblate (German) Krombel 2017-06-13 11:01:17 +00:00
  • 4eb7419335 Don't put in spurious newline David Baker 2017-06-13 11:54:28 +01:00
  • e2f2d34698 Translated using Weblate (Greek) Tom Tryfonidis 2017-06-13 10:45:15 +00:00
  • a6cdab8107 Translated using Weblate (Greek) Tom Tryfonidis 2017-06-13 10:44:25 +00:00
  • 876899948f Merge in upstream changes Richard Lewis 2017-06-13 11:44:23 +01:00