Commit Graph

  • 0958689d25 Merge pull request #1398 from matrix-org/luke/fix-ugly-manage-integs-button David Baker 2017-09-18 13:42:11 +01:00
  • caaf5cca14 Only show the integ management button if user is joined Luke Barnard 2017-09-18 13:34:33 +01:00
  • 51069a370e Translated using Weblate (German) Krombel 2017-09-18 11:45:47 +00:00
  • 00976d9338 i18n new DevTools strings Michael Telatynski 2017-09-18 12:04:11 +01:00
  • dccee6d419 add ability to filter room state types/results Michael Telatynski 2017-09-18 12:03:11 +01:00
  • af450df513 add ability to jump from RSE to Send Custom State Event prefilled Michael Telatynski 2017-09-18 11:27:31 +01:00
  • 821ab6c13e switch to controlled inputs and require eventType !== '' Michael Telatynski 2017-09-18 11:06:46 +01:00
  • add9f69497 Translated using Weblate (Finnish) Stefan Parviainen 2017-09-18 07:29:33 +00:00
  • cca7b239ee Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-09-18 01:12:44 +00:00
  • 1639e64328 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-09-18 01:10:23 +00:00
  • 09e6ea00c5 Merge pull request #1273 from matrix-org/t3chguy/hide_chevron_memberlist_3pid_notarget Matthew Hodgson 2017-09-17 23:19:35 +01:00
  • 678a6c56b4 Merge pull request #1268 from matrix-org/t3chguy/devtools Matthew Hodgson 2017-09-17 23:16:04 +01:00
  • 5ad860f186 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-17 22:15:32 +00:00
  • 828e9d5eb4 Merge pull request #4735 from vector-im/t3chguy/devtools Matthew Hodgson 2017-09-17 23:15:28 +01:00
  • b93f1746c0 Merge pull request #1359 from rponline/master Matthew Hodgson 2017-09-17 23:06:06 +01:00
  • aa6e68776c Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-17 21:38:35 +00:00
  • c8ced6e360 Translated using Weblate (Italian) ErCiccione 2017-09-17 15:42:56 +00:00
  • 193b69246a Translated using Weblate (Czech) Jan Kudrik 2017-09-16 15:43:16 +00:00
  • 662431043e Merge pull request #5042 from turt2live/travis/ignored_users Matthew Hodgson 2017-09-17 22:38:31 +01:00
  • 141ae916ce Merge pull request #1387 from turt2live/travis/tooltip_redacter Matthew Hodgson 2017-09-17 22:36:18 +01:00
  • b06d540f4c Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded Matthew Hodgson 2017-09-17 22:09:44 +01:00
  • 6a53b7b149 Merge pull request #1389 from turt2live/travis/ignored_users Matthew Hodgson 2017-09-17 22:05:02 +01:00
  • 2605004edb Update ignored users when js-sdk on UserSettings on change Travis Ralston 2017-09-17 15:04:03 -06:00
  • 9e77d1b763 tweak comment Matthew Hodgson 2017-09-17 21:50:24 +01:00
  • bc565ba925 Merge pull request #1392 from turt2live/travis/no_emoji Matthew Hodgson 2017-09-17 21:40:43 +01:00
  • 3903f5a413 Translated using Weblate (Italian) ErCiccione 2017-09-17 15:45:49 +00:00
  • 93f404081b Translated using Weblate (Czech) Jan Kudrik 2017-09-17 16:48:24 +00:00
  • 9449813238 Merge pull request #1397 from matrix-org/t3chguy/i18n-1 Matthew Hodgson 2017-09-17 21:39:56 +01:00
  • b9d7789d71 Translated using Weblate (Italian) Michael Telatynski 2017-09-12 10:50:38 +00:00
  • 2d6bbafccd remove unused strings since base branch Michael Telatynski 2017-09-17 13:44:16 +01:00
  • e565882ba2 add missing comma Michael Telatynski 2017-09-17 13:40:18 +01:00
  • 342e10214b PL grew the missing string since my base branch so do for that too Michael Telatynski 2017-09-17 13:39:27 +01:00
  • 63ccc45551 Merge branches 'develop' and 't3chguy/i18n-1' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n-1 Michael Telatynski 2017-09-17 13:33:34 +01:00
  • bc4bb6cc48 remove redundant new line Michael Telatynski 2017-09-17 13:29:05 +01:00
  • ce2cdf3fa1 sanitize the i18n for fn:textForHistoryVisibilityEvent Michael Telatynski 2017-09-17 13:28:17 +01:00
  • ffda532695 Translated using Weblate (Dutch) Silke 2017-09-16 07:54:58 +00:00
  • 5bf8c1e95f Merge pull request #1394 from matrix-org/dbkr/emoji_more_fast_path Matthew Hodgson 2017-09-16 00:40:16 +01:00
  • 13bfa5d59c Merge pull request #1393 from matrix-org/dbkr/fix_symbol_emojification Matthew Hodgson 2017-09-16 00:38:44 +01:00
  • 7f746ce2c6 Merge pull request #5044 from turt2live/travis/home_page_identity_room Matthew Hodgson 2017-09-15 16:37:38 +01:00
  • 59ee401f9c Force rebuild again with new riot-web branch David Baker 2017-09-15 15:59:01 +01:00
  • 30efd02d22 Fix test for new behaviour of 'joining' flag David Baker 2017-09-15 15:57:37 +01:00
  • 6e06b3a28b empty commit to force travis retest David Baker 2017-09-15 15:38:01 +01:00
  • c265ec9571 Fix RoomView stuck in 'accept invite' state David Baker 2017-09-15 15:07:09 +01:00
  • b2e1a2956f Include Finnish translation David Baker 2017-09-15 12:26:45 +01:00
  • fd1f9ac124 Merge pull request #1395 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2017-09-15 12:23:13 +01:00
  • bfedcd1ff0 Don't check for only-emoji if there were none David Baker 2017-09-15 12:03:32 +01:00
  • 803e8f93e3 Fix emojification of symbol characters David Baker 2017-09-15 11:43:55 +01:00
  • c24804ea38 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-15 08:56:06 +00:00
  • 1b355e1a13 Merge pull request #1391 from matrix-org/dbkr/fix_slash_join David Baker 2017-09-15 09:56:02 +01:00
  • 5bce0ce277 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-15 08:18:59 +00:00
  • dd22b12e16 Translated using Weblate (Polish) Akcja Demokracja Open-Source 2017-09-14 10:55:52 +00:00
  • c814f02f34 Merge pull request #1390 from matrix-org/dbkr/create_room_no_spinner David Baker 2017-09-15 09:18:55 +01:00
  • b2de016b35 Add option to disable Emoji suggestions turt2live 2017-09-14 21:28:12 -06:00
  • a4e33bf46a Fix alias on home page for identity room turt2live 2017-09-14 21:09:57 -06:00
  • 0363f73e28 Fix the MessagePanel test turt2live 2017-09-14 20:47:24 -06:00
  • 3c71898237 Add /(un)ignore to autocomplete turt2live 2017-09-14 20:30:40 -06:00
  • 6e00f70320 Hide read receipts and typing notifs for ignored users turt2live 2017-09-14 20:25:02 -06:00
  • 2e72d6cd7c Hide events that were sent by ignored users turt2live 2017-09-14 20:16:56 -06:00
  • 3889df6b08 Add (un)ignore button to MemberInfo Travis Ralston 2017-09-14 17:10:02 -06:00
  • 13a251e29c Give feedback for /ignore and /unignore Travis Ralston 2017-09-14 16:21:36 -06:00
  • f3a4856593 Merge remote-tracking branch 'origin/develop' into dbkr/fix_slash_join David Baker 2017-09-14 23:09:26 +01:00
  • 2d517079d9 Add unresponsive /ignore and /unignore commands Travis Ralston 2017-09-14 16:08:51 -06:00
  • 2bc866b997 Clean up UserSettings for linting Travis Ralston 2017-09-14 15:41:12 -06:00
  • 1f837d2ae1 Make /join join again David Baker 2017-09-14 23:06:00 +01:00
  • ac0f593c7c CSS for unignore button in UserSettings Travis Ralston 2017-09-14 15:34:45 -06:00
  • 4579d20fd0 Unignore people from the settings Travis Ralston 2017-09-14 15:33:36 -06:00
  • 6b6e59e0dd Display spinner not room preview after room create David Baker 2017-09-14 22:22:21 +01:00
  • 4df16e8245 Display which users are ignored in the user settings Travis Ralston 2017-09-14 12:51:53 -06:00
  • f612b1933b start MELS expanded if it contains a highlighted/permalinked event. Michael Telatynski 2017-09-14 17:53:47 +01:00
  • 755f22a7fa shelving. Michael Telatynski 2017-09-14 17:39:18 +01:00
  • 7d033e1c0e Bring back dark theme code block border Travis Ralston 2017-09-14 10:03:53 -06:00
  • 8dc2604d63 Show who redacted an event on hover turt2live 2017-09-14 09:02:16 -06:00
  • d8781ddd0e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.room.aliases Michael Telatynski 2017-09-14 15:28:10 +01:00
  • 8ab96ae2ff render m.room.aliases events Michael Telatynski 2017-09-14 13:43:46 +01:00
  • c9d8005a4d Translated using Weblate (Basque) Osoitz 2017-09-14 10:23:13 +00:00
  • daabf06bdb Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-14 09:42:27 +00:00
  • 94ec11d3e1 Merge pull request #1384 from matrix-org/dbkr/fix_oobdata Matthew Hodgson 2017-09-14 10:42:24 +01:00
  • 5a2c74a893 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-14 09:38:30 +00:00
  • bb8538cd1a Merge pull request #1381 from matrix-org/dbkr/remove_spurious_cancel_button Matthew Hodgson 2017-09-14 10:38:26 +01:00
  • c890eea88a Translated using Weblate (Chinese (Simplified)) Iru Cai (vimacs) 2017-09-14 08:02:23 +00:00
  • 09fdd2bf0e Translated using Weblate (Russian) Andrey 2017-09-14 05:11:48 +00:00
  • 0f18528415 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-13 17:06:35 +00:00
  • b6c235b463 Translated using Weblate (Polish) Akcja Demokracja Open-Source 2017-09-13 13:47:39 +00:00
  • db31033089 Merge pull request #1386 from matrix-org/dbkr/fix_email_dm David Baker 2017-09-13 18:06:31 +01:00
  • 34134f0d43 Fix starting a chat by email address David Baker 2017-09-13 17:37:43 +01:00
  • 4ee023b4ef Translated using Weblate (Finnish) Stefan Parviainen 2017-09-13 16:14:52 +00:00
  • 5087da9247 Merge remote-tracking branch 'origin/develop' into luke/feature-flair David Baker 2017-09-13 16:52:12 +01:00
  • 06fe240be2 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist David Baker 2017-09-13 16:35:37 +01:00
  • 3c3328c5f1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist David Baker 2017-09-13 16:34:39 +01:00
  • ffb3d718d3 Fix the avatar / room name in room preview David Baker 2017-09-13 15:48:53 +01:00
  • 57b1b42ec6 Translated using Weblate (German) Krombel 2017-09-13 13:59:04 +00:00
  • 6bcb160ba3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-13 13:27:40 +00:00
  • 5e65a9696c Translated using Weblate (Polish) Akcja Demokracja Open-Source 2017-09-13 13:27:35 +00:00
  • 081a900524 Merge pull request #1363 from matrix-org/t3chguy/on_copy_tooltip David Baker 2017-09-13 14:27:35 +01:00
  • f148844573 Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip David Baker 2017-09-13 14:27:28 +01:00
  • 3cb333efdf Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-13 13:27:09 +00:00
  • 9d3ae94a01 Translated using Weblate (Polish) Akcja Demokracja Open-Source 2017-09-13 13:26:59 +00:00
  • 2c0dae8c52 Merge pull request #1383 from matrix-org/t3chguy/fix-dateutils David Baker 2017-09-13 14:27:04 +01:00
  • 2316f4230e install and use prop-types over React.PropTypes Michael Telatynski 2017-09-13 14:23:35 +01:00
  • fea7af11b4 Merge remote-tracking branch 'origin/t3chguy/on_copy_tooltip' into t3chguy/on_copy_tooltip Michael Telatynski 2017-09-13 14:18:56 +01:00