Commit Graph

  • 0d223bd5e4 Merge pull request #1841 from matrix-org/dbkr/set_display_name_text Luke Barnard 2018-04-23 13:20:06 +01:00
  • e4837af72e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-23 10:50:43 +00:00
  • 82f51fb476 Merge pull request #6580 from vector-im/dbkr/fix_favicon_2 David Baker 2018-04-23 11:50:38 +01:00
  • f012dd5f31 Fix favicon David Baker 2018-04-23 11:28:01 +01:00
  • 0f11bc62cc undo code style change Michael Telatynski 2018-04-23 10:58:39 +01:00
  • 5f920f729b Reset accidental merge changes 2.0 Michael Telatynski 2018-04-23 10:35:02 +01:00
  • 057815ac9f Reset accidental merge changes Michael Telatynski 2018-04-23 10:30:14 +01:00
  • 414b9e39cb Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-23 09:15:45 +00:00
  • fa318ef381 Merge pull request #1840 from matrix-org/dbkr/fix_rageshake Luke Barnard 2018-04-23 10:15:39 +01:00
  • d680d805ce Merge branch 'develop' into t3chguy/m.relates_to Michael Telatynski 2018-04-23 10:14:48 +01:00
  • c32fc677b2 Translated using Weblate (Basque) Osoitz 2018-04-23 04:18:28 +00:00
  • c94d5c1a9a Translated using Weblate (Basque) Osoitz 2017-12-16 14:41:15 +00:00
  • d42fa9d17a Hide inline encryption icons except when hovering over a message Eric Newport 2018-04-22 22:30:37 -04:00
  • 75a2be1a8d WIP (doesn't build yet) replacing draft with slate Matthew Hodgson 2018-04-23 01:13:18 +01:00
  • 3ef5b8eb0e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-04-21 19:35:18 +00:00
  • 44d92bb32e Merge pull request #1843 from aidalgol/room-avatar-lightbox Matthew Hodgson 2018-04-21 20:35:13 +01:00
  • 9eb449484e Translated using Weblate (Icelandic) Megumin 2018-04-21 11:26:49 +00:00
  • 5aed7a375d Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-20 16:15:07 +00:00
  • 3d58474295 Translated using Weblate (Hungarian) Szimszon 2018-04-21 06:40:36 +00:00
  • 301798a7f5 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-20 18:12:20 +00:00
  • 03b46e766b Translated using Weblate (French) Val 2018-04-21 13:09:39 +00:00
  • 9d27cb0751 Translated using Weblate (French) Kévin C 2018-04-21 13:09:18 +00:00
  • aa82513c7e Translated using Weblate (French) Kévin C 2017-11-01 20:03:41 +00:00
  • 269190266a Translated using Weblate (Bulgarian) Slavi Pantaleev 2018-04-21 11:38:56 +00:00
  • 4107c64ac2 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-23 16:12:56 +00:00
  • a8e578f5b8 Move and reword note about out-of-date dev setup Aidan Gauland 2018-04-21 21:52:56 +12:00
  • 6d74d5f8b7 Correct instructions to use the i18n scripts Aidan Gauland 2018-04-21 21:36:41 +12:00
  • ff214c48f5 Translated using Weblate (Icelandic) Sveinn í Felli 2018-04-21 08:08:10 +00:00
  • a012522e88 Translated using Weblate (Icelandic) Sveinn í Felli 2018-04-21 07:08:20 +00:00
  • 9036f14e84 Translated using Weblate (Hungarian) Gergely Bakos 2018-04-18 19:36:16 +00:00
  • 8ed2dadc3b Translated using Weblate (Hungarian) Szimszon 2018-04-21 06:31:59 +00:00
  • 6a918861bb Add UI for displaying room avatars full size Aidan Gauland 2018-04-21 15:47:31 +12:00
  • 99c4951074 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2018-04-21 02:44:20 +00:00
  • e450f31588 Translated using Weblate (Chinese (Traditional)) Yao Wei 2018-04-03 04:39:26 +00:00
  • 144ba30e6b Translated using Weblate (Russian) Andrey 2018-04-20 18:58:59 +00:00
  • 7c15c6847b Translated using Weblate (Russian) Andrey 2017-10-20 19:34:48 +00:00
  • 9cb26c8748 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-12 10:32:56 +00:00
  • ffba7e0d32 Translated using Weblate (German) Krombel 2018-04-20 14:57:39 +00:00
  • 1396a26b6d Translated using Weblate (German) Bamstam 2017-11-03 23:48:08 +00:00
  • 8d88e3be11 Run i18n and prune i18n David Baker 2018-04-20 15:53:35 +01:00
  • 196b855cd5 Merge translations from riot-web David Baker 2018-04-20 15:50:23 +01:00
  • ce3d813c12 Prune i18n David Baker 2018-04-20 15:37:19 +01:00
  • 6154c13c95 Re-run npm run i18n David Baker 2018-04-20 15:35:31 +01:00
  • c98e977533 Merge pull request #6569 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2018-04-20 15:31:30 +01:00
  • 189e7e628b Translated using Weblate (Danish) Morten Juhl-Johansen Zölde-Fej 2018-04-10 10:06:46 +00:00
  • 1d43870433 Merge branch 'develop' of https://github.com/vector-im/riot-web into develop Weblate 2018-04-20 14:17:09 +00:00
  • 33920d72f6 Translated using Weblate (Polish) adrian-007 2018-04-19 14:24:29 +00:00
  • 4b8985f850 Translated using Weblate (Icelandic) Megumin 2018-04-20 10:57:09 +00:00
  • 0be1d8e854 Translated using Weblate (Hungarian) Gergely Bakos 2018-04-18 19:37:51 +00:00
  • db3db2c49e Translated using Weblate (French) Kévin C 2018-04-20 06:51:32 +00:00
  • fb2f063f58 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-19 07:00:05 +00:00
  • a3c03de75e Merge pull request #1842 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2018-04-20 15:03:32 +01:00
  • 54561b655a Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop Weblate 2018-04-20 13:57:45 +00:00
  • 105a0d6891 Translated using Weblate (Polish) adrian-007 2018-04-19 14:28:10 +00:00
  • 53889706d7 Translated using Weblate (Japanese) toriko 2018-04-19 05:30:33 +00:00
  • e04c762a50 Translated using Weblate (Hungarian) Gergely Bakos 2018-04-18 19:34:28 +00:00
  • a5f4782964 Translated using Weblate (French) Kévin C 2018-04-20 06:21:09 +00:00
  • 9685118f16 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-20 07:27:11 +00:00
  • 3b85920424 Use mxid as sender name on set display name David Baker 2018-04-20 14:28:20 +01:00
  • 3ea5fc9185 Fix rageshake David Baker 2018-04-20 14:06:09 +01:00
  • 6177a42dbf Translated using Weblate (German) Krombel 2018-04-20 12:07:09 +00:00
  • 941bb94234 fix reply fallback blunder Michael Telatynski 2018-04-20 10:15:15 +01:00
  • 7e8288f7ae i18n-gen, i18n-prune Michael Telatynski 2018-04-20 09:39:14 +01:00
  • 563fc9adc7 fix bad copy-paste from other diff Michael Telatynski 2018-04-20 09:37:25 +01:00
  • 06408f843b post BigMerge fixup - merge in stuff from riot-web PR Michael Telatynski 2018-04-20 09:23:27 +01:00
  • 58cd585e86 start of BigMerge fixup Michael Telatynski 2018-04-20 09:12:02 +01:00
  • 1853e55431 Translated using Weblate (French) Val 2018-04-19 22:09:39 +00:00
  • ccd295bc00 Translated using Weblate (French) Val 2018-04-19 22:07:45 +00:00
  • d90cd33541 Translated using Weblate (Hungarian) Szimszon 2018-04-18 19:33:40 +00:00
  • b0eb350c41 Translated using Weblate (Slovak) Peter Vágner 2018-04-17 14:13:42 +00:00
  • 45b62e9866 Translated using Weblate (Slovak) Peter Vágner 2018-04-17 14:13:42 +00:00
  • 7934c50407 Translated using Weblate (Russian) Walter 2018-04-16 20:41:50 +00:00
  • 6b509a1222 Translated using Weblate (Japanese) toriko 2018-04-17 12:26:28 +00:00
  • 7700df4c2d Translated using Weblate (Japanese) toriko 2018-04-17 08:09:26 +00:00
  • 8fc7cc4075 Translated using Weblate (Italian) random 2018-04-16 08:37:06 +00:00
  • 249edb7b76 Translated using Weblate (Galician) Xose M 2018-04-15 19:15:39 +00:00
  • 316a1b835f Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-13 03:48:58 +00:00
  • 895521f0e8 Translated using Weblate (Chinese (Simplified)) RainSlide 2018-04-18 12:59:36 +00:00
  • ddc20e2a60 Merge pull request #6500 from vector-im/matthew/fix_layering Matthew Hodgson 2018-04-18 16:30:57 +01:00
  • 1aadaa3cc5 Merge pull request #1836 from matrix-org/matthew/fix_layering Matthew Hodgson 2018-04-18 16:30:55 +01:00
  • 104a4150ae PR feedback; fix staticness and add ;s Matthew Hodgson 2018-04-18 16:20:42 +01:00
  • e046a72750 flesh out status todo comment Matthew Hodgson 2018-04-18 16:20:32 +01:00
  • 92c98aa3e5 displayName should be tracked as static Matthew Hodgson 2018-04-18 16:19:37 +01:00
  • df3fb83da3 move deps to sdk for stuff now in the sdk Matthew Hodgson 2018-04-18 10:53:17 +01:00
  • 0571c596e3 move deps from vector-web to sdk; resolve version mismatches... Matthew Hodgson 2018-04-18 10:53:01 +01:00
  • f84573ec9f convert HomePage to ES6 and split out the vectory bit Matthew Hodgson 2018-04-18 10:23:32 +01:00
  • 7ee534388b convert VectorHomePage into ES6 and have it nicely override HomePage Matthew Hodgson 2018-04-18 10:20:35 +01:00
  • 6d1563449d fix missing NLs Matthew Hodgson 2018-04-17 16:57:08 +01:00
  • 7b53e36698 retheming commentary Matthew Hodgson 2018-04-17 16:55:32 +01:00
  • d91c7f5e54 Add comment about enum hijinks Matthew Hodgson 2018-04-17 16:53:11 +01:00
  • ce809e16d9 fix i18n thinko on createTrackedDialog Matthew Hodgson 2018-04-17 16:51:17 +01:00
  • eca5a965c5 add i18n which weren't correctly copied over from vector-web by copy-i18n Matthew Hodgson 2018-04-17 16:50:24 +01:00
  • e746fc99d3 Translated using Weblate (Slovak) Peter Vágner 2018-04-17 14:04:03 +00:00
  • 1e61091423 Translated using Weblate (Basque) Osoitz 2018-04-17 08:56:06 +00:00
  • c84d279d69 Translated using Weblate (Japanese) lighthawk 2018-04-17 03:07:28 +00:00
  • 21ee1828b3 Translated using Weblate (Japanese) toriko 2018-04-17 01:34:15 +00:00
  • 96ef7b4075 Translated using Weblate (Icelandic) Sveinn í Felli 2018-04-16 09:31:51 +00:00
  • f14e725d13 Translated using Weblate (Icelandic) Sveinn í Felli 2018-04-16 09:10:57 +00:00
  • f1ff09f303 Translated using Weblate (Dutch) Nathan van Beelen 2018-04-16 08:31:27 +00:00
  • 22f5d5ba6a Translated using Weblate (Dutch) Nathan van Beelen 2018-04-16 08:27:28 +00:00