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

Commit Graph

  • 67ba0e59a2 Merge pull request #1301 from zeroware/develop Matthew Hodgson 2017-10-14 23:48:43 +01:00
  • 8f86a58261 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-14 22:45:53 +00:00
  • b552b45a96 Merge pull request #1454 from matrix-org/t3chguy/jump_to_rr Matthew Hodgson 2017-10-14 23:45:49 +01:00
  • e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr Matthew Hodgson 2017-10-14 23:45:17 +01:00
  • a6a0fbfc91 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-14 22:43:16 +00:00
  • f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes Matthew Hodgson 2017-10-14 23:43:12 +01:00
  • 6926c96f36 Hide pinning messages behind a labs settings Travis Ralston 2017-10-14 16:41:44 -06:00
  • 463e17b223 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-14 22:41:36 +00:00
  • 71d25bf787 Merge pull request #1442 from turt2live/travis/no_grey Matthew Hodgson 2017-10-14 23:41:32 +01:00
  • c55ffe1be7 Remove duplicate declaration that breaks the build Travis Ralston 2017-10-14 16:41:02 -06:00
  • 8a641c7173 Hide message pinning behind a labs setting Travis Ralston 2017-10-14 16:40:10 -06:00
  • 838b9957da Merge remote-tracking branch 'matrix-org/develop' into travis/pinned_messages Travis Ralston 2017-10-14 16:33:46 -06:00
  • 6f819606c1 Merge pull request #4054 from ollieh/issues/3771 Matthew Hodgson 2017-10-14 23:21:51 +01:00
  • 3e066d3aef Merge branch 'develop' into travis/pinned_messages Travis Ralston 2017-10-14 16:11:17 -06:00
  • 3428c1c3d3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-14 22:10:39 +00:00
  • a5c8d061a8 Merge pull request #1362 from matrix-org/t3chguy/hide_notification_body Matthew Hodgson 2017-10-14 23:10:35 +01:00
  • c34b55c6c7 Merge branch 'develop' into travis/pinned_messages Travis Ralston 2017-10-14 16:10:32 -06:00
  • d63a25a183 Merge branch 'develop' into t3chguy/hide_notification_body Matthew Hodgson 2017-10-14 23:10:01 +01:00
  • 2667ed2561 Merge pull request #4988 from vector-im/t3chguy/hide_notification_body Matthew Hodgson 2017-10-14 23:07:31 +01:00
  • 5bb2992f93 Merge pull request #5281 from turt2live/travis/display-name-lightbox Matthew Hodgson 2017-10-14 22:46:13 +01:00
  • b70bd1987a Merge pull request #5267 from turt2live/travis/alone_warning_css Matthew Hodgson 2017-10-14 22:44:58 +01:00
  • 9051efeecf Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-14 21:44:35 +00:00
  • dfc3dcff9d Merge pull request #1466 from turt2live/travis/alone_warning Matthew Hodgson 2017-10-14 22:44:31 +01:00
  • 9f64261707 Merge branch 'develop' into travis/alone_warning Matthew Hodgson 2017-10-14 22:43:36 +01:00
  • 5c1e2a8a82 Merge pull request #5037 from turt2live/travis/code_block_border Matthew Hodgson 2017-10-14 22:32:45 +01:00
  • dde0cc1baa Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-14 21:13:35 +00:00
  • 3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar Matthew Hodgson 2017-10-14 22:13:32 +01:00
  • 8d6f0db3e2 be explicit in remove button height Matthew Hodgson 2017-10-14 22:13:00 +01:00
  • 6f81142bde Merge pull request #5282 from turt2live/travis/unset_avatar Matthew Hodgson 2017-10-14 22:11:02 +01:00
  • 538e0251ed Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-14 21:09:59 +00:00
  • 0284a582a1 Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist Matthew Hodgson 2017-10-14 22:09:55 +01:00
  • fd6d1f0a75 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-14 21:06:20 +00:00
  • 6dad6da66e Translated using Weblate (Russian) Andrey 2017-10-14 19:35:39 +00:00
  • 8efeab924a Translated using Weblate (Portuguese) Carlos Marques 2017-10-14 14:01:13 +00:00
  • 329e258122 Translated using Weblate (German) Bamstam 2017-10-13 19:22:56 +00:00
  • 20ca318543 Merge pull request #1481 from matrix-org/t3chguy/disable_big_emoji Matthew Hodgson 2017-10-14 22:06:15 +01:00
  • 6cd07731c4 Add MemberPresenceAvatar and control presence ourselves Travis Ralston 2017-10-14 14:37:47 -06:00
  • 9d17ed7407 CSS for presence member avatar Travis Ralston 2017-10-14 14:33:55 -06:00
  • c7c28c7ad2 make linter happy Michael Telatynski 2017-10-14 19:53:08 +01:00
  • c1edc0c32e add option to disable BigEmoji Michael Telatynski 2017-10-14 19:40:45 +01:00
  • b0b7472901 undo bad merge Michael Telatynski 2017-10-14 17:14:17 +01:00
  • e79f9ef011 === > == Michael Telatynski 2017-10-14 17:10:51 +01:00
  • 6ad8532bed lowerCase query so that searching for Erik will actually find Erik.. Michael Telatynski 2017-10-14 17:09:58 +01:00
  • a000439948 pass search query to filter fn in _updateList Michael Telatynski 2017-10-14 17:09:30 +01:00
  • 97ebd27175 Add missing translation Travis Ralston 2017-10-13 23:08:41 -06:00
  • 56e775c56a Remove user avatar button CSS Travis Ralston 2017-10-13 21:14:08 -06:00
  • 6e7f0d649b Add option to unset your own avatar Travis Ralston 2017-10-13 21:13:32 -06:00
  • e5c8e3e7ad Add option to unset room avatar Travis Ralston 2017-10-13 20:57:15 -06:00
  • c7723ba0b0 Remove room avatar button CSS Travis Ralston 2017-10-13 20:56:39 -06:00
  • 1adb63ac74 Don't use MXIDs on the lightbox if possible Travis Ralston 2017-10-13 20:18:55 -06:00
  • a84b42bf24 Departify RoomSettings Stefan Parviainen 2017-10-13 21:10:50 +02:00
  • 3b91ada4c8 Departify sending emails and text messages Stefan Parviainen 2017-10-13 20:44:01 +02:00
  • 6f20445a42 Explain topic click stopPropagation Luke Barnard 2017-10-13 17:57:28 +01:00
  • 3468abc975 Use GeminiScrollbar instead of ScrollPanel Luke Barnard 2017-10-13 17:49:52 +01:00
  • 34e9b10e95 Translated using Weblate (Hungarian) Szimszon 2017-10-13 16:43:44 +00:00
  • 4b24eab8fd Merge branch 'luke/groups-room-directory-esque' of github.com:matrix-org/matrix-react-sdk into luke/groups-room-directory-esque Luke Barnard 2017-10-13 17:19:58 +01:00
  • aaf32ac9a0 Lint Luke Barnard 2017-10-13 16:57:52 +01:00
  • 83e7fc242a Merge branch 'develop' into luke/groups-room-directory-esque Luke Barnard 2017-10-13 17:48:35 +02:00
  • 77418f535e Modify GroupView UI Luke Barnard 2017-10-13 16:46:33 +01:00
  • f5397acfa1 v0.12.7-rc.3 v0.12.7-rc.3 David Baker 2017-10-13 16:36:57 +01:00
  • bdd96c6a9a Prepare changelog for v0.12.7-rc.3 David Baker 2017-10-13 16:36:56 +01:00
  • e0de9cbdfe v0.12.7-rc.3 David Baker 2017-10-13 16:36:07 +01:00
  • f555f2036e react-sdk rc.3 David Baker 2017-10-13 16:35:41 +01:00
  • 3b2650e5ea Merge remote-tracking branch 'origin/develop' into release-v0.12.7 David Baker 2017-10-13 16:33:55 +01:00
  • 3b515cdebe v0.10.7-rc.3 David Baker 2017-10-13 16:31:35 +01:00
  • 8470a03530 Prepare changelog for v0.10.7-rc.3 David Baker 2017-10-13 16:31:34 +01:00
  • ae2908ed65 Merge remote-tracking branch 'origin/develop' into release-v0.10.7 David Baker 2017-10-13 16:29:36 +01:00
  • d1476e0cc7 Merge pull request #5275 from vector-im/dbkr/hide_join_group David Baker 2017-10-13 16:27:50 +01:00
  • b727944b11 Bump electron version David Baker 2017-10-13 16:27:01 +01:00
  • 398e0839f1 Hide the join group button David Baker 2017-10-13 16:15:17 +01:00
  • a4cdbd5fd4 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-13 15:14:45 +00:00
  • f5abd1c2c8 Translated using Weblate (Hungarian) Szimszon 2017-10-13 15:10:56 +00:00
  • d7c3fc9adb Merge pull request #1474 from matrix-org/dbkr/fix_enablelabs_again Luke Barnard 2017-10-13 17:14:40 +02:00
  • d0759a537b Fix the enableLabs flag, again David Baker 2017-10-13 16:06:17 +01:00
  • adceda7588 v0.12.7-rc.2 v0.12.7-rc.2 David Baker 2017-10-13 15:06:18 +01:00
  • 577db02140 Prepare changelog for v0.12.7-rc.2 David Baker 2017-10-13 15:06:18 +01:00
  • 4bd53eb821 v0.12.7-rc.2 David Baker 2017-10-13 15:05:34 +01:00
  • b3da206a92 react-sdk rc.2 David Baker 2017-10-13 15:03:43 +01:00
  • b95c2368a6 v0.10.7-rc.2 David Baker 2017-10-13 15:02:37 +01:00
  • 56825efc72 Prepare changelog for v0.10.7-rc.2 David Baker 2017-10-13 15:02:36 +01:00
  • 705254ac55 Merge remote-tracking branch 'origin/develop' into release-v0.10.7 David Baker 2017-10-13 15:00:49 +01:00
  • 98a5669eb1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-13 13:43:44 +00:00
  • 5214a867db Fix labs again David Baker 2017-10-13 14:43:26 +01:00
  • efc906dd0f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-13 13:22:11 +00:00
  • 8405ec327e Translated using Weblate (German) Krombel 2017-10-13 11:49:00 +00:00
  • 42e31ecba6 Merge pull request #1473 from matrix-org/dbkr/honour_enablelabs Luke Barnard 2017-10-13 15:22:06 +02:00
  • 4e793d4f68 skip unnecessary filter David Baker 2017-10-13 14:11:21 +01:00
  • 04b27f8678 Merge remote-tracking branch 'origin/develop' into dbkr/honour_enablelabs David Baker 2017-10-13 14:00:11 +01:00
  • f94873bd5d Honour the (now legacy) enableLabs flag David Baker 2017-10-13 13:58:24 +01:00
  • 27f6781499 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-13 10:53:43 +00:00
  • a9831f342f Translated using Weblate (German) Krombel 2017-10-13 10:53:25 +00:00
  • 5292b0dba9 Merge pull request #1472 from matrix-org/dbkr/labs_really_disabled_by_default David Baker 2017-10-13 11:53:38 +01:00
  • e9cc088f7b Translated using Weblate (German) Bamstam 2017-10-13 10:25:53 +00:00
  • cd64c9bcbb Don't show labs features by default David Baker 2017-10-13 11:48:44 +01:00
  • 07e197dfa1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-13 10:20:25 +00:00
  • f5f0c7e715 Merge pull request #1470 from matrix-org/dbkr/features_disabled_by_default David Baker 2017-10-13 11:20:21 +01:00
  • f8554ca2f2 v0.12.7-rc.1 v0.12.7-rc.1 David Baker 2017-10-13 11:15:41 +01:00
  • 470ea8d6a7 Prepare changelog for v0.12.7-rc.1 David Baker 2017-10-13 11:15:40 +01:00
  • 79154e26fc v0.12.7-rc.1 David Baker 2017-10-13 11:14:31 +01:00
  • 64cfc9b717 js & react sdk rc.1 David Baker 2017-10-13 11:13:54 +01:00