Commit Graph

  • 43f27e5d9d Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 15:43:20 +00:00
  • 0f4ca1992d Merge pull request #1506 from matrix-org/dbkr/group_id_alphanum David Baker 2017-10-19 16:43:16 +01:00
  • 19173ab4d6 Space, man. David Baker 2017-10-19 16:31:45 +01:00
  • 4abaa93cf0 Add clientside error for non-alphanumeric group ID David Baker 2017-10-19 16:28:02 +01:00
  • a49eabda4c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into rxl881/parallelshell Richard Lewis 2017-10-19 16:26:22 +01:00
  • b2e9b36978 Merge pull request #5346 from vector-im/dbkr/dialog_pad_right David Baker 2017-10-19 16:19:40 +01:00
  • 7c7cf2714b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 15:18:36 +00:00
  • 21b684381d Merge pull request #1505 from matrix-org/luke/groups-fix-invites-to-unnamed-groups David Baker 2017-10-19 16:18:32 +01:00
  • ca00a64da5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 15:03:31 +00:00
  • 8b047737b9 Merge pull request #1504 from matrix-org/dbkr/group_add_warning Luke Barnard 2017-10-19 16:03:27 +01:00
  • 9141ba280a Lint David Baker 2017-10-19 15:55:57 +01:00
  • ea459c84ba Other dialog subclasses have padding-right David Baker 2017-10-19 15:48:56 +01:00
  • ea1dbe1f76 Fix invites to groups without names Luke Barnard 2017-10-19 15:47:52 +01:00
  • f98fe7fa87 Add warning when adding group rooms/users David Baker 2017-10-19 15:37:35 +01:00
  • 6929442fc0 Don't ignore package-lock.json Richard Lewis 2017-10-19 15:34:26 +01:00
  • 86226bc22d Add padding-right to Dialogs David Baker 2017-10-19 15:32:28 +01:00
  • 289743c5fe Merge pull request #5344 from vector-im/dbkr/error_warning_color Luke Barnard 2017-10-19 15:31:03 +01:00
  • acb678afbd Merge pull request #5343 from vector-im/luke/groups-are-communities Luke Barnard 2017-10-19 15:30:39 +01:00
  • 42ca840fef Add div.warning and use the scss var David Baker 2017-10-19 15:17:09 +01:00
  • fc87fd2bb4 Merge pull request #5342 from vector-im/dbkr/add_rooms_button_no_swallow_clicks David Baker 2017-10-19 15:07:52 +01:00
  • 284b8803c0 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 14:07:45 +00:00
  • 388218be6e Translated using Weblate (German) Bamstam 2017-10-19 12:33:59 +00:00
  • e324511143 Merge pull request #1503 from matrix-org/luke/groups-are-communities-2 Luke Barnard 2017-10-19 15:07:40 +01:00
  • e5df06b2ab Groups->Communities Luke Barnard 2017-10-19 15:07:22 +01:00
  • 2be0ebdd1d More Groups->Communities Luke Barnard 2017-10-19 15:01:16 +01:00
  • 9d8b59e082 Make the 'add rooms' button clickable David Baker 2017-10-19 14:54:56 +01:00
  • 7395d866f6 Translated using Weblate (German) Bamstam 2017-10-19 12:11:59 +00:00
  • c4de42c6af switch back to tint-friendly luke room icons Matthew Hodgson 2017-10-19 14:59:50 +02:00
  • d397858e81 Don't remove other plural variants David Baker 2017-10-19 14:39:23 +01:00
  • 28c4e80870 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 11:16:19 +00:00
  • fd65cb1396 Merge pull request #1501 from matrix-org/luke/groups-are-communities Luke Barnard 2017-10-19 12:16:15 +01:00
  • 00f902cab1 Add script to prune unused translations David Baker 2017-10-19 12:11:53 +01:00
  • 8a9de7343c Add script to prune unused translations David Baker 2017-10-19 12:11:21 +01:00
  • 9d40e1ad46 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 11:05:10 +00:00
  • 059f46b7a5 Merge pull request #1500 from matrix-org/luke/groups-flair-store Luke Barnard 2017-10-19 12:05:06 +01:00
  • bafa2c6be0 Fix typo Luke Barnard 2017-10-19 12:03:59 +01:00
  • 25d14af616 Export a global.singletonFlairStore to allow cross-project singleton Luke Barnard 2017-10-19 12:00:03 +01:00
  • c3f143acc3 Merge branch 'develop' into luke/groups-are-communities Luke Barnard 2017-10-19 11:31:00 +01:00
  • 2db0eab5c5 s/Groups/Communities Luke Barnard 2017-10-19 11:29:03 +01:00
  • ae9263fa59 Merge pull request #5338 from vector-im/dbkr/i18n_script Luke Barnard 2017-10-19 11:25:40 +01:00
  • 6cf0a4a6d7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 10:18:34 +00:00
  • b1a59d73fd Translated using Weblate (German) Bamstam 2017-10-19 08:35:21 +00:00
  • 17c610559f Merge pull request #1499 from matrix-org/dbkr/i18n_script David Baker 2017-10-19 11:18:29 +01:00
  • f712804018 Add note about it apparently segfaulting on node 6 David Baker 2017-10-19 11:13:42 +01:00
  • 4e31aea402 Switch to gen-i18n script David Baker 2017-10-19 10:53:02 +01:00
  • 027a70ffe7 Add gen-i18n as a 'binary' David Baker 2017-10-19 10:51:54 +01:00
  • 71443e9b94 Remove logs comments Luke Barnard 2017-10-19 10:34:24 +01:00
  • 5f3c06b38a Factor out Flair cache into FlairStore Luke Barnard 2017-10-19 10:28:59 +01:00
  • 61b05e7ec3 Add i18n script to package.json David Baker 2017-10-19 10:19:43 +01:00
  • 9442184d0d Updated parallelshell dep to ^3.0.2 to match riot-web. Richard Lewis 2017-10-19 10:18:31 +01:00
  • 568cd0aac6 Update parallelshell to ^3.02 Richard Lewis 2017-10-19 10:12:00 +01:00
  • ae3229b40c Add package-lock.json to VC Richard Lewis 2017-10-19 10:11:33 +01:00
  • 987072b25a Translated using Weblate (German) Krombel 2017-10-19 08:25:16 +00:00
  • 6910b83c20 Merge pull request #5334 from vector-im/dbkr/use_t_normally David Baker 2017-10-19 10:08:51 +01:00
  • 42ddafcfd4 comment David Baker 2017-10-19 10:03:47 +01:00
  • 99520779e8 Translated using Weblate (German) Krombel 2017-10-19 08:29:25 +00:00
  • a81f654838 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 08:23:23 +00:00
  • e56f9ec63b Merge pull request #1498 from matrix-org/dbkr/geni18n-html Luke Barnard 2017-10-19 09:23:20 +01:00
  • 4711356c3f Merge pull request #5330 from vector-im/matthew/cosmetics Luke Barnard 2017-10-19 09:20:46 +01:00
  • 2d3885b146 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-19 08:20:31 +00:00
  • 9180508bf8 Translated using Weblate (Russian) Andrey 2017-10-18 17:26:05 +00:00
  • 1c8c393a44 Merge pull request #1497 from matrix-org/matthew/cosmetics2 Luke Barnard 2017-10-19 09:20:25 +01:00
  • 7fe8c9cb01 fix lint Matthew Hodgson 2017-10-19 01:48:49 +02:00
  • 137cf32d3b Use _t as _t David Baker 2017-10-18 19:39:51 +01:00
  • 1bada070ca Make gen-i18n support 'HTML' David Baker 2017-10-18 19:36:07 +01:00
  • 7bb0ed4a66 fix room add icon Matthew Hodgson 2017-10-18 19:56:39 +02:00
  • 6b589c4945 fix room icon up Matthew Hodgson 2017-10-18 19:40:31 +02:00
  • fe490341d0 replace placeholder groups icon with a themable one Matthew Hodgson 2017-10-18 19:28:19 +02:00
  • 1087b36597 fix editing visuals on groupview header Matthew Hodgson 2017-10-18 17:32:46 +01:00
  • 2781a04eca Translated using Weblate (Russian) Andrey 2017-10-18 16:37:13 +00:00
  • 6e24f4ba09 fix editing visuals Matthew Hodgson 2017-10-18 17:31:42 +01:00
  • a40704f085 Merge branch 'develop' into luke/groups-are-communities Luke Barnard 2017-10-18 15:57:37 +01:00
  • 0ba409a715 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-18 14:54:26 +00:00
  • 653d5c7365 Translated using Weblate (German) Krombel 2017-10-18 14:25:07 +00:00
  • 9160b70e12 Merge pull request #1493 from matrix-org/dbkr/geni18n David Baker 2017-10-18 15:54:21 +01:00
  • f3b1c6cc5b Add newlines to end of file Travis Ralston 2017-10-18 08:50:34 -06:00
  • 12d6722265 Re-run the fun David Baker 2017-10-18 15:48:33 +01:00
  • e6ff09a99b Merge remote-tracking branch 'origin/develop' into dbkr/geni18n David Baker 2017-10-18 15:47:42 +01:00
  • d29ccbdea9 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-18 14:19:29 +00:00
  • 474b0c96ad Merge pull request #1495 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2017-10-18 15:19:24 +01:00
  • 15cadd864c Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-18 14:18:25 +00:00
  • 577d68f628 Merge pull request #1494 from matrix-org/luke/groups-auto-relate-group-to-added-room David Baker 2017-10-18 15:18:21 +01:00
  • 96cc74ab62 Attempt to relate a group to a room when adding it Luke Barnard 2017-10-18 15:00:54 +01:00
  • 2bbac903f1 'base file' is a bit overloaded by weblate David Baker 2017-10-18 14:45:04 +01:00
  • caa4979e37 Comment ignoring getTKey returning null David Baker 2017-10-18 14:43:18 +01:00
  • 63a7d37f5a commented logging David Baker 2017-10-18 14:41:54 +01:00
  • a2bfdd8925 missing saemi David Baker 2017-10-18 14:33:21 +01:00
  • f759467193 Get English plural strings from an input file David Baker 2017-10-18 14:30:55 +01:00
  • f5a4dcd201 Merge remote-tracking branch 'origin/develop' into dbkr/geni18n David Baker 2017-10-18 14:07:45 +01:00
  • e5c128fcb8 Move group ui buttons to group settings Luke Barnard 2017-10-18 13:47:59 +01:00
  • 11761f535d Copyright David Baker 2017-10-18 13:39:04 +01:00
  • 47dcf4849e Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-18 09:13:05 +00:00
  • b211b9d344 Translated using Weblate (Russian) Walter 2017-10-17 20:24:29 +00:00
  • 8c162766fe Merge pull request #1490 from matrix-org/luke/groups-move-buttons Luke Barnard 2017-10-18 11:12:58 +02:00
  • 677c8e95ee Merge branch 'develop' into luke/groups-move-buttons Luke Barnard 2017-10-18 10:31:54 +02:00
  • 7eeed3e093 Simplify MemberEventListSummary by using pluralization provided by the i18n library Stefan Parviainen 2017-10-17 23:46:23 +02:00
  • fc860c66bc De-partify RoomPreviewBar Stefan Parviainen 2017-10-17 22:03:49 +02:00
  • 468a05c6f1 Fix SenderProfile Stefan Parviainen 2017-10-17 21:32:35 +02:00
  • dd33092985 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-10-17 18:30:54 +00:00
  • 62a79d823d Merge pull request #1491 from matrix-org/luke/groups-fix-optional-profile-properties David Baker 2017-10-17 19:30:50 +01:00