Commit Graph

  • 646cabf324 Add missing whitespace Luke Barnard 2017-11-07 15:15:10 +00:00
  • ddc1ff2f23 Name things in a sane way Luke Barnard 2017-11-07 15:13:26 +00:00
  • 4c0e956cc1 Name things in a sane way Luke Barnard 2017-11-07 15:13:17 +00:00
  • e1d16acddb Implement general-purpose tooltip "(?)"-style Luke Barnard 2017-11-07 14:09:04 +00:00
  • 62305a1ccd Implement tooltip for group rooms Luke Barnard 2017-11-07 14:07:31 +00:00
  • a45ae588e5 Translated using Weblate (German) Krombel 2017-11-07 13:34:41 +00:00
  • 3e29a26766 Translated using Weblate (German) Krombel 2017-11-07 13:33:35 +00:00
  • 96de72ab44 Switch to using existing dep "qs" and record in package.json Richard Lewis 2017-11-07 12:45:12 +00:00
  • d3784b4925 Fix URL parameter encoding. Richard Lewis 2017-11-07 12:33:38 +00:00
  • eb8c15075a Fix url params parsing. Richard Lewis 2017-11-07 11:58:38 +00:00
  • 7a09127687 Alter group member api Luke Barnard 2017-11-07 11:27:42 +00:00
  • 70c4100350 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering Richard Lewis 2017-11-07 11:04:05 +00:00
  • 9019fee49e Adjust long desc placeholder text Luke Barnard 2017-11-07 10:47:32 +00:00
  • b92156a1ff Translated using Weblate (French) Kévin C 2017-11-07 10:47:11 +00:00
  • c8edaf1ba9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 10:44:07 +00:00
  • 9ff1fe8a72 Merge pull request #5535 from vector-im/luke/groups-new-group-settings Matthew Hodgson 2017-11-07 10:43:59 +00:00
  • 5e9bb4353a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-07 10:25:54 +00:00
  • 47bf991471 Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills Luke Barnard 2017-11-07 10:25:48 +00:00
  • df5c6470e8 get dict syntax right David Baker 2017-11-06 22:01:23 +00:00
  • aa4feb0563 Info plinth CSS variables Luke Barnard 2017-11-06 18:57:03 +00:00
  • 956c5ff343 Use a constant for easy reading of long desc placeholder Luke Barnard 2017-11-06 18:52:55 +00:00
  • d87d6cbc64 CSS for improving group creation UX, namely setting long description Luke Barnard 2017-11-06 18:38:47 +00:00
  • 477051cfa6 Add placeholder for when a long desc hasn't been set Luke Barnard 2017-11-06 18:35:52 +00:00
  • 137f1311b3 Add useful placeholder for the long description textarea Luke Barnard 2017-11-06 18:03:00 +00:00
  • 36cd22663a Open group settings when the group is created Luke Barnard 2017-11-06 18:02:50 +00:00
  • afc9c36e4e Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-06 18:02:44 +00:00
  • 17ae37bd3b Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug Matthew Hodgson 2017-11-06 18:02:38 +00:00
  • d14f943629 Ignore img tags in HTML if src is not specified Luke Barnard 2017-11-06 17:52:46 +00:00
  • 16771cac4f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-06 17:16:39 +00:00
  • 029853d379 Merge pull request #1578 from matrix-org/luke/groups-admin-badges David Baker 2017-11-06 17:16:34 +00:00
  • 08d006d112 PR feedback David Baker 2017-11-06 17:15:09 +00:00
  • d6a6e59d6c Indicate admins in the group member list with a sheriff badge Luke Barnard 2017-11-06 16:37:16 +00:00
  • 3633f55e20 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-06 15:49:46 +00:00
  • a8bdde9f55 Merge pull request #5531 from vector-im/dbkr/composer_at_room_pills Luke Barnard 2017-11-06 15:49:41 +00:00
  • 41e7496ff1 unused var David Baker 2017-11-06 15:25:25 +00:00
  • e1eba559fe CSS for room notif pills in composer David Baker 2017-11-06 15:12:28 +00:00
  • adc4290451 Pillify room notif pills in composer David Baker 2017-11-06 15:11:42 +00:00
  • 706981688a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-06 14:29:30 +00:00
  • f1db564506 Merge pull request #1533 from anoadragon453/develop Richard Lewis 2017-11-06 14:29:25 +00:00
  • 01401fe4f8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-06 14:10:32 +00:00
  • ba1ab9bdd1 Translated using Weblate (Ukrainian) Walter 2017-11-05 12:20:29 +00:00
  • 25782404d4 Translated using Weblate (German) Bamstam 2017-11-03 23:52:26 +00:00
  • a1512af9f9 Merge pull request #5520 from vector-im/luke/right-panel-no-group David Baker 2017-11-06 14:10:27 +00:00
  • 0fdde954d4 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-06 13:02:51 +00:00
  • cb7b1268fe Translated using Weblate (Ukrainian) Walter 2017-11-05 12:17:26 +00:00
  • 48def50fec Merge pull request #1576 from matrix-org/luke/throw-on-undefined-group David Baker 2017-11-06 13:02:46 +00:00
  • febeb0429e Throw an error when trying to create a group store with falsey groupId Luke Barnard 2017-11-06 10:18:10 +00:00
  • cd26f63315 Do not init a group store when no groupId specified Luke Barnard 2017-11-06 10:16:03 +00:00
  • 781b94c8f4 Appease the linter Travis Ralston 2017-11-05 15:37:06 -07:00
  • 10519f9465 Fix the tests Travis Ralston 2017-11-05 14:56:41 -07:00
  • f0000f7400 Update documentation Travis Ralston 2017-11-05 14:33:40 -07:00
  • 50807d498a Use settings in slash commands too Travis Ralston 2017-11-05 13:06:55 -07:00
  • 68bb61d281 Translated using Weblate (Hungarian) Szimszon 2017-11-05 18:48:54 +00:00
  • e31c89d360 Make the controller work for notifications Travis Ralston 2017-11-04 22:28:35 -07:00
  • 63607f29e7 Use SettingsStore for notification settings Travis Ralston 2017-11-04 22:27:34 -07:00
  • 7ce4316cc8 Initial support for notification settings Travis Ralston 2017-11-04 21:47:18 -07:00
  • 8351ec7e73 Local echo on all setting levels Travis Ralston 2017-11-04 20:32:00 -07:00
  • 3958e32672 Ensure blacklistUnverifiedDevices persists reloads Travis Ralston 2017-11-04 20:13:23 -07:00
  • 45140cab69 Don't assume false means "use state" Travis Ralston 2017-11-04 19:52:42 -07:00
  • ef45d82ec6 Fix URL preview save calls Travis Ralston 2017-11-04 19:52:20 -07:00
  • b75be41f94 Fix split-brain for blacklistUnverifiedDevices Travis Ralston 2017-11-04 19:52:06 -07:00
  • d14285eb08 fix secondary accent color tinting Matthew Hodgson 2017-11-05 02:20:12 +00:00
  • cb17c0a379 Migrate blacklistUnverifiedDevicesPerRoom Travis Ralston 2017-11-04 19:15:55 -07:00
  • 68115f5b9c tint when theming correctly Matthew Hodgson 2017-11-05 00:40:38 +00:00
  • 555847e5e9 make default theme actually work Matthew Hodgson 2017-11-05 00:40:13 +00:00
  • 8587b36715 Merge branch 'develop' into matthew/status Matthew Hodgson 2017-11-04 23:51:26 +00:00
  • 816042d3a8 Merge branch 'develop' into matthew/status Matthew Hodgson 2017-11-04 23:51:20 +00:00
  • e72e30197a calculate new CSS tinting when we change theme Matthew Hodgson 2017-11-04 23:50:57 +00:00
  • 9a0bbfb871 tint the colours in the theme rather than hardcode vector green Matthew Hodgson 2017-11-04 23:43:34 +00:00
  • b2ddcb8027 tint the colours in the theme rather than hardcode vector green Matthew Hodgson 2017-11-04 23:43:20 +00:00
  • c7eee36990 Fix lanugage detection Travis Ralston 2017-11-04 16:38:26 -06:00
  • 4f1ad974fc Delay URL preview saving until the save button is pressed Travis Ralston 2017-11-04 16:32:13 -06:00
  • adedf23cfb remove unnamespaced CSS fail Matthew Hodgson 2017-11-04 22:19:06 +00:00
  • 358298e4ee Support room color in settings Travis Ralston 2017-11-04 16:10:25 -06:00
  • bb5f7bed85 Check the correct event type for the room Travis Ralston 2017-11-04 15:48:24 -06:00
  • a8169a682c Throw errors if the setting isn't known Travis Ralston 2017-11-04 15:46:15 -06:00
  • 257e1aabb8 Improve documentation of settings Travis Ralston 2017-11-04 15:44:01 -06:00
  • ae844a048f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-04 15:42:03 +00:00
  • 3fd5937687 Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing Matthew Hodgson 2017-11-04 15:41:57 +00:00
  • b4b4fefffb Translated using Weblate (Russian) Andrey 2017-11-04 08:11:00 +00:00
  • 2b49b68ba5 Translated using Weblate (French) Kévin C 2017-11-04 07:26:15 +00:00
  • 8282534f87 Add SettingsLevel enum; Move settings to own file. Travis Ralston 2017-11-03 23:19:45 -06:00
  • 893c39bfbe Merge branch 'develop' into travis/granular-settings Travis Ralston 2017-11-03 22:00:07 -06:00
  • 69939e2fe3 Merge branch 'develop' into travis/granular Travis Ralston 2017-11-03 21:56:46 -06:00
  • 5a1498dec3 CSS for pinned indicators Travis Ralston 2017-11-03 20:01:54 -06:00
  • de6fc32a87 Show an indicator when there are any pins in the room Travis Ralston 2017-11-03 20:00:48 -06:00
  • a2b7f6d30e Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice Travis Ralston 2017-11-03 19:57:39 -06:00
  • 5c37155730 Don't assume we have a valid event. Travis Ralston 2017-11-03 18:18:09 -06:00
  • 3656fdb571 Store read pinned events as an array to avoid racing saves. Travis Ralston 2017-11-03 18:12:57 -06:00
  • 441aa91831 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 23:10:35 +00:00
  • 31c5122fa6 Merge pull request #5293 from turt2live/travis/pinned-led-css Matthew Hodgson 2017-11-03 23:10:31 +00:00
  • f290569487 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 23:10:05 +00:00
  • c0b343c89f Merge pull request #5471 from vector-im/t3chguy/devtools-1 Matthew Hodgson 2017-11-03 23:10:00 +00:00
  • a42414eabd Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 22:44:46 +00:00
  • c90834114b Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms Matthew Hodgson 2017-11-03 22:44:41 +00:00
  • 107f83f84f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 22:44:22 +00:00
  • d4adff3d25 Merge pull request #1575 from matrix-org/luke/fix-flair-store-again Matthew Hodgson 2017-11-03 22:44:16 +00:00
  • 6ddbaebb65 Translated using Weblate (French) Kévin C 2017-11-02 19:12:48 +00:00
  • da23afdec2 Better comment on FlairStore _usersInFlight Luke Barnard 2017-11-03 18:48:15 +00:00
  • 295bdae075 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-11-03 18:47:03 +00:00