Commit Graph

  • 4a968cd34f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-19 08:02:30 +00:00
  • 0608c67767 Merge branch 'rav/refactor_matrixclient_states' into develop Richard van der Hoff 2017-06-19 09:02:08 +01:00
  • bd1b06c9b4 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-19 07:57:09 +00:00
  • 98f8be45b7 Merge pull request #4325 from vector-im/rav/refactor_matrixclient_states Richard van der Hoff 2017-06-19 08:57:06 +01:00
  • 641f20a4f6 Tweak tests to match updates to matrixchat Richard van der Hoff 2017-06-13 14:45:05 +01:00
  • 115a3deed9 Merge pull request #1102 from matrix-org/rav/refactor_matrixclient_states Richard van der Hoff 2017-06-19 08:53:50 +01:00
  • cb29d92912 Merge pull request #1110 from matrix-org/rav/fix_token_redirect Richard van der Hoff 2017-06-19 08:52:22 +01:00
  • bccf398ab5 Merge pull request #1112 from matrix-org/t3chguy/fix_forwarding Matthew Hodgson 2017-06-19 01:53:44 +01:00
  • 032650e095 Merge branch 'develop' into t3chguy/fix_forwarding Matthew Hodgson 2017-06-19 01:53:35 +01:00
  • 7cbfa228ee Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-18 23:54:13 +00:00
  • 1c82b7b0c3 add register button Matthew Hodgson 2017-06-19 00:54:07 +01:00
  • b7368fa933 Translated using Weblate (Esperanto) Raul 2017-06-18 23:29:54 +00:00
  • fac98d16dd fix broken i18n Matthew Hodgson 2017-06-19 00:11:34 +01:00
  • 022161b78f fix broken vars Matthew Hodgson 2017-06-19 00:08:24 +01:00
  • ecf163d4e7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-18 23:01:19 +00:00
  • 1a72d3134c Translated using Weblate (Esperanto) Raul 2017-06-18 23:00:43 +00:00
  • 612cad5d9e fix broken vars Matthew Hodgson 2017-06-19 00:01:11 +01:00
  • 9b1b5b3a4b Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-18 22:54:37 +00:00
  • 6b1ffaff7a fix broken http status i18n Matthew Hodgson 2017-06-18 23:54:29 +01:00
  • ffa24eac84 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-18 22:50:33 +00:00
  • 82eb69324d Translated using Weblate (Esperanto) Raul 2017-06-18 22:50:04 +00:00
  • eaf61526fb add new languages Matthew Hodgson 2017-06-18 23:50:13 +01:00
  • 6e97f98a8a Merge pull request #1114 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk Matthew Hodgson 2017-06-18 23:49:57 +01:00
  • 47906d23f0 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-18 22:49:23 +00:00
  • 2fa05f8d61 Translated using Weblate (Esperanto) Raul 2017-06-18 22:49:06 +00:00
  • 6bee3f22da Merge pull request #4346 from RiotTranslateBot/weblate-riot-web-riot-web Matthew Hodgson 2017-06-18 23:49:20 +01:00
  • 396ecf6570 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-18 22:45:15 +00:00
  • f9ef5e8498 Translated using Weblate (Esperanto) Raul 2017-06-18 22:44:39 +00:00
  • cf9cd503e5 Merge pull request #4337 from vector-im/t3chguy/fix_forwarding Matthew Hodgson 2017-06-18 23:45:12 +01:00
  • 5d370e47d3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-18 22:43:50 +00:00
  • 194ea28956 Translated using Weblate (Ukrainian) strixaluco 2017-06-18 13:34:11 +00:00
  • e957e77d7e Translated using Weblate (Spanish) Sebastián Magrí 2017-06-18 22:43:01 +00:00
  • 4edca7a029 Translated using Weblate (Russian) Walter 2017-06-16 19:38:57 +00:00
  • 48c336a8bd Translated using Weblate (Korean) IMIN 2017-06-18 07:53:26 +00:00
  • 8a76f09250 Translated using Weblate (Hungarian) Szimszon 2017-06-18 21:34:26 +00:00
  • 123d742a60 Translated using Weblate (Dutch) PurgingPanda 2017-06-18 15:11:53 +00:00
  • d05d9ab38f Translated using Weblate (Chinese (Simplified)) zwindl 2017-06-18 02:39:29 +00:00
  • 0e00f708f1 Translated using Weblate (Polish) Szymon Łopaciuk 2017-06-18 22:38:54 +00:00
  • a4abccdcef Translated using Weblate (Esperanto) Raul 2017-06-18 22:40:22 +00:00
  • 6ace710a65 Translated using Weblate (Spanish) Sebastián Magrí 2017-06-18 22:41:39 +00:00
  • 40fa5ddb17 Translated using Weblate (Spanish) Carlos A. Carnero Delgado 2017-06-18 00:58:29 +00:00
  • 23b99f83ce Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-18 20:37:21 +00:00
  • 8bc2b4a122 Translated using Weblate (Spanish) Carlos A. Carnero Delgado 2017-06-18 01:04:59 +00:00
  • 2b3ec55850 Translated using Weblate (Russian) GrigRUSS 2017-06-16 20:29:44 +00:00
  • 9a203aab67 Translated using Weblate (Polish) Szymon Łopaciuk 2017-06-18 19:06:05 +00:00
  • 5cc1f62839 Translated using Weblate (Korean) IMIN 2017-06-18 06:00:03 +00:00
  • ad57dd3169 Translated using Weblate (Italian) alxlg 2017-06-18 08:45:11 +00:00
  • 0635a344ae Translated using Weblate (Hindi) Aviral Dasgupta 2017-06-18 14:49:19 +00:00
  • 12dab61a67 Translated using Weblate (Esperanto) Raul 2017-06-18 20:31:47 +00:00
  • 7ae1a70a8d Translated using Weblate (Chinese (Simplified)) zwindl 2017-06-18 02:39:51 +00:00
  • 4afec6fb7f Merge pull request #4259 from ollieh/code-block-border Matthew Hodgson 2017-06-18 21:37:17 +01:00
  • 886475af7e Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-06-18 15:51:43 +00:00
  • 4d89e997b3 Translated using Weblate (Polish) Szymon Łopaciuk 2017-06-18 15:03:09 +00:00
  • 75b330c208 Translated using Weblate (Dutch) Gary 2017-06-18 10:48:49 +00:00
  • 93a6e03f70 Translated using Weblate (Polish) Przemek Anuszek 2017-06-18 06:52:11 +00:00
  • 851f4d4a87 Added translation using Weblate (Italian) alxlg 2017-06-18 08:02:29 +00:00
  • 1bc9858200 Translated using Weblate (English (United States)) Eric Newport 2017-06-18 06:29:30 +00:00
  • f2fa326c0c Translated using Weblate (Turkish) Elia 2017-06-18 02:06:23 +00:00
  • e0e18d25ea Translated using Weblate (Spanish) David Pérez-Suárez 2017-06-17 23:37:54 +00:00
  • d9b63a482c Translated using Weblate (Spanish) David Pérez-Suárez 2017-06-17 23:37:54 +00:00
  • c585d80e3e Added translation using Weblate (Turkish) Elia 2017-06-17 23:49:43 +00:00
  • 9c8be72574 Translated using Weblate (English (United States)) Christopher Armstrong 2017-06-17 23:42:01 +00:00
  • 18971458df Translated using Weblate (Spanish) Enrique 2017-06-17 10:49:57 +00:00
  • e6551e4590 Translated using Weblate (Spanish) Enrique 2017-06-17 10:19:31 +00:00
  • 7cdb73d74b Translated using Weblate (Russian) Walter 2017-06-16 19:43:35 +00:00
  • 3d0da059dc Translated using Weblate (Hungarian) Szimszon 2017-06-16 17:48:10 +00:00
  • ba95d7a16c Merge pull request #1113 from matrix-org/luke/fix-no-peek-on-create Luke Barnard 2017-06-16 18:35:20 +01:00
  • be58e1095e Don't peek when creating a room Luke Barnard 2017-06-16 18:24:07 +01:00
  • e1b9337bbc Merge pull request #1111 from matrix-org/dbkr/remove_collapse_rhs David Baker 2017-06-16 16:51:48 +01:00
  • 7b4cd31124 make forward_message be friendly with the RVS stuffs Michael Telatynski 2017-06-16 16:12:52 +01:00
  • 274536bf13 change dispatcher forward_event signature Michael Telatynski 2017-06-16 16:11:33 +01:00
  • 8e8af5eb5c Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server David Baker 2017-06-16 15:59:18 +01:00
  • aa7ddfe86e Remove unused collapse_rhs David Baker 2017-06-16 15:47:40 +01:00
  • db3d9c0573 Make Lifecycle.loadSession return an explicit result Richard van der Hoff 2017-06-16 12:20:52 +01:00
  • 5f689b7929 Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp Richard van der Hoff 2017-06-16 15:20:47 +01:00
  • eb1fc9ae2d Avoid transitioning to loggedIn state during token login Richard van der Hoff 2017-06-16 14:33:14 +01:00
  • 6df1574b8b onLoadCompleted is now onTokenLoginCompleted Richard van der Hoff 2017-06-16 15:05:14 +01:00
  • 8c333dc3f7 remove debug and add comment Michael Telatynski 2017-06-16 14:39:31 +01:00
  • 236cf1efb2 Merge remote-tracking branch 'origin/develop' into erikj/group_server David Baker 2017-06-16 14:19:54 +01:00
  • 8cf6712426 v0.11.2-rc.2 v0.11.2-rc.2 David Baker 2017-06-16 13:32:57 +01:00
  • 37a219006d Prepare changelog for v0.11.2-rc.2 David Baker 2017-06-16 13:32:57 +01:00
  • 97611cfd27 v0.11.2-rc.2 David Baker 2017-06-16 13:30:49 +01:00
  • 1a12528634 react-sdk rc.2 David Baker 2017-06-16 13:30:27 +01:00
  • f4f7c605a5 Merge remote-tracking branch 'origin/develop' into release-v0.11.2 David Baker 2017-06-16 13:30:13 +01:00
  • 12ad9a2c58 v0.9.5-rc.2 David Baker 2017-06-16 13:28:49 +01:00
  • 5f42eb73c1 Prepare changelog for v0.9.5-rc.2 David Baker 2017-06-16 13:28:48 +01:00
  • f2bcf4d5f2 Merge remote-tracking branch 'origin/develop' into release-v0.9.5 David Baker 2017-06-16 13:27:30 +01:00
  • 6a2c2d64fa Merge pull request #1109 from matrix-org/rav/fix_cas_login David Baker 2017-06-16 13:21:52 +01:00
  • 490a696567 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-16 12:06:44 +00:00
  • 1f719b3f7d Avoid getting stuck in a loop in CAS login Richard van der Hoff 2017-06-16 13:06:28 +01:00
  • 491d83b17f Enable Korean Translations David Baker 2017-06-16 13:05:56 +01:00
  • 131e3ae68f Merge pull request #1101 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2017-06-16 12:57:56 +01:00
  • 55fad1910a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-16 11:56:45 +00:00
  • 00c2235381 Merge pull request #4323 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2017-06-16 12:56:41 +01:00
  • d2d47bd8a2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-16 11:51:35 +00:00
  • af7a82cdae Translated using Weblate (Korean) IMIN 2017-06-16 10:50:45 +00:00
  • 3884c5ccf0 Log an error on unknown state instead of throwing Richard van der Hoff 2017-06-16 11:51:12 +01:00
  • 5e5639b730 Fix half-written comment Richard van der Hoff 2017-06-16 11:50:53 +01:00
  • aff2a50cdd Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-16 10:48:34 +00:00
  • 5bc676a042 Translated using Weblate (Korean) IMIN 2017-06-16 10:14:10 +00:00