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

Commit Graph

  • ebfdd7c718 Merge pull request #1715 from matrix-org/t3chguy/rich_quoting_linear David Baker 2018-01-24 18:53:29 +01:00
  • 18d9de61fa Translated using Weblate (Catalan) Simó Albert i Beltran 2018-01-24 07:59:40 +00:00
  • 8b7a941a6e Translated using Weblate (Catalan) d1d4c 2018-01-23 19:59:09 +00:00
  • 394d4cf856 Merge pull request #5995 from vector-im/t3chguy/highlight_things Luke Barnard 2018-01-24 08:55:12 +00:00
  • f45ad26423 Translated using Weblate (Catalan) d1d4c 2018-01-24 02:57:44 +00:00
  • 22b7298542 add comments Michael Telatynski 2018-01-23 20:28:39 +00:00
  • 9d1a3c9011 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things Michael Telatynski 2018-01-23 20:19:27 +00:00
  • c2aa8137bb sort components scss Michael Telatynski 2018-01-23 20:02:47 +00:00
  • 4d0b02c683 Translated using Weblate (Catalan) d1d4c 2018-01-23 19:45:22 +00:00
  • c7146e62a0 Merge pull request #6022 from 4nd3r/README_cross_origin_renderer_url Michael Telatynski 2018-01-23 11:00:45 +00:00
  • d9409232f9 default url, not domain Ander Punnar 2018-01-23 12:15:08 +02:00
  • 71ecc5d7c5 Translated using Weblate (Hungarian) Szimszon 2018-01-22 17:24:43 +00:00
  • e5f5091505 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-01-23 05:15:27 +00:00
  • 0df6f85843 Translated using Weblate (Slovak) Peter Vágner 2018-01-20 14:32:31 +00:00
  • 13dd8e2c76 Translated using Weblate (Italian) A.G 2018-01-20 23:00:26 +00:00
  • 9d387c32a5 Merge pull request #5929 from vector-im/t3chguy/num_members_tooltip Luke Barnard 2018-01-22 22:21:50 +00:00
  • ace7b84987 Translated using Weblate (French) Kévin C 2018-01-22 20:42:32 +00:00
  • 88443af8fa Translated using Weblate (Basque) Osoitz 2018-01-22 19:23:20 +00:00
  • f5fc86258f s/Highlight/SyntaxHighlight/ Michael Telatynski 2018-01-22 18:59:18 +00:00
  • 321f16d8a3 rename variable as it was horrible to read camelCased Michael Telatynski 2018-01-22 18:54:22 +00:00
  • e19435d39d Translated using Weblate (Russian) Andrey 2018-01-22 16:03:49 +00:00
  • acc878bee5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-22 17:57:46 +00:00
  • f013ffd068 Merge pull request #1714 from matrix-org/t3chguy/group_create_dialog_fixes Luke Barnard 2018-01-22 17:57:40 +00:00
  • 294a5db20e Translated using Weblate (Hungarian) Szimszon 2018-01-20 13:41:07 +00:00
  • e3e3535072 delint Michael Telatynski 2018-01-22 17:02:20 +00:00
  • d57a10e0b2 Merge branches 'develop' and 't3chguy/rich_quoting_linear' of github.com:vector-im/riot-web into t3chguy/rich_quoting_linear Michael Telatynski 2018-01-22 16:53:51 +00:00
  • 4490715b60 Merge branch 'develop' into t3chguy/rich_quoting_linear Michael Telatynski 2018-01-22 16:46:20 +00:00
  • 202f0e2163 Add EventTile_quote styling for less margin-right when in QuotePreview Michael Telatynski 2018-01-22 16:42:08 +00:00
  • a6cefb83f8 basic error handling for malformed quotes Michael Telatynski 2018-01-22 16:41:32 +00:00
  • 3b1d69edbb Change Quotes to be linearly rendered rather than recursively nested Michael Telatynski 2018-01-22 16:34:47 +00:00
  • 33995b053e Add class to EventTile Line's that are quotes Michael Telatynski 2018-01-22 16:34:14 +00:00
  • 34b9db2033 Translated using Weblate (Russian) Andrey 2018-01-20 15:41:41 +00:00
  • 0441487e97 Manage sticker packs link and add comments Richard Lewis 2018-01-22 17:00:50 +01:00
  • 37dcb33b15 Reset quotingEvent on Room Change because inideal UX Michael Telatynski 2018-01-22 14:45:04 +00:00
  • 066d1a0ed2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-22 11:16:48 +00:00
  • 8496c947c8 Translated using Weblate (Spanish) pebles 2018-01-20 16:17:34 +00:00
  • 1d43ccde23 Translated using Weblate (Serbian) Марко М. Костић 2018-01-21 16:59:48 +00:00
  • 2326ee2586 Translated using Weblate (Italian) A.G 2018-01-20 23:00:56 +00:00
  • 755ead7c1d Translated using Weblate (Hungarian) Szimszon 2018-01-20 13:41:07 +00:00
  • 02824cfacf fix i18n for show devices prompt Matthew Hodgson 2018-01-22 12:16:11 +01:00
  • fb9930ad2c Translated using Weblate (Basque) Osoitz 2018-01-16 11:21:32 +00:00
  • fd2ef3e54d Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-01-16 02:33:06 +00:00
  • 77d8fe3ef1 Translated using Weblate (Italian) pincopallopino 2018-01-20 22:59:29 +00:00
  • 3e5833e9f2 Translated using Weblate (Italian) A.G 2018-01-20 22:59:22 +00:00
  • 2b26be73f6 Translated using Weblate (Italian) pincopallopino 2018-01-20 22:59:12 +00:00
  • ce6338b853 Translated using Weblate (Italian) A.G 2018-01-20 22:59:04 +00:00
  • 52c5293a12 Translated using Weblate (Italian) vricci 2018-01-20 22:58:48 +00:00
  • 568e1f4f90 Translated using Weblate (Italian) A.G 2018-01-20 22:58:41 +00:00
  • 29f05c09d6 Translated using Weblate (Italian) vricci 2018-01-20 22:57:56 +00:00
  • 888a77b4bb Translated using Weblate (Italian) A.G 2018-01-20 22:56:21 +00:00
  • 4eeb7989f6 Translated using Weblate (Spanish) pebles 2018-01-20 16:33:28 +00:00
  • 2111271bda Translated using Weblate (Russian) Andrey 2018-01-15 14:02:58 +00:00
  • a0ba25806c Translated using Weblate (Slovak) Peter Vágner 2018-01-20 15:12:54 +00:00
  • 1356e6dfd2 Translated using Weblate (French) Kévin C 2018-01-15 16:08:31 +00:00
  • 3764a5d4b7 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things Michael Telatynski 2018-01-20 13:55:52 +00:00
  • 1f3321fb37 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247 Michael Telatynski 2018-01-20 13:55:31 +00:00
  • 38c58f3b23 Translated using Weblate (Hungarian) Szimszon 2018-01-15 19:01:37 +00:00
  • 61b3d050ab Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/group_create_dialog_fixes Michael Telatynski 2018-01-20 13:39:57 +00:00
  • 2705397bf6 Add local GID==='' check, because Synapse says Group rather than Community Reset createError when doing check because it is now stale Michael Telatynski 2018-01-20 13:16:33 +00:00
  • 189b7236af Translated using Weblate (Slovak) Peter Vágner 2017-12-26 17:56:03 +00:00
  • da5cf63daf Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-20 11:44:21 +00:00
  • 67a4c6c487 Translated using Weblate (Serbian) Марко М. Костић 2018-01-20 11:44:16 +00:00
  • 5125683041 Merge pull request #1713 from Half-Shot/hs/leave-room-warnings Matthew Hodgson 2018-01-20 11:44:15 +00:00
  • 5206c9d18b Show a warning if the user attempts to leave a room that is invite only Will Hunt 2018-01-19 22:27:48 +00:00
  • 86e8334248 Try upgrading eslint-plugin-react David Baker 2018-01-19 18:04:42 +00:00
  • 37b5de2251 update triaging a bit Matthew Hodgson 2018-01-19 16:52:24 +00:00
  • 8855cc294e converge on 'noisy' to mean noisy notifs Matthew Hodgson 2017-12-13 22:57:24 +00:00
  • 935b85afe7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-19 14:49:58 +00:00
  • aff1fcde90 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-19 14:49:55 +00:00
  • a819add7b0 Merge pull request #6008 from vector-im/luke/roomlist-beautiful-dnd Luke Barnard 2018-01-19 14:49:53 +00:00
  • a8320fe7e2 Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd Luke Barnard 2018-01-19 14:49:49 +00:00
  • 6106b3ce44 newOrder defaults null, allows check for newOrder on line 357 lukebarnard 2018-01-19 14:12:21 +00:00
  • 54f6d305d7 Null-guard for newTag lukebarnard 2018-01-19 14:11:05 +00:00
  • e4b4a885ff Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-19 14:07:23 +00:00
  • 75a1922731 Fix linting lukebarnard 2018-01-19 14:07:13 +00:00
  • 883ee4ec75 Remove react-dnd lukebarnard 2018-01-19 13:35:11 +00:00
  • 00dc077271 Remove react-dnd, revert fa14bc9 as no longer needed lukebarnard 2018-01-19 13:34:56 +00:00
  • 533e5482d8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-19 10:39:51 +00:00
  • fba5d33923 Translated using Weblate (Serbian) Марко М. Костић 2018-01-18 21:15:59 +00:00
  • 6c15bd8599 fix NPE when getGroupProfiles returns null Matthew Hodgson 2018-01-19 10:39:38 +00:00
  • 4504ff954a Add sudo: required to travis config lukebarnard 2018-01-19 10:10:13 +00:00
  • 68f19f9558 Translated using Weblate (Serbian) Марко М. Костић 2017-11-18 21:37:55 +00:00
  • 6f0d799912 Fix indentation lukebarnard 2018-01-18 18:15:34 +00:00
  • d55d3658f0 Use classNames instead of inline style lukebarnard 2018-01-18 18:08:18 +00:00
  • 59f4661bfd Add comment lukebarnard 2018-01-18 18:01:31 +00:00
  • dfecad181a Swap RoomList to react-beautiful-dnd lukebarnard 2018-01-18 17:52:50 +00:00
  • 3481283af8 Swap RoomList to react-beautiful-dnd lukebarnard 2018-01-18 17:54:12 +00:00
  • 23bef68a8f Fix duplicate message listeners Richard Lewis 2018-01-18 13:16:06 +00:00
  • 910623d287 Close context menu on resize. Richard Lewis 2018-01-18 12:04:00 +00:00
  • 917d85d603 Refer rest parameters Richard Lewis 2018-01-18 12:03:24 +00:00
  • 1293c53c4b Cleanup Richard Lewis 2018-01-18 12:02:45 +00:00
  • 738b59fd42 Call for update on window resize. Richard Lewis 2018-01-18 12:01:29 +00:00
  • 5adbedb28a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-18 10:22:26 +00:00
  • c090c2e7df Merge pull request #1710 from matrix-org/t3chguy/roomColor David Baker 2018-01-18 10:22:21 +00:00
  • 5fd7c30dbf Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-18 09:57:38 +00:00
  • 80d3edfbb3 simplify the 'send anyway' text, as 'mark devices known' is meaningless to users Matthew Hodgson 2018-01-18 09:57:29 +00:00
  • 9e987337b7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-17 23:28:22 +00:00
  • d3292d9388 fix typos and NPE. fixes #5999 Matthew Hodgson 2018-01-17 23:25:39 +00:00
  • 0fb808ef99 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-17 19:28:56 +00:00
  • 27b27e3759 Merge pull request #1700 from matrix-org/dbkr/dont_paginate_while_decrypting David Baker 2018-01-17 19:28:52 +00:00