Commit Graph

  • b49c5a4c16 Translated using Weblate (Hungarian) Szimszon 2018-01-05 17:26:53 +00:00
  • a9fa4c5f67 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-05 16:16:14 +00:00
  • 6902cb5648 Merge pull request #1693 from matrix-org/luke/pref-tag-panel-selected2 David Baker 2018-01-05 16:16:10 +00:00
  • 5ac1d8ce81 Merge branch 'develop' into luke/pref-tag-panel-selected2 lukebarnard 2018-01-05 15:57:43 +00:00
  • 7fc21f4423 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-05 15:55:29 +00:00
  • 587a6f8e2b Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected David Baker 2018-01-05 15:55:24 +00:00
  • c0d14904ef Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-05 15:26:27 +00:00
  • f6b24b749f Translated using Weblate (Basque) Osoitz 2018-01-05 14:49:38 +00:00
  • 8c84c3f929 Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar Luke Barnard 2018-01-05 15:26:22 +00:00
  • 8509db1bda Cache isConfCallRoom lukebarnard 2018-01-05 14:53:04 +00:00
  • 1e66f4f0ed Translated using Weblate (Basque) Osoitz 2018-01-05 14:31:01 +00:00
  • 9289d1a57d Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-05 14:30:51 +00:00
  • d6942a455d Merge branch 'rubo77-hide-options-cp' into develop David Baker 2018-01-05 14:30:36 +00:00
  • c8af65fff4 Merge branch 'hide-options-cp' of https://github.com/rubo77/vector-web into rubo77-hide-options-cp David Baker 2018-01-05 14:30:21 +00:00
  • f1850d188e Translated using Weblate (French) Kévin C 2018-01-05 13:17:02 +00:00
  • 8ade357349 Handle newly added rooms and removed rooms. lukebarnard 2018-01-05 12:33:26 +00:00
  • 44d920afc8 Translated using Weblate (Russian) Andrey 2018-01-05 12:26:31 +00:00
  • 8a805187dc Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-05 12:24:14 +00:00
  • 845dda8f48 Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent David Baker 2018-01-05 12:24:06 +00:00
  • 58c1118993 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-05 12:18:19 +00:00
  • d3624886a7 Translated using Weblate (Russian) Andrey 2018-01-05 12:09:17 +00:00
  • c61d09464a Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self Michael Telatynski 2018-01-05 12:18:15 +00:00
  • 9f295b7a86 fix typo Michael Telatynski 2018-01-05 12:03:46 +00:00
  • 558a90a359 comment out RoomView.onStatusBarHidden Michael Telatynski 2018-01-05 11:58:42 +00:00
  • a8bd4bf858 add comment Michael Telatynski 2018-01-05 11:55:43 +00:00
  • 5aed77c752 Merge pull request #1677 from aidalgol/PropTypes David Baker 2018-01-05 11:53:55 +00:00
  • 222b01e000 Merge pull request #1691 from matrix-org/t3chguy/lazy_save_relatedGroupSettings Michael Telatynski 2018-01-05 11:53:30 +00:00
  • 350dab06a0 Merge pull request #1675 from turt2live/travis/fix-granular-again David Baker 2018-01-05 11:48:32 +00:00
  • 242d84c63a Merge pull request #1673 from matrix-org/t3chguy/fix_op_slashcommand_for_negatives David Baker 2018-01-05 11:28:52 +00:00
  • a473971c7b negate for less indentation Michael Telatynski 2018-01-05 11:11:20 +00:00
  • 293bb15ccc check PL and compare arrays rather than tracking changes Michael Telatynski 2018-01-05 10:53:55 +00:00
  • cf472c791d Consume all combinations of space / enter, keyDown / keyUp presses and try to explain this key handling inconsistency with some additional comments as per the review discussion. Peter Vágner 2018-01-05 11:45:45 +01:00
  • 7787e57b42 Merge pull request #1645 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2018-01-05 10:38:18 +00:00
  • 7606e60188 Merge branch 'develop' into luke/perf-tag-panel-selected lukebarnard 2018-01-05 10:23:20 +00:00
  • 8731bfd008 Translated using Weblate (Russian) Walter 2018-01-04 21:36:34 +00:00
  • 54d128658e Comment logging. Richard Lewis 2018-01-04 23:00:10 +00:00
  • 57247493d9 Remove unused deps. Richard Lewis 2018-01-04 22:59:50 +00:00
  • d256e473eb Fix header and remove unused deps. Richard Lewis 2018-01-04 22:51:49 +00:00
  • 7b313b7acf Comment logging. Richard Lewis 2018-01-04 22:38:52 +00:00
  • d652f117fb Remove click handlers etc. Richard Lewis 2018-01-04 22:36:29 +00:00
  • 1c8586e802 Add sticker message rendering. Richard Lewis 2018-01-04 22:21:38 +00:00
  • 54671ab67e Send m.sticker messages Richard Lewis 2018-01-04 21:57:24 +00:00
  • a7aa0a3b27 Translated using Weblate (Russian) Walter 2018-01-04 21:28:06 +00:00
  • d20aebfbd7 Correctly handle sticker message events. Richard Lewis 2018-01-04 18:58:55 +00:00
  • da199da798 Merge branch 'rxl881/snapshot' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot Richard Lewis 2018-01-04 18:43:18 +00:00
  • 32aecd0630 Fix event call Richard Lewis 2018-01-04 18:43:08 +00:00
  • eb4053bc99 Handle sticker message payloads Richard Lewis 2018-01-04 18:41:47 +00:00
  • ae3666143a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-04 18:26:10 +00:00
  • c7accb732c Merge pull request #1624 from matrix-org/t3chguy/room_dict_refactor David Baker 2018-01-04 18:26:06 +00:00
  • 493023a1bb Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-04 18:19:42 +00:00
  • 50aeea8f05 Merge pull request #1686 from matrix-org/luke/fix-get-users-rooms-for-joined-groups David Baker 2018-01-04 18:19:37 +00:00
  • f1b60287fb Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups lukebarnard 2018-01-04 17:56:34 +00:00
  • cde2a5e201 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-04 17:46:52 +00:00
  • 55bfff24c4 Fix forgotten rename during d5e2a73d99 lukebarnard 2018-01-04 17:46:44 +00:00
  • 9c13a5a267 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-04 17:33:40 +00:00
  • b34f360f96 Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop David Baker 2018-01-04 17:33:36 +00:00
  • 36a2f4e8f9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-04 17:08:06 +00:00
  • 5961cf3958 Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click David Baker 2018-01-04 17:08:01 +00:00
  • 7c86745fc3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-04 16:49:22 +00:00
  • c294e336b5 Merge pull request #1344 from matrix-org/t3chguy/hide_left_chats_memberinfo David Baker 2018-01-04 16:49:17 +00:00
  • 831a3f7e42 Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo Michael Telatynski 2018-01-04 16:41:16 +00:00
  • e99477d486 naive translation rescue post-pluralisation Michael Telatynski 2018-01-04 15:13:54 +00:00
  • be48460595 Singularise unsent message prompt, if applicable Michael Telatynski 2018-01-04 15:05:08 +00:00
  • f63e6fdedf Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/single_unsent Michael Telatynski 2018-01-04 15:03:11 +00:00
  • f5f3c894d7 only save RelatedGroupSettings if it was modified. Otherwise perms issue Michael Telatynski 2018-01-04 14:24:13 +00:00
  • 2282f5c26f Remove unused selectedRoom prop lukebarnard 2018-01-04 14:19:10 +00:00
  • d5e2a73d99 Add alt condition back in, rename to specify igorance of shift lukebarnard 2018-01-04 12:06:13 +00:00
  • cdd1a57569 Calculate visible rooms when tags change lukebarnard 2018-01-04 11:50:33 +00:00
  • b85efa08ce Merge branch 'rxl881/snapshot' of github.com:matrix-org/matrix-react-sdk into rxl881/snapshot Richard Lewis 2018-01-04 09:53:29 +00:00
  • e96d199b28 Inject stickers Richard Lewis 2018-01-04 09:53:26 +00:00
  • 5c5307c665 Improve performance of tag panel selection (when tags are selected) lukebarnard 2018-01-03 17:12:31 +00:00
  • 94aa5b5f1b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-03 16:15:57 +00:00
  • 38e0b26153 Merge branch 'master' into develop David Baker 2018-01-03 16:15:46 +00:00
  • 5635614549 v0.13.4 v0.13.4 David Baker 2018-01-03 16:13:24 +00:00
  • 1bb861f6cf Prepare changelog for v0.13.4 David Baker 2018-01-03 16:13:24 +00:00
  • 2eb433157a v0.13.4 David Baker 2018-01-03 16:08:38 +00:00
  • d71af40967 add missing config.json entry such that scalar-staging widgets work Michael Telatynski 2017-12-19 12:03:48 +00:00
  • 58e773031b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-03 15:48:49 +00:00
  • 77132bc7bd Translated using Weblate (Italian) pincopallopino 2018-01-03 14:23:26 +00:00
  • d2a676cad2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-03 15:48:44 +00:00
  • 33cf966f34 Translated using Weblate (Spanish) Sejo 2017-12-29 06:54:50 +00:00
  • 760b961e19 Translated using Weblate (Slovak) Peter Vágner 2017-12-26 17:56:03 +00:00
  • d3e47fa99d Merge pull request #1682 from Nostradamos/fix_riot_web_4821 Luke Barnard 2018-01-03 15:48:43 +00:00
  • 2660e70e00 Translated using Weblate (Dutch) Joachim Nielandt 2017-12-22 19:01:48 +00:00
  • f3f608b35f Translated using Weblate (Czech) Milan Korecký 2017-12-30 14:28:57 +00:00
  • 34a3ef7e1d Translated using Weblate (Basque) Osoitz 2018-01-01 10:32:49 +00:00
  • 604d4e0a51 Merge pull request #5900 from Nostradamos/fix_4821 Luke Barnard 2018-01-03 15:48:38 +00:00
  • 2baacfa562 Handle case where ordering is not yet known lukebarnard 2018-01-03 14:12:28 +00:00
  • a2bb240dcb Fetch group data for all tags instead of those selected lukebarnard 2018-01-03 14:04:53 +00:00
  • 3d836a6d76 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-03 13:41:19 +00:00
  • 08e6d123a2 Translated using Weblate (Basque) Osoitz 2018-01-03 11:53:58 +00:00
  • 63335f70e5 Merge pull request #1685 from matrix-org/dbkr/remove-double-fullstop Luke Barnard 2018-01-03 13:41:13 +00:00
  • 613e3b7ac1 Remove extra full stop David Baker 2018-01-03 11:57:49 +00:00
  • d495519986 Fix shift-ctrl-click lukebarnard 2018-01-03 11:39:15 +00:00
  • 85cdd888e8 Combine TagOrderStore and FilterStore lukebarnard 2018-01-03 11:33:59 +00:00
  • 2189fe9256 removed console.log nostradamos 2018-01-03 01:52:02 +01:00
  • e543f55572 refactored code nostradamos 2018-01-03 01:50:03 +01:00
  • f67d405732 small refactor && warn on self-demotion Michael Telatynski 2018-01-02 23:15:36 +00:00
  • 36df3acf4d Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821 nostradamos 2018-01-02 23:07:47 +01:00
  • 03f88df66e Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821 nostradamos 2018-01-02 22:44:18 +01:00