Commit Graph

  • 665ddccb0d restrict to m.text for now Michael Telatynski 2018-02-20 15:45:25 +00:00
  • 90f9badbf3 s/Reply/ReplyThread/ Michael Telatynski 2018-02-20 15:40:19 +00:00
  • eadf609932 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-20 14:22:23 +00:00
  • f227d13dfe Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-20 14:21:24 +00:00
  • b5146001d6 Merge pull request #1761 from matrix-org/luke/fix-direct-messages-with-self David Baker 2018-02-20 14:22:17 +00:00
  • bc15303358 Factor out updateDmState Luke Barnard 2018-02-20 14:10:34 +00:00
  • d21f55633d Fix DMs being marked as with the current user ("me") Luke Barnard 2018-02-20 14:03:43 +00:00
  • d6e1ac3ca6 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-20 10:17:24 +00:00
  • c5ad486c57 Translated using Weblate (Catalan) Ralitsa Bozhkova 2018-02-19 20:17:44 +00:00
  • 1c96c1f4d9 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-20 10:17:13 +00:00
  • fd90a8b23c Merge pull request #1756 from matrix-org/luke/fix-recent-ordering David Baker 2018-02-20 10:17:16 +00:00
  • 7048d85246 attach message_sent and replies to file uploads Michael Telatynski 2018-02-19 23:42:04 +00:00
  • 34b427d15e s/quote_event/reply_to_event/ Michael Telatynski 2018-02-19 23:41:07 +00:00
  • 46a29b56d9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-19 16:39:22 +00:00
  • 4998890a0e Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-19 16:12:43 +00:00
  • 715198dc17 Merge pull request #1760 from matrix-org/matthew/improve-postmessage-origin-check2 Richard van der Hoff 2018-02-19 16:39:15 +00:00
  • 6510989ac6 move unmounted init to willMount Michael Telatynski 2018-02-19 14:28:31 +00:00
  • 8fa56f8c9a update and improve comments Michael Telatynski 2018-02-19 14:27:10 +00:00
  • f6bcab18be Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-19 09:59:30 +00:00
  • a35a80ca4f Translated using Weblate (Polish) Kacper Fronc 2018-02-18 00:03:16 +00:00
  • 0da2034a3e Translated using Weblate (Indonesian) Andrey Silversburg 2018-02-19 04:35:48 +00:00
  • 4ab94b397a Translated using Weblate (Bulgarian) Slavi Pantaleev 2018-02-18 21:16:00 +00:00
  • 4c4b813aa1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-19 09:59:25 +00:00
  • e3e60bd372 Merge pull request #6187 from vector-im/luke/feature-tag-panel-global-filter Luke Barnard 2018-02-19 09:59:25 +00:00
  • 71a1de1e73 Translated using Weblate (Catalan) Simó Albert i Beltran 2018-02-17 13:40:44 +00:00
  • da35871cb1 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-18 20:21:27 +00:00
  • 5d1af70b96 Merge pull request #1759 from matrix-org/luke/feature-tag-panel-global-filter Luke Barnard 2018-02-19 09:59:19 +00:00
  • 32130fbc28 Don't regenerate RoomListStore state for notifs/scrollback/etc. Luke Barnard 2018-02-19 09:56:03 +00:00
  • 2d5a2a9d48 improve origin check of ScalarMessaging postmessage API. Matthew Hodgson 2018-02-16 23:59:48 +00:00
  • d0a38df67a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-16 22:22:37 +00:00
  • c3e34e5f05 Merge pull request #6194 from turt2live/patch-1 Matthew Hodgson 2018-02-16 22:22:32 +00:00
  • 514e042eec Separate the middle panel from the room list Travis Ralston 2018-02-16 14:53:52 -07:00
  • 4c08c51044 Reply; delay call to onWidgetLoad until after async setState completes Michael Telatynski 2018-02-16 21:24:42 +00:00
  • 0d6fc9bd3a fix Composer focus after twiddling with Replies Michael Telatynski 2018-02-16 21:17:41 +00:00
  • f1a3592eff fix 12/24h in Reply/ReplyPreview Michael Telatynski 2018-02-16 21:14:03 +00:00
  • cb293a852d reply and reply_preview only differ in whether they contain <Reply /> Michael Telatynski 2018-02-16 21:07:25 +00:00
  • 8062494692 show replies in ReplyPreview Michael Telatynski 2018-02-16 20:58:39 +00:00
  • 7a0c82a327 Fix click background to deselect Luke Barnard 2018-02-16 18:08:29 +00:00
  • d5b502743a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-16 17:51:30 +00:00
  • 01546c7f61 Merge pull request #1758 from turt2live/patch-3 Luke Barnard 2018-02-16 17:51:25 +00:00
  • 86d554b1dc CSS for new global TagPanel filter Luke Barnard 2018-02-16 17:44:27 +00:00
  • 113fc696d8 Implement global filter to deselect all tags Luke Barnard 2018-02-16 17:43:24 +00:00
  • cbeee72062 Don't show empty custom tags when filtering tags Travis Ralston 2018-02-16 10:11:04 -07:00
  • 3f6c15506c Remove unused room parameter of MatrixActions.Room.timeline Luke Barnard 2018-02-16 16:17:47 +00:00
  • cedfa4b607 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-16 16:01:17 +00:00
  • f2903d1439 Translated using Weblate (Finnish) Tulir Asokan 2018-02-16 08:45:19 +00:00
  • cca820c353 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-16 11:48:04 +00:00
  • ad863afd6d Merge pull request #1757 from matrix-org/luke/fix-assumed-removed-tags Luke Barnard 2018-02-16 16:01:11 +00:00
  • 84ab1ae3e2 Do not assume that tags have been removed Luke Barnard 2018-02-16 15:52:15 +00:00
  • 2e3cbb309e Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to Michael Telatynski 2018-02-16 14:35:04 +00:00
  • 94a0a90457 Make RoomListStore aware of Room.timeline events Luke Barnard 2018-02-16 14:16:50 +00:00
  • 57b34267c5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-16 11:53:35 +00:00
  • 4fc49850e1 Translated using Weblate (Finnish) Tulir Asokan 2018-02-16 08:36:41 +00:00
  • 5e25844ea8 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-15 20:47:27 +00:00
  • fc4da3e3bf Merge pull request #6176 from vector-im/luke/fix-invites-not-appearing Luke Barnard 2018-02-16 11:53:30 +00:00
  • 0605d96014 Only use DNDRoomTile for editable sub lists Luke Barnard 2018-02-16 11:02:52 +00:00
  • 37a912e7ee Translated using Weblate (Serbian) Марко М. Костић 2018-02-16 10:40:33 +00:00
  • aae428887a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-15 20:20:33 +00:00
  • b111a824e8 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-15 19:36:52 +00:00
  • 07b691a45d typo Matthew Hodgson 2018-02-15 20:20:19 +00:00
  • 5e8ec9f451 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-15 14:51:18 +00:00
  • 19b6684089 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-15 14:50:16 +00:00
  • f33bddaadd Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-15 14:51:12 +00:00
  • 1a880761e0 Merge pull request #1747 from matrix-org/luke/fix-scrollbars-on-jump-to-first Luke Barnard 2018-02-15 14:51:12 +00:00
  • 5740274528 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-15 13:22:13 +00:00
  • 332640c4ba Merge pull request #6131 from vector-im/luke/fix-scrollbars-on-jump-to-first Luke Barnard 2018-02-15 14:51:06 +00:00
  • 5c354dda23 Fix messagePanelSpinner flex order in RightPanel Luke Barnard 2018-02-15 14:34:44 +00:00
  • 57419a7f8d Give emptySubListTip a container for correct bg colour Luke Barnard 2018-02-15 14:11:45 +00:00
  • 9e1e7e0dbe Fix RoomDropTarget and emptySubListTip to have containers Luke Barnard 2018-02-15 14:09:38 +00:00
  • 8c17fafaca Translated using Weblate (Basque) Osoitz 2018-02-15 13:35:18 +00:00
  • f46c16b94a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-15 13:35:14 +00:00
  • 39af04f090 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-15 13:18:15 +00:00
  • 0c5b0fd52c Merge pull request #1752 from matrix-org/dbkr/roomliststore_unregister David Baker 2018-02-15 13:35:08 +00:00
  • 55dc49f4ff Merge remote-tracking branch 'origin/develop' into dbkr/roomliststore_unregister David Baker 2018-02-15 13:29:30 +00:00
  • ac5e42d0dd Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-15 13:12:47 +00:00
  • b9eab9fe29 Prevent referrers from being sent rugk 2018-02-15 13:31:31 +01:00
  • e3dcaebe9b Merge branch 'develop' into patch-2 rugk 2018-02-15 13:16:34 +01:00
  • 44964e80a9 undo unintentional commit David Baker 2018-02-15 11:25:40 +00:00
  • ceec405519 Remove RoomListStore listener David Baker 2018-02-15 11:23:00 +00:00
  • e79d502972 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-15 11:05:34 +00:00
  • a4c7da63af Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-15 10:47:20 +00:00
  • 7fe65703f7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-15 11:05:31 +00:00
  • 9d3b96e746 Translated using Weblate (Spanish) Ralitsa Bozhkova 2018-02-14 17:54:31 +00:00
  • e47c22a23e Translated using Weblate (Portuguese (Brazil)) Ralitsa Bozhkova 2018-02-14 17:54:12 +00:00
  • 06818761ef Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-15 11:01:31 +00:00
  • 6419fc73f5 Translated using Weblate (Belarusian) Ralitsa Bozhkova 2018-02-14 17:53:39 +00:00
  • c62b4ed9b1 Translated using Weblate (Azerbaijani) Aziz Ibrahimov 2018-02-15 10:56:21 +00:00
  • c8ccbed0b1 Merge pull request #1751 from matrix-org/luke/dnd-group-view-tag-panel Luke Barnard 2018-02-15 11:05:28 +00:00
  • f6255906d8 Merge pull request #6143 from vector-im/luke/dnd-group-view-tag-panel Luke Barnard 2018-02-15 11:05:25 +00:00
  • f64fefa9ae Use grab as some browsers e.g. firefox support it Luke Barnard 2018-02-15 10:52:10 +00:00
  • 2f5fc5a764 Added translation using Weblate (Azerbaijani) Aziz Ibrahimov 2018-02-15 10:02:14 +00:00
  • ba7991deba Fix syntax error of wrong use of self-closing HTML tag rugk 2018-02-15 02:36:05 +01:00
  • 93da078669 Clarify that HTTPS is not just needed for VoIP rugk 2018-02-15 02:17:37 +01:00
  • 594d510f4f Simplify MyGroups hierachy Luke Barnard 2018-02-14 17:54:29 +00:00
  • 3948ee8ca1 Give each GroupTile avatar its own droppable Luke Barnard 2018-02-14 17:53:54 +00:00
  • 389d96bc46 Use optimistic removedTagsAccountData state in TagOrderStore Luke Barnard 2018-02-14 16:47:29 +00:00
  • 3850b552a5 Make GroupTile avatar draggable Luke Barnard 2018-02-14 16:46:06 +00:00
  • 74c8a74e7d Add Droppable to GroupView Luke Barnard 2018-02-14 16:43:01 +00:00
  • b626420eb9 Move DND context to LoggedInView Luke Barnard 2018-02-14 16:40:58 +00:00
  • db4f0cb0bf Handle adding previously removed tags Luke Barnard 2018-02-14 16:40:24 +00:00