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

Commit Graph

  • d93518ac43 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-17 19:28:43 +00:00
  • 6b43b412ab Merge pull request #1699 from matrix-org/dbkr/i18n_plural_fallback David Baker 2018-01-17 19:28:38 +00:00
  • 2f42e69b57 Merge branches 'develop' and 't3chguy/roomColor' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomColor Michael Telatynski 2018-01-17 18:20:35 +00:00
  • b7204e79a7 fallback after receiving settings rather than {} because its truthy Michael Telatynski 2018-01-17 18:17:26 +00:00
  • 43bb8c561d add comment Michael Telatynski 2018-01-17 18:10:19 +00:00
  • b90a98b5c1 don't pass back {} when we have no org.matrix.room.color_scheme Michael Telatynski 2018-01-17 18:06:19 +00:00
  • f8d7ab10fa Handle non-m.room.message event types. Richard Lewis 2018-01-17 17:19:20 +00:00
  • 816a77c089 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-17 17:10:55 +00:00
  • bd81ed6587 Merge pull request #1709 from matrix-org/luke/fix-group-store-redundant-requests David Baker 2018-01-17 17:10:49 +00:00
  • 5f413ddf8b Do not fetch GroupStore resources if already fetching lukebarnard 2018-01-17 17:01:42 +00:00
  • 3ebf278cf3 Refactor GroupStore based on existing STATE_KEY concept lukebarnard 2018-01-17 16:59:13 +00:00
  • b6f85fbf92 Don't treat sticker messages as info messages. Richard Lewis 2018-01-17 16:52:10 +00:00
  • aa524c339d Update class names. Richard Lewis 2018-01-17 15:49:36 +00:00
  • c340032bd1 Move sticker related CSS to its own file. Richard Lewis 2018-01-17 15:49:03 +00:00
  • fa336b7a99 Bring hide stickers icon to front when menu open. Richard Lewis 2018-01-17 15:41:15 +00:00
  • 5a4271268b Keep reference to stickers menu Richard Lewis 2018-01-17 15:40:47 +00:00
  • 3331c8af27 Use dispatcher ref for unregister call. Richard Lewis 2018-01-17 15:40:04 +00:00
  • de597d4f5d Make background lighter. Richard Lewis 2018-01-17 15:13:29 +00:00
  • 854b537695 Update sticker toggle icons. Richard Lewis 2018-01-17 11:27:57 +00:00
  • 47f3e511b6 Retest please David Baker 2018-01-17 11:01:50 +00:00
  • 621682a2db Retest please David Baker 2018-01-17 11:01:07 +00:00
  • 7486da3e53 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-17 10:57:44 +00:00
  • 792db43007 Merge pull request #1708 from matrix-org/luke/fix-tag-order-store-ignore-self-remote-echos David Baker 2018-01-17 10:57:39 +00:00
  • 2a1f8bd394 Ignore remote echos caused by this client lukebarnard 2018-01-17 10:45:49 +00:00
  • f4816b99ff Add stickerpack manage integration link styling. Richard Lewis 2018-01-17 00:05:16 +00:00
  • 614a10c6d3 Add manage integration link. Richard Lewis 2018-01-17 00:04:06 +00:00
  • 86da204169 Add manage stickerpacks link Richard Lewis 2018-01-16 23:25:07 +00:00
  • 56ae96fc75 Sticker content styling Richard Lewis 2018-01-16 21:46:50 +00:00
  • 38ed01bebd Pass room to stickerpack Richard Lewis 2018-01-16 21:35:25 +00:00
  • 7676fc0c10 Handle stickerpack close. Richard Lewis 2018-01-16 21:28:15 +00:00
  • 9339284090 Stickerpack content placeholder. Richard Lewis 2018-01-16 21:06:57 +00:00
  • f8643e9a96 Add styling and image for stickerpack placeholder. Richard Lewis 2018-01-16 18:35:04 +00:00
  • a7f0b11002 Add generic element context menu / popover. Richard Lewis 2018-01-16 18:15:17 +00:00
  • 86542d86e9 Move stickers into stand-alone component. Richard Lewis 2018-01-16 18:14:32 +00:00
  • cb7f25f4de Remove rubbish lib. Richard Lewis 2018-01-16 18:13:52 +00:00
  • 5586a02b34 Merge branches 'develop' and 't3chguy/devtools-118247' of github.com:vector-im/riot-web into t3chguy/devtools-118247 Michael Telatynski 2018-01-16 18:05:15 +00:00
  • 670f02acf8 Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things Michael Telatynski 2018-01-16 18:04:08 +00:00
  • f76186d743 Merge remote-tracking branch 'origin/develop' into dbkr/i18n_plural_fallback David Baker 2018-01-16 17:45:45 +00:00
  • 0557737f8d Don't modify original options arg David Baker 2018-01-16 17:45:29 +00:00
  • c64b4e1b1c Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting David Baker 2018-01-16 17:38:32 +00:00
  • 87d8ed5af8 Add comment Richard Lewis 2018-01-16 17:01:25 +00:00
  • ff70af3f34 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-16 13:05:37 +00:00
  • 6f47a9b8c3 Translated using Weblate (Galician) Xose M 2018-01-16 11:00:45 +00:00
  • a94208e230 Merge pull request #5992 from vector-im/luke/tag-panel-beautiful-dnd Luke Barnard 2018-01-16 13:05:31 +00:00
  • 1c600ab8d5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-16 11:26:49 +00:00
  • 5de8cf270c Translated using Weblate (Galician) Xose M 2018-01-16 11:01:01 +00:00
  • 62caa4f096 Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd Luke Barnard 2018-01-16 11:26:44 +00:00
  • 1155c1c85c Translated using Weblate (Basque) Osoitz 2018-01-12 12:38:21 +00:00
  • f19dcd8114 Comment workaround to atlassian/react-beautiful-dnd#273 lukebarnard 2018-01-16 11:07:25 +00:00
  • bda2d6b0a6 Work around atlassian/react-beautiful-dnd#273 lukebarnard 2018-01-16 10:44:11 +00:00
  • 4386d45a97 remove 'use strict' Michael Telatynski 2018-01-16 10:27:47 +00:00
  • f391375dea Alter comment on travis-ci#8836 workaround lukebarnard 2018-01-16 10:09:11 +00:00
  • d2e5b12271 Update jsdoc for moveTag lukebarnard 2018-01-16 09:46:48 +00:00
  • c269abd434 CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd lukebarnard 2018-01-16 09:40:15 +00:00
  • f7e2e91df5 Workaround for travis-ci/travis-ci#8836 lukebarnard 2018-01-16 09:38:16 +00:00
  • bc2448fa7c Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-01-13 12:59:41 +00:00
  • 732950594d Translated using Weblate (Hungarian) Szimszon 2018-01-11 12:34:08 +00:00
  • 82b9897986 Select apropriate theme colour for popover. Richard Lewis 2018-01-15 18:27:14 +00:00
  • 16c13fb079 Replace TagPanel react-dnd with react-beautiful-dnd lukebarnard 2018-01-15 18:12:27 +00:00
  • e085632d8d Translated using Weblate (French) Kévin C 2018-01-11 11:20:03 +00:00
  • c3b3cc4a82 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-15 15:02:02 +00:00
  • 0a6018a945 Merge pull request #1704 from matrix-org/luke/perf-room-list David Baker 2018-01-15 15:01:57 +00:00
  • 408f13f68c Only set selected tags state when updating rooms lukebarnard 2018-01-15 14:42:41 +00:00
  • 5a9a4ead96 Remove arrow opacity. Richard Lewis 2018-01-15 14:25:56 +00:00
  • 5e6da4d758 * Fix key error * Remove redundant logging * Catch error Richard Lewis 2018-01-15 14:22:41 +00:00
  • 7fadd0f4ac Translated using Weblate (Russian) Andrey 2018-01-15 14:02:13 +00:00
  • 152f28bf2a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-15 13:45:20 +00:00
  • c0f6cf2343 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-15 13:45:17 +00:00
  • ab0c03369b Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-01-13 12:59:41 +00:00
  • f940dfdd79 Merge pull request #5984 from vector-im/t3chguy/datesep David Baker 2018-01-15 13:45:14 +00:00
  • ba9f03ce5e Merge pull request #1702 from matrix-org/t3chguy/datesep David Baker 2018-01-15 13:45:11 +00:00
  • 0fab905a2e Cleanup styles. Richard Lewis 2018-01-15 11:16:07 +00:00
  • 7924a149b4 Remove transparent background and fix z-index of popover. Richard Lewis 2018-01-15 11:14:30 +00:00
  • 351bbdfd4e Styling Richard Lewis 2018-01-15 10:25:19 +00:00
  • cf00ac34d9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-15 10:06:12 +00:00
  • a50e9d2b6b Translated using Weblate (Japanese) toriko 2018-01-13 04:13:21 +00:00
  • e2ef885aa6 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-01-13 01:55:47 +00:00
  • fc844567a6 Merge pull request #5978 from vector-im/t3chguy/nvl/rich_quoting David Baker 2018-01-15 10:06:05 +00:00
  • 24fcea8a0a fix indenting Matthew Hodgson 2018-01-15 02:19:15 +00:00
  • a233af67ea initial pseudocode WIP for e2e online backups Matthew Hodgson 2018-01-15 02:02:48 +00:00
  • f97395f40f change exports to default to retain compatibility with existing imports Michael Telatynski 2018-01-14 18:41:44 +00:00
  • b65fdf6ab0 refactor MessageTimestamp, as it was missing a PropTypes def for ts Michael Telatynski 2018-01-14 18:35:53 +00:00
  • 22c024cc94 Refactor DateSep, use new Dateutils.formatFullDateNoTime as it is not desired for it to include the time. Michael Telatynski 2018-01-14 18:33:58 +00:00
  • b526fc057c Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep Michael Telatynski 2018-01-14 18:32:17 +00:00
  • ba5d92559b Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-01-13 12:58:50 +00:00
  • b99e87ba0a Translated using Weblate (Chinese (Traditional)) Neo_Chen 2017-11-25 14:12:12 +00:00
  • e42bea6277 Don't paginate whilst decrypting events David Baker 2018-01-12 18:17:03 +00:00
  • a3c6dd36ef Stickers popover. Richard Lewis 2018-01-12 17:38:21 +00:00
  • a24c3ada53 Sticker styling Richard Lewis 2018-01-12 17:36:09 +00:00
  • 3cadb9b587 Fall back for missing i18n plurals David Baker 2018-01-12 16:21:30 +00:00
  • a013e7ea9a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-12 13:56:31 +00:00
  • 952f2c6a21 Merge pull request #1698 from matrix-org/dbkr/fix_autofocus David Baker 2018-01-12 13:56:24 +00:00
  • a40dafd701 Translated using Weblate (Basque) Osoitz 2018-01-12 12:38:08 +00:00
  • 99a72b5b2b Fix autofocus broken in https://github.com/matrix-org/matrix-react-sdk/pull/1674 David Baker 2018-01-12 10:52:51 +00:00
  • 3477c8a8d3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-12 10:32:46 +00:00
  • aa5d42d045 Remove spurious dot David Baker 2018-01-12 10:32:36 +00:00
  • 23543614e1 Add react-popover-tiny Richard Lewis 2018-01-12 09:52:53 +00:00
  • bd1312f673 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-12 09:41:19 +00:00
  • 7a324b4104 Translated using Weblate (Hungarian) Szimszon 2018-01-11 12:34:08 +00:00
  • 18098da94a Translated using Weblate (Basque) Osoitz 2018-01-11 12:57:54 +00:00