Commit Graph

  • f2172a1a86 Merge branch 'luke/feature-widget-timeline-events' of github.com:matrix-org/matrix-react-sdk into luke/feature-widget-timeline-events Luke Barnard 2017-08-18 10:44:25 +01:00
  • acc54b97f1 Implement TextualEvent tiles for im.vector.modular.widgets Luke Barnard 2017-08-16 17:46:20 +01:00
  • fe6857c6c2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-08-17 22:55:31 +00:00
  • fd7966b25e Translated using Weblate (Czech) Jan Kudrik 2017-08-17 19:34:07 +00:00
  • 3664a86722 center apps Matthew Hodgson 2017-08-17 23:55:24 +01:00
  • ee383e0570 Merge pull request #1311 from krombel/string_cleanup_translation_change Matthew Hodgson 2017-08-17 20:02:19 +01:00
  • 42d9e3bc8a remove unused strings introduced by string change in bb084595 Krombel 2017-08-17 20:26:34 +02:00
  • bb0845954d improve wording for directory listings Matthew Hodgson 2017-08-17 19:10:45 +01:00
  • 7c04a6671d expand auxPanel when showing apps Matthew Hodgson 2017-08-17 19:06:19 +01:00
  • 93848fab53 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-08-17 18:06:12 +00:00
  • 59d2b4d819 Translated using Weblate (Czech) Jan Kudrik 2017-08-17 18:01:53 +00:00
  • 4981723cea expand auxPanel when showing apps Matthew Hodgson 2017-08-17 19:05:56 +01:00
  • cc3d772f69 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-08-17 17:45:17 +00:00
  • 7114216394 Translated using Weblate (Tamil) Balaji Ravichandran 2017-08-16 12:40:20 +00:00
  • 7023e7e096 Translated using Weblate (German) joe moe 2017-08-16 22:25:00 +00:00
  • e0d292ace5 Translated using Weblate (Czech) Jan Kudrik 2017-08-17 17:21:51 +00:00
  • 24e463116b Merge pull request #4774 from vector-im/rxl881/appFixes Richard Lewis 2017-08-17 18:45:12 +01:00
  • 1bd9590c53 Kick travis Richard Lewis 2017-08-17 18:26:38 +01:00
  • 95d1c3746e Kick travis Richard Lewis 2017-08-17 18:22:52 +01:00
  • b0d088dfd0 Added translation using Weblate (Czech) Jan Kudrik 2017-08-17 17:11:38 +00:00
  • 120a4f4f44 Check for valid roomId before renering manageIntegsButton. Richard Lewis 2017-08-17 18:10:50 +01:00
  • 849097a7a0 Translated using Weblate (Czech) František Šindelář 2017-08-17 16:59:38 +00:00
  • b738fc4319 Translated using Weblate (Czech) Jan Kudrik 2017-08-17 16:57:50 +00:00
  • 0907fff080 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes Richard Lewis 2017-08-17 17:47:46 +01:00
  • 91fe308f06 Merge pull request #1310 from matrix-org/t3chguy/hotfix1 David Baker 2017-08-17 17:31:55 +01:00
  • 48b3075e44 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appFixes Richard Lewis 2017-08-17 17:20:21 +01:00
  • 766c188a1e hotfix bad fn signature regression Michael Telatynski 2017-08-17 17:15:18 +01:00
  • 3dc347fbb8 Kick travis Richard Lewis 2017-08-17 15:25:48 +01:00
  • bdb2d6b475 Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings Michael Telatynski 2017-08-17 13:39:19 +01:00
  • ca5e26744f Make dialog more specific and hide options behind advanced spoiler Michael Telatynski 2017-08-17 13:33:07 +01:00
  • befc9b7a66 Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings Michael Telatynski 2017-08-17 13:31:31 +01:00
  • f0967d4f18 split css out as the modal is no longer generic Michael Telatynski 2017-08-17 13:31:09 +01:00
  • 02edadbd15 Don't bubble cancel click to room header. Richard Lewis 2017-08-17 12:21:44 +01:00
  • d1ee257b5a Pass roomId rather than whole room object. Richard Lewis 2017-08-17 12:15:01 +01:00
  • eb77dcc8e3 Camel case variable name Richard Lewis 2017-08-17 11:24:25 +01:00
  • 2c25639a61 Fix copyright header Richard Lewis 2017-08-17 11:22:42 +01:00
  • 9111cb421e Merge pull request #1291 from matrix-org/rxl881/maxWidgets Richard Lewis 2017-08-17 10:03:42 +01:00
  • e80ddc2513 Merge pull request #1309 from MTRNord/fixRobotTranslation Matthew Hodgson 2017-08-17 00:03:12 +01:00
  • 59815359f8 Add misiing _tJsx import MTRNord 2017-08-16 23:55:43 +02:00
  • fceccfc503 Add missing Robot string to translation MTRNord 2017-08-16 23:54:36 +02:00
  • 38f45bc40d [WIP] app tile click to hide app bodies Luke Barnard 2017-08-16 18:19:12 +01:00
  • 7c336cd00a Implement TextualEvent tiles for im.vector.modular.widgets Luke Barnard 2017-08-16 17:46:20 +01:00
  • 0935f26cf3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop Luke Barnard 2017-08-16 16:04:47 +01:00
  • 0844beac79 Enable matrix-apps by default Luke Barnard 2017-08-16 16:04:39 +01:00
  • 1a7a670c96 Show the group invite dialog David Baker 2017-08-16 14:59:00 +01:00
  • ddf1017799 Make group invites work David Baker 2017-08-16 14:58:30 +01:00
  • 252ab208e4 Merge pull request #1300 from matrix-org/dbkr/userpicker David Baker 2017-08-16 14:29:07 +01:00
  • 14903274c0 Change OOO so that MELS generation will continue over hidden events this fixes the scenario of N Member events, then an invisible event e.g. (m.room.aliases) then more Member events. Pre hide-join-parts this is how it worked. Michael Telatynski 2017-08-16 13:20:32 +01:00
  • b5f959cbdc Merge pull request #1302 from krombel/krombel-patch-translation-link Luke Barnard 2017-08-16 11:56:58 +01:00
  • 5db01373bb Add i18n for Basque (eu), Latvian (lv), Telugu (te) Luke Barnard 2017-08-16 11:15:48 +01:00
  • 6cf671ad42 order languages in copy-res by iso code Luke Barnard 2017-08-16 11:14:24 +01:00
  • 064181731c v0.12.0-rc.1 v0.12.0-rc.1 Luke Barnard 2017-08-16 10:40:28 +01:00
  • 35cd9ca12e Prepare changelog for v0.12.0-rc.1 Luke Barnard 2017-08-16 10:40:27 +01:00
  • e5dd37d2d6 v0.12.0-rc.1 Luke Barnard 2017-08-16 10:39:57 +01:00
  • c07c060b7d Fix jq command to use [] instead of ."matrix-js-sdk" Luke Barnard 2017-08-16 10:22:09 +01:00
  • cc8518101b js-sdk 0.8.0 react-sdk 0.10.0-rc.1 Luke Barnard 2017-08-16 10:10:03 +01:00
  • 222aed896f js-sdk #develop Luke Barnard 2017-08-16 10:06:50 +01:00
  • 8f21ba7f7a js-sdk 0.8.0 Luke Barnard 2017-08-16 09:37:10 +01:00
  • d684a33ae9 Fix translations Luke Barnard 2017-08-15 18:23:11 +01:00
  • a379f04ca8 Merge pull request #1306 from matrix-org/luke/fix-te-i18n-variables Luke Barnard 2017-08-15 18:18:54 +01:00
  • 6068647840 Merge pull request #4797 from RiotTranslateBot/weblate-riot-web-riot-web Luke Barnard 2017-08-15 18:16:10 +01:00
  • eae5a45ec2 Fix variable case Luke Barnard 2017-08-15 18:02:46 +01:00
  • 063cbcfc73 Merge pull request #1303 from matrix-org/luke/fix-autocomplete-by-mxid Luke Barnard 2017-08-15 17:32:03 +01:00
  • 036fa0e944 Merge pull request #1305 from matrix-org/t3chguy/fix_async_modal Luke Barnard 2017-08-15 17:31:45 +01:00
  • 9818007022 Fix i18n variable names and )s syntax for TE.json (Tegulu) Luke Barnard 2017-08-15 17:29:55 +01:00
  • 60c2532616 Merge pull request #1304 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk Luke Barnard 2017-08-15 16:27:42 +01:00
  • 72a412589d Fix vector-im/riot-web#4799 regression by fixing fn signature Michael Telatynski 2017-08-15 15:52:38 +01:00
  • 454a848e47 Remove erroneous line Luke Barnard 2017-08-15 15:10:23 +01:00
  • b40cc111bd Remove incidental diff syntax Luke Barnard 2017-08-15 15:03:25 +01:00
  • d443368aa3 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop Weblate 2017-08-15 14:00:35 +00:00
  • 97ee9d72db Translated using Weblate (Ukrainian) strix aluco 2017-06-25 05:09:21 +00:00
  • df898e1c45 Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-07-04 10:04:21 +00:00
  • 5112134345 Translated using Weblate (Telugu) Sri Lakshmi 2017-08-09 14:52:10 +00:00
  • 29b5a03e02 Translated using Weblate (Swedish) Max Sandholm 2017-06-30 01:48:47 +00:00
  • 4da6c811e9 Translated using Weblate (Spanish) Simó Albert i Beltran 2017-07-26 18:26:04 +00:00
  • 7bc754618e Translated using Weblate (Russian) Alexey Murz Korepov 2017-08-13 18:08:33 +00:00
  • 2f373de574 Translated using Weblate (Portuguese (Brazil)) daniel tygel 2017-08-03 13:43:55 +00:00
  • 435028a68b Translated using Weblate (Polish) Tomasz Kontusz 2017-08-07 12:51:42 +00:00
  • 3e765d52bc Translated using Weblate (Malayalam) test9753 2017-07-08 02:54:49 +00:00
  • 430389309d Translated using Weblate (Latvian) Lauris Mierkalns 2017-07-22 03:10:26 +00:00
  • 535b16ac3f Translated using Weblate (Japanese) yuurii 2017-08-03 11:31:19 +00:00
  • e7ccd6792c Translated using Weblate (Italian) random 2017-08-11 13:18:01 +00:00
  • 2c3484bfe6 Translated using Weblate (Indonesian) Oon Arfiandwi 2017-08-13 09:38:04 +00:00
  • 013fa108b5 Translated using Weblate (Hungarian) Kevin Németh 2017-08-11 09:44:03 +00:00
  • 3578234689 Translated using Weblate (German) Bamstam 2017-08-14 22:45:54 +00:00
  • b77aa5b2a8 Translated using Weblate (French) Brendan Abolivier 2017-08-12 22:00:31 +00:00
  • b3989bb01a Translated using Weblate (Esperanto) Ross Schulman 2017-07-08 03:28:50 +00:00
  • c332a26322 Translated using Weblate (English) Andrey 2017-06-27 02:38:40 +00:00
  • bd2fd07959 Translated using Weblate (Dutch) Nathan van Beelen 2017-07-07 20:34:09 +00:00
  • 7d7afeb276 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-08-03 06:17:58 +00:00
  • 9150b687eb Translated using Weblate (Chinese (Simplified)) Tong Hui 2017-07-04 17:26:32 +00:00
  • cc6af53db8 Translated using Weblate (Basque) Osoitz 2017-08-03 06:32:02 +00:00
  • 14c474c6ef Translated using Weblate (Arabic) Rami Taibah 2017-07-11 20:24:58 +00:00
  • e1ddd3781d Merge branch 'dbkr/userpicker' into dbkr/group_userlist David Baker 2017-08-15 14:10:45 +01:00
  • 5b1467a4c9 Allow autocompletion when typing user IDs Luke Barnard 2017-08-15 14:08:26 +01:00
  • 753ea38654 Add UserAddress David Baker 2017-08-15 14:01:50 +01:00
  • 0df8a63847 de-lint Invite.js David Baker 2017-08-15 13:50:15 +01:00
  • 81273ec855 Move non-invite specific stuff to UserAddress David Baker 2017-08-15 13:42:23 +01:00
  • bbcf7e1d9b s/inviteList/userList/ David Baker 2017-08-15 13:30:13 +01:00
  • 57eb2feeb6 Make right panel collpasing work in GroupView David Baker 2017-08-15 13:18:16 +01:00