Commit Graph

  • 9636bc5a33 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-12 12:48:47 +00:00
  • 36a396247a Translated using Weblate (Finnish) Tuomas Hietala 2019-08-12 11:18:20 +00:00
  • 76f5977a2a Merge pull request #3299 from matrix-org/t3chguy/fix_registrationForm_defaultValue_Field Michael Telatynski 2019-08-12 13:48:42 +01:00
  • bc088e4472 add comment David Baker 2019-08-12 13:31:31 +01:00
  • 10b19622db Don't clear field on failure David Baker 2019-08-12 13:29:52 +01:00
  • bc66545fd0 shorten url by default David Baker 2019-08-12 13:11:05 +01:00
  • 06905bc5bb Actually appease linter David Baker 2019-08-12 12:05:25 +01:00
  • bf9caa7fd8 add the rest of the files David Baker 2019-08-12 11:51:44 +01:00
  • 1067457d63 rerun i18n David Baker 2019-08-12 11:51:08 +01:00
  • 417d9b6af8 nicer way to appease linter David Baker 2019-08-12 11:50:11 +01:00
  • 66e6ed2d17 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-11 03:56:36 +00:00
  • e346c17006 Translated using Weblate (Albanian) Besnik Bleta 2019-08-10 10:27:59 +00:00
  • 916af736ad Consolidate Themes into ThemeController. Remove hardcoded themes in view Michael Telatynski 2019-08-11 03:43:34 +01:00
  • 3e08bf6ecb Deduplicate code in ModularServerConfig by extending ServerConfig Michael Telatynski 2019-08-11 03:34:12 +01:00
  • d2c7a5a979 Also check that the client even exists Travis Ralston 2019-08-10 14:59:13 -06:00
  • 58ccc7eb0c Don't fetch widgets unless logged in Travis Ralston 2019-08-09 18:01:08 -06:00
  • 74ce5c3541 Read integration managers from account data Travis Ralston 2019-08-09 17:35:59 -06:00
  • 4c82d16e34 Merge branch 'travis/integs/base' into travis/integs/widgets Travis Ralston 2019-08-09 17:20:51 -06:00
  • 3a4c6f3eac Appease the linter again Travis Ralston 2019-08-09 17:20:37 -06:00
  • d347ab08e7 Merge branches 'develop' and 't3chguy/react16' of github.com:vector-im/riot-web into t3chguy/react16 Michael Telatynski 2019-08-10 00:20:30 +01:00
  • 018b4f5d41 Use the default integration manager for config options Travis Ralston 2019-08-09 17:08:26 -06:00
  • 5a15e78fe4 Appease the linter Travis Ralston 2019-08-09 16:14:36 -06:00
  • ffa49df889 Refactor integration manager handling into a common place Travis Ralston 2019-08-09 16:05:05 -06:00
  • 4075cdde7f lint David Baker 2019-08-09 18:59:57 +01:00
  • 18dbccb062 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-09 17:16:44 +00:00
  • 75bcd61934 Merge pull request #3298 from matrix-org/t3chguy/Modal.createX_promise Michael Telatynski 2019-08-09 18:16:40 +01:00
  • 242f23c753 RegistrationForm: the Fields are controlled, fix default values Michael Telatynski 2019-08-09 18:08:17 +01:00
  • c76514fceb Add UI in settings to change ID Server David Baker 2019-08-09 18:07:58 +01:00
  • 49c7730503 change Modal async/await signature to use raw promises Michael Telatynski 2019-08-09 17:29:22 +01:00
  • f5480a2e99 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-09 16:16:25 +00:00
  • a9afdec24a Merge pull request #3297 from matrix-org/t3chguy/Modal.createX_promise Michael Telatynski 2019-08-09 17:16:21 +01:00
  • a5ed7b992f Merge branch 'origin/develop' into Weblate. Weblate 2019-08-09 16:02:56 +00:00
  • 906045b215 Merge pull request #10530 from vector-im/t3chguy/electron_help Michael Telatynski 2019-08-09 17:02:51 +01:00
  • f520957051 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-09 15:55:12 +00:00
  • 13c7149592 Merge pull request #3294 from matrix-org/t3chguy/mount-guard Michael Telatynski 2019-08-09 16:55:08 +01:00
  • d629f9a177 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-09 15:54:56 +00:00
  • cc0b698c92 Merge pull request #3296 from matrix-org/t3chguy/remove_legacyLoginParams Michael Telatynski 2019-08-09 16:54:51 +01:00
  • 7fe078c07a Modal.createX return thenable which extends onFinished, for async/await Michael Telatynski 2019-08-09 16:47:22 +01:00
  • 930e7b15b9 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-09 14:39:04 +00:00
  • 0050ed7e73 Translated using Weblate (French) Kévin C 2019-08-09 07:30:35 +00:00
  • d297018d9a Merge pull request #3295 from matrix-org/dbkr/debounce_field David Baker 2019-08-09 15:38:58 +01:00
  • 787e9feeff Get rid of support for legacy login params Michael Telatynski 2019-08-09 15:34:03 +01:00
  • fcdbce1dda Change throttle to debounce David Baker 2019-08-09 15:30:05 +01:00
  • 72a83a8e6e Add mount-guards to MImageBody Michael Telatynski 2019-08-09 14:51:07 +01:00
  • 12f087401b Add --help to electron app Michael Telatynski 2019-08-09 12:08:56 +01:00
  • ee3542453e Fix RoomAvatarEvent historic fallback Michael Telatynski 2019-08-09 11:31:04 +01:00
  • 8be1066b2f Merge branch 'origin/develop' into Weblate. Weblate 2019-08-08 23:31:43 +00:00
  • 78744b8bcf Merge pull request #3293 from matrix-org/travis/fix-karma Travis Ralston 2019-08-08 17:31:39 -06:00
  • ac9682a75b Actually use argument in karma tests Travis Ralston 2019-08-08 15:59:49 -06:00
  • a6347af320 Fix karma complaining about woff2 files Travis Ralston 2019-08-08 15:59:35 -06:00
  • 12074a15a8 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-08 19:30:42 +00:00
  • feb62793d2 Revert "Upgrade to babel@7 and support TypeScript" Travis Ralston 2019-08-08 13:30:11 -06:00
  • 04419ba24b Merge branch 'origin/develop' into Weblate. Weblate 2019-08-08 19:30:22 +00:00
  • 7b89893645 Upgrade to babel@7 and support TypeScript Travis Ralston 2019-08-08 13:30:11 -06:00
  • 423a74c99c Clean up implementation Michael Telatynski 2019-08-08 20:21:53 +01:00
  • 28b42d512a Use the room name rather than sender name for fallback room avatar event Michael Telatynski 2019-08-08 20:07:38 +01:00
  • 0b8ee2d196 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-08 16:48:55 +00:00
  • 3214ed8829 Merge pull request #3289 from matrix-org/jryans/rm-bind-at-reg J. Ryan Stinnett 2019-08-08 17:48:50 +01:00
  • 8a36973695 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-08 16:48:23 +00:00
  • c2f81a00c4 Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-3pid J. Ryan Stinnett 2019-08-08 17:48:17 +01:00
  • d92f8e6d34 fix indentation Michael Telatynski 2019-08-08 16:47:16 +01:00
  • 22ee809922 Add way to report the content of a message Michael Telatynski 2019-08-08 16:39:15 +01:00
  • 38e64ce966 Remove 3PID binding during registration J. Ryan Stinnett 2019-08-08 15:52:54 +01:00
  • 250f0d9dda Merge branch 'origin/develop' into Weblate. Weblate 2019-08-08 15:01:53 +00:00
  • c2effe47c4 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-08-08 13:34:14 +00:00
  • e0fb0de83d Relock gemini-scrollbar deps J. Ryan Stinnett 2019-08-08 16:01:41 +01:00
  • 5fbb95c2a4 Merge branch 'origin/develop' into Weblate. Weblate 2019-08-08 13:26:21 +00:00
  • 07d6fa7fdb Merge pull request #3286 from matrix-org/travis/immutable-dms/basic Travis Ralston 2019-08-08 07:26:17 -06:00
  • 11cf7493d9 Disable binding 3PIDs when adding to account J. Ryan Stinnett 2019-08-08 11:52:21 +01:00
  • 178d6605c4 Add controls for toggling discovery in user settings J. Ryan Stinnett 2019-08-08 11:35:35 +01:00
  • 6dea2519ae Merge branch 'origin/develop' into Weblate. Weblate 2019-08-08 08:48:49 +00:00
  • 54ca7b708e Merge pull request #3285 from matrix-org/dbkr/work_without_is David Baker 2019-08-08 09:48:44 +01:00
  • f85898cdca Remove ChatCreateOrReuseDialog Travis Ralston 2019-08-07 12:15:11 -06:00
  • 24705d02b7 Replace DM logic in view_start_chat_or_reuse Travis Ralston 2019-08-07 12:13:59 -06:00
  • 3144b9f1a2 Disable 'Start New Chat' button in MemberInfo if we already have chats Travis Ralston 2019-08-07 12:06:27 -06:00
  • 2ecabd2195 Reuse direct chats when starting new ones Travis Ralston 2019-08-07 12:01:51 -06:00
  • 35d2aac269 Translated using Weblate (West Flemish) Nathan Follens 2019-08-05 19:23:24 +00:00
  • e163df17e2 Translated using Weblate (Russian) Walter 2019-08-06 07:24:47 +00:00
  • 06649d6d54 Translated using Weblate (French) Kévin C 2019-08-06 06:41:04 +00:00
  • 4aaf67d514 Translated using Weblate (Esperanto) Tirifto 2019-08-05 18:51:57 +00:00
  • d7fff4db8c Translated using Weblate (Dutch) Nathan Follens 2019-08-05 18:58:48 +00:00
  • f7cc8d638e Translated using Weblate (Bulgarian) Slavi Pantaleev 2019-08-05 19:07:16 +00:00
  • c09f86f347 re-run i18n David Baker 2019-08-07 13:37:24 +01:00
  • 9fa5e01f2f Disable password reset if no ID server David Baker 2019-08-07 13:30:52 +01:00
  • d31f1ea7f2 Disable addign threepids if no IS configured David Baker 2019-08-07 11:51:42 +01:00
  • bcf53c6e33 Make invite work without an IS David Baker 2019-08-07 11:41:00 +01:00
  • 366f7e277a Make registration work without an IS. David Baker 2019-08-07 11:15:56 +01:00
  • 66ef08120e Merge pull request #3282 from matrix-org/bwindels/extract-common-editor-code Bruno Windels 2019-08-07 07:58:52 +00:00
  • 610baff09a Merge pull request #2668 from azuenko/develop Travis Ralston 2019-08-06 13:54:04 -06:00
  • f6dbeef204 Merge pull request #3257 from matrix-org/t3chguy/slashcommands_help Michael Telatynski 2019-08-06 18:50:49 +01:00
  • 5e76019b63 fix i18n Michael Telatynski 2019-08-06 18:35:33 +01:00
  • 6d7c4c4dd4 fix VectorCustomServerDialog props Michael Telatynski 2019-08-06 18:30:08 +01:00
  • da9f1d1fa3 discard create-react-class, no point using it here. use React.FC Michael Telatynski 2019-08-06 18:22:11 +01:00
  • 76606256a2 Merge pull request #10503 from vector-im/t3chguy/electron_keep_alt_menu Michael Telatynski 2019-08-06 18:20:24 +01:00
  • c022f58f3b Merge pull request #3278 from matrix-org/t3chguy/electron_keep_alt_menu Michael Telatynski 2019-08-06 18:20:22 +01:00
  • daf1a794e6 Merge pull request #3276 from matrix-org/t3chguy/react16_1 Michael Telatynski 2019-08-06 18:09:30 +01:00
  • 1e8b304b3c Remove /tint completely and dedup copyright Michael Telatynski 2019-08-06 18:08:17 +01:00
  • 5d048972ab delint Michael Telatynski 2019-08-06 18:06:47 +01:00
  • ae834f8d05 Split out SlashCommandHelpDialog, group by category and style it Michael Telatynski 2019-08-06 18:03:38 +01:00
  • 64afaa1df5 Merge pull request #3284 from matrix-org/t3chguy/invite_hide_settings_context_button Michael Telatynski 2019-08-06 17:18:56 +01:00