Commit Graph

  • 3cff8c1230 Mark some strings as translatable Stefan Parviainen 2017-09-23 13:46:51 +02:00
  • 4da7a368a4 Fix incorrect variable in string Stefan Parviainen 2017-09-23 10:04:59 +02:00
  • f2f5302a7b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop Stefan Parviainen 2017-09-23 09:47:51 +02:00
  • cc441f42f9 Some more translatable strings Stefan Parviainen 2017-09-23 09:02:51 +02:00
  • 4b7c50810c Merge pull request #1420 from matrix-org/t3chguy/missing-i18n David Baker 2017-09-22 20:58:59 +01:00
  • d4929b558e Add dummy translation function to mark translatable strings Stefan Parviainen 2017-09-22 21:43:27 +02:00
  • 6d530eeb6e apply i18n _t to string which has already been translated Michael Telatynski 2017-09-22 20:04:04 +01:00
  • 813615610f CSS for publicity status & toggle button David Baker 2017-09-22 19:27:36 +01:00
  • af73f1c3bb Add status & toggle for publicity David Baker 2017-09-22 19:27:02 +01:00
  • 791bc5e7ac Create GroupSummaryStore for storing group summary stuff Luke Barnard 2017-09-22 18:52:06 +01:00
  • 86ceef712d Fix broken i18n files David Baker 2017-09-22 18:24:45 +01:00
  • 5004d90a3a Merge remote-tracking branch 'origin/develop' into dbkr/member_list_show_more David Baker 2017-09-22 18:03:16 +01:00
  • de43972881 Merge pull request #1416 from matrix-org/dbkr/truncatedlist_invite David Baker 2017-09-22 18:02:44 +01:00
  • 25da0f6a7a MemberList: show 100 more on overflow tile click David Baker 2017-09-22 17:01:14 +01:00
  • 11f6c8cf53 Fix null pointer David Baker 2017-09-22 16:55:47 +01:00
  • 9cbfc22352 Make the invite section a truncatedlist too David Baker 2017-09-22 16:50:54 +01:00
  • d2334fcd96 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-22 15:32:50 +00:00
  • ae6b705d7b Merge pull request #5103 from vector-im/luke/groups-remove-featured-rooms-and-users Luke Barnard 2017-09-22 16:32:46 +01:00
  • 4c1a85cb71 Merge pull request #1415 from matrix-org/luke/groups-remove-featured-rooms-and-users Luke Barnard 2017-09-22 16:32:40 +01:00
  • a868fa4be9 Merge pull request #1412 from matrix-org/dbkr/truncatedlist_experiment David Baker 2017-09-22 16:25:45 +01:00
  • 2e45f121ee Add missing comma to en_EN.json Luke Barnard 2017-09-22 16:25:31 +01:00
  • 1b67e7d606 CSS for "X" in top right of features users/rooms Luke Barnard 2017-09-22 15:58:36 +01:00
  • 3f9d20de97 Implement removal function of features users/rooms Luke Barnard 2017-09-22 15:55:42 +01:00
  • aed1b9072d Merge pull request #1413 from matrix-org/dbkr/userprovider_lazyload David Baker 2017-09-22 15:16:07 +01:00
  • 40688b1a2b Translated using Weblate (Ukrainian) Walter 2017-09-22 14:01:08 +00:00
  • 77febdedfc Merge pull request #1414 from matrix-org/dbkr/member_list_profiles David Baker 2017-09-22 15:15:55 +01:00
  • 621a108b5e Use flow style function definition for doc David Baker 2017-09-22 15:15:10 +01:00
  • dba48e2f8f use start, end rather than min, max David Baker 2017-09-22 15:07:45 +01:00
  • 0f9f1c85a8 Remove done todo David Baker 2017-09-22 14:58:49 +01:00
  • 4a36e32c8d Show displayname & avatar url in group member list David Baker 2017-09-22 14:52:52 +01:00
  • 87470a690f Translated using Weblate (Ukrainian) Walter 2017-09-22 13:31:05 +00:00
  • 02894ee906 Experimental: Lazy load user autocomplete entries David Baker 2017-09-22 14:31:29 +01:00
  • f1a2b6d327 lint David Baker 2017-09-22 13:35:49 +01:00
  • 16398fbfc2 Allow TruncatedList to get children via a callback David Baker 2017-09-22 13:15:02 +01:00
  • 45c4eeba01 Merge pull request #1411 from matrix-org/dbkr/delint_truncatedlist David Baker 2017-09-22 10:20:26 +01:00
  • 8434a71cf8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-22 09:19:56 +00:00
  • 90f7cecec6 Translated using Weblate (Ukrainian) Walter 2017-09-22 06:45:06 +00:00
  • 7d472a3bdb Translated using Weblate (Swedish) Paul Tötterman 2017-09-22 07:17:28 +00:00
  • 39c7bf633d Merge pull request #5051 from vector-im/dbkr/add_finnish David Baker 2017-09-22 10:19:50 +01:00
  • 29d8df2c9e De-lint TruncatedList David Baker 2017-09-22 10:00:46 +01:00
  • 133e17c1db Merge remote-tracking branch 'origin/develop' into dbkr/add_finnish David Baker 2017-09-22 09:50:56 +01:00
  • e7d6839525 Translated using Weblate (Russian) Andrey 2017-09-22 07:53:45 +00:00
  • f37efcb3c4 Translated using Weblate (German) Bamstam 2017-09-22 07:56:54 +00:00
  • 77efe6a6d0 Merge pull request #1409 from pafcu/develop David Baker 2017-09-22 09:46:50 +01:00
  • 4802b2abc1 Translated using Weblate (Russian) Walter 2017-09-22 06:27:01 +00:00
  • e1f008e0b3 Translated using Weblate (Finnish) Paul Tötterman 2017-09-22 07:15:20 +00:00
  • b7b9330086 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-21 20:57:11 +00:00
  • ef503cca11 Merge branch 'master' into develop David Baker 2017-09-21 21:56:58 +01:00
  • 2b7ee756f8 v0.12.6 v0.12.6 David Baker 2017-09-21 21:53:09 +01:00
  • b25075974c Prepare changelog for v0.12.6 David Baker 2017-09-21 21:53:09 +01:00
  • af3feccc2d v0.12.6 David Baker 2017-09-21 21:50:48 +01:00
  • aaff9133c7 Newer js-sdk & react-sdk for js-sdk build fix David Baker 2017-09-21 21:49:43 +01:00
  • 78e806f7f9 Merge branch 'master' into develop David Baker 2017-09-21 21:48:08 +01:00
  • 3552f08aad v0.10.6 David Baker 2017-09-21 21:47:28 +01:00
  • c40a3b9aab Prepare changelog for v0.10.6 David Baker 2017-09-21 21:47:28 +01:00
  • daac0ebdc0 js-sdk v0.8.4 David Baker 2017-09-21 21:43:35 +01:00
  • 946c439c28 hopefully fix https://github.com/vector-im/riot-web/issues/4166 Matthew Hodgson 2017-09-21 18:56:34 +01:00
  • 6e7ee7ef34 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-21 17:12:15 +00:00
  • 50e6536195 Merge branch 'master' into develop David Baker 2017-09-21 18:11:46 +01:00
  • fbccf22e00 v0.12.5 v0.12.5 David Baker 2017-09-21 18:08:17 +01:00
  • e8c347a755 Prepare changelog for v0.12.5 David Baker 2017-09-21 18:08:17 +01:00
  • 4f8660870a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-21 17:06:45 +00:00
  • dbd4cf8756 Clean on prepublish (#5097) David Baker 2017-09-21 18:06:41 +01:00
  • f450ce422e v0.12.5 David Baker 2017-09-21 18:06:03 +01:00
  • 874e88c4a8 react-sdk v0.10.5 David Baker 2017-09-21 18:05:22 +01:00
  • c6e4f606f9 Merge branch 'master' into develop David Baker 2017-09-21 18:02:16 +01:00
  • 99e4221e61 v0.10.5 David Baker 2017-09-21 18:01:42 +01:00
  • 671743bcae Prepare changelog for v0.10.5 David Baker 2017-09-21 18:01:41 +01:00
  • 3ac67077f9 Merge pull request #1410 from matrix-org/dbkr/prerelease_clean David Baker 2017-09-21 17:59:48 +01:00
  • 7e87964e82 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-21 16:49:59 +00:00
  • 0eefae031f Merge pull request #5096 from vector-im/luke/groups-membership-section-redesign Luke Barnard 2017-09-21 17:49:55 +01:00
  • c19ee66565 Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign Luke Barnard 2017-09-21 17:49:47 +01:00
  • a0b4d8a9f8 Clean on prerelease David Baker 2017-09-21 17:39:34 +01:00
  • 406f36a2d1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-21 16:31:14 +00:00
  • 96b9570465 Update comment Luke Barnard 2017-09-21 17:31:06 +01:00
  • b5f141456c Merge pull request #1406 from matrix-org/luke/groups-add-feature-rooms Luke Barnard 2017-09-21 17:27:40 +01:00
  • 3351770b54 Fix dodgy merge Luke Barnard 2017-09-21 17:26:16 +01:00
  • 411a67c6b0 Remove unneeded strings Stefan Parviainen 2017-09-21 18:25:45 +02:00
  • d75efb83f1 Merge branch 'develop' into luke/groups-membership-section-redesign Luke Barnard 2017-09-21 17:25:12 +01:00
  • cf23ac5931 Merge branch 'develop' into luke/groups-add-feature-rooms Luke Barnard 2017-09-21 17:20:12 +01:00
  • 22580b5fd3 Translated using Weblate (Portuguese) Carlos 2017-09-21 16:12:06 +00:00
  • f27750e03e Merge pull request #1407 from matrix-org/dbkr/groups_is_privileged David Baker 2017-09-21 17:10:28 +01:00
  • 3c2e6fdf9e Honour the is_privileged flag in GroupView David Baker 2017-09-21 16:55:56 +01:00
  • 5f840a3031 Implement adding rooms to the group summary Luke Barnard 2017-09-21 16:53:10 +01:00
  • 3f0ee4e6ad Merge pull request #1405 from matrix-org/dbkr/update_on_group_invite David Baker 2017-09-21 16:39:46 +01:00
  • add91f9a7d Update when a group arrives David Baker 2017-09-21 16:28:49 +01:00
  • 2bc2d30a0e Translated using Weblate (Russian) Andrey 2017-09-21 13:21:28 +00:00
  • 5940b11fd2 Merge pull request #1404 from matrix-org/luke/feature-flair-click-for-group David Baker 2017-09-21 15:18:28 +01:00
  • 96bb804eb8 Redesign membership section of GroupView Luke Barnard 2017-09-21 15:04:16 +01:00
  • 16f5a667c6 Redesign membership section in GroupView Luke Barnard 2017-09-21 15:03:30 +01:00
  • 41a9ff22fb Rename profile object properties to camelCase Luke Barnard 2017-09-21 14:22:43 +01:00
  • 5f73fa5a77 Translated using Weblate (Russian) Walter 2017-09-21 12:29:38 +00:00
  • 60d444b841 Merge pull request #1402 from matrix-org/luke/groups-add-featured-rooms-and-users David Baker 2017-09-21 14:19:58 +01:00
  • e64cc3b666 Implement view_group dispatch when clicking flair Luke Barnard 2017-09-21 13:25:36 +01:00
  • 3f0e596e97 Only show "Add" button when editing the group Luke Barnard 2017-09-21 12:44:17 +01:00
  • 4d9c43b3c8 Display dialog when errors occur whilst featuring users Luke Barnard 2017-09-21 12:34:16 +01:00
  • 9cd4cdf6df Filter group users results based on query Luke Barnard 2017-09-21 10:52:28 +01:00
  • 03ddb63507 Remove redundant slice Luke Barnard 2017-09-21 10:34:11 +01:00
  • e968de12dd Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-09-21 09:26:37 +00:00
  • 1cca4c2133 Fix debug message to be clearer David Baker 2017-09-21 10:26:07 +01:00