Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 5ed1bc5873 Merge pull request #940 from matrix-org/matthew/always-show-ts Matthew Hodgson 2017-05-27 13:03:39 +01:00
  • ded2f95003 Merge pull request #4051 from RiotTranslate/weblate-riot-web-riot-web Matthew Hodgson 2017-05-27 12:32:18 +01:00
  • 1b8360bff6 Merge pull request #943 from RiotTranslate/weblate-riot-web-matrix-react-sdk Matthew Hodgson 2017-05-27 12:31:21 +01:00
  • 94dd41f34e Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-05-27 11:30:15 +00:00
  • b33eab0188 Translated using Weblate (French) nouts 2017-05-27 09:41:10 +00:00
  • 4ff09199d7 Translated using Weblate (Finnish) Tulir Asokan 2017-05-27 07:41:41 +00:00
  • ec418891b1 Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-05-27 11:30:00 +00:00
  • ad2c84375d Translated using Weblate (French) nouts 2017-05-27 10:08:13 +00:00
  • 5a6baafc91 Merge pull request #942 from RiotTranslate/weblate-riot-web-matrix-react-sdk Matthew Hodgson 2017-05-27 11:22:30 +01:00
  • 59a6879db9 Merge pull request #4049 from RiotTranslate/weblate-riot-web-riot-web Matthew Hodgson 2017-05-27 11:21:54 +01:00
  • a60ab42ee3 Added translation using Weblate (Finnish) Tulir Asokan 2017-05-27 07:33:17 +00:00
  • a56e3c3897 Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-05-27 07:08:41 +00:00
  • 9fc20cbd34 Translated using Weblate (French) Amandine 2017-05-26 23:35:36 +00:00
  • 1a3c09dc1b Merge pull request #4048 from RiotTranslate/weblate-riot-web-riot-web Matthew Hodgson 2017-05-27 01:08:21 +01:00
  • 98dc0daf33 Merge pull request #941 from RiotTranslate/weblate-riot-web-matrix-react-sdk Matthew Hodgson 2017-05-27 01:07:41 +01:00
  • 012cdf590a Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-05-26 23:21:48 +00:00
  • ac42fbbd49 Translated using Weblate (Swedish) Max Sandholm 2017-05-26 21:48:34 +00:00
  • 0074fa00ac Translated using Weblate (Russian) dambador 2017-05-26 21:39:41 +00:00
  • 8e250531ce Translated using Weblate (Hungarian) Szimszon 2017-05-26 20:31:02 +00:00
  • 59cb7ad0e6 Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-05-26 23:20:37 +00:00
  • 5d08393eb5 Translated using Weblate (Russian) dambador 2017-05-26 21:39:42 +00:00
  • 88f760a53f Translated using Weblate (German) Krombel 2017-05-26 21:04:44 +00:00
  • b6cd3fcdd2 Translated using Weblate (French) Amandine 2017-05-26 23:20:26 +00:00
  • 03194e66b3 actually wire up alwaysShowTimestamps Matthew Hodgson 2017-05-27 00:14:16 +01:00
  • 1ff6d4846c css for alwaysShowTimestamps Matthew Hodgson 2017-05-27 00:13:59 +01:00
  • 81704a5b5e s/username/User name/ Matthew Hodgson 2017-05-27 00:13:04 +01:00
  • 1c841f27d7 Merge pull request #938 from RiotTranslate/weblate-riot-web-matrix-react-sdk David Baker 2017-05-26 23:01:13 +01:00
  • a12cfdb53c Merge pull request #4040 from RiotTranslate/weblate-riot-web-riot-web Matthew Hodgson 2017-05-26 23:00:35 +01:00
  • d0395b939a Add babel eslint plugin David Baker 2017-05-26 22:59:40 +01:00
  • 22e5e2126b rev-parse the commit from the deps David Baker 2017-05-26 22:51:55 +01:00
  • 35a671d43c more i18n instructions Matthew Hodgson 2017-05-26 22:45:14 +01:00
  • 96393f69b6 Remove old versions before linking react/js sdk David Baker 2017-05-26 22:37:44 +01:00
  • 477396f820 Use first language preference, not last David Baker 2017-05-26 22:28:35 +01:00
  • 34af9f9b4b Added translation using Weblate (Swedish) Max Sandholm 2017-05-26 21:20:15 +00:00
  • 594247dfa9 Translated using Weblate (Russian) Stanislav N 2017-05-26 20:12:53 +00:00
  • 411a8be61d Added translation using Weblate (Hungarian) Szimszon 2017-05-26 20:17:46 +00:00
  • 930e8af48b Translated using Weblate (Russian) Stanislav N 2017-05-26 20:08:38 +00:00
  • 53cb6d1d76 Translated using Weblate (Russian) Stanislav N 2017-05-26 20:11:24 +00:00
  • 765034dc19 Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-05-26 20:10:47 +00:00
  • 5f2012102c Translated using Weblate (Russian) Stanislav N 2017-05-26 20:10:35 +00:00
  • 08529ba5a8 Translated using Weblate (German) Krombel 2017-05-26 20:01:32 +00:00
  • 3a7888e8a8 Translated using Weblate (Russian) Stanislav N 2017-05-26 20:07:23 +00:00
  • db3d455a1d Merge pull request #939 from turt2live/patch-1 Michael Telatynski 2017-05-26 21:05:46 +01:00
  • 84fdcf1fff Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-05-26 20:00:29 +00:00
  • de07654f2d Translated using Weblate (Russian) dambador 2017-05-26 19:52:01 +00:00
  • 65dd2d4db1 Fix PM being AM Travis Ralston 2017-05-26 13:43:01 -06:00
  • 3815872cf7 Merge pull request #4041 from turt2live/patch-1 Matthew Hodgson 2017-05-26 20:12:56 +01:00
  • 8ddf4ced64 Update translating.md: Minor suggestions Travis Ralston 2017-05-26 13:09:40 -06:00
  • cd9d3ea248 Merge branch 'develop' of git://github.com/vector-im/riot-web into develop RiotTranslate 2017-05-26 18:52:19 +00:00
  • b5912d3c92 Merge branch 'develop' of git://github.com/matrix-org/matrix-react-sdk into develop RiotTranslate 2017-05-26 18:52:03 +00:00
  • e46b63dc5a [WEBLATE] fix merging issues RiotTranslate 2017-05-26 18:51:55 +00:00
  • 32207bd058 use develop js-sdk Matthew Hodgson 2017-05-26 19:51:47 +01:00
  • 963c90c833 switch to develop deps... Matthew Hodgson 2017-05-26 19:51:04 +01:00
  • d626542baf Translated using Weblate (German) Krombel 2017-05-26 18:43:23 +00:00
  • 10d2caf5d6 Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-05-26 18:43:09 +00:00
  • 2819799843 Translated using Weblate (German) Krombel 2017-05-26 18:43:08 +00:00
  • c138e4d92e Translated using Weblate (German) Krombel 2017-05-26 18:20:29 +00:00
  • 9fcee811cb Translated using Weblate (French) Amandine 2017-05-26 18:20:28 +00:00
  • 09adfbd6d6 remove stale i18n instructions Matthew Hodgson 2017-05-26 19:39:05 +01:00
  • a77663d18b Translated using Weblate (French) Amandine 2017-05-26 18:17:14 +00:00
  • 1edad35c98 Translated using Weblate (German) Krombel 2017-05-26 18:18:06 +00:00
  • e5ef9f3e3a Merge pull request #918 from matrix-org/t3chguy/electron_call_sleep Matthew Hodgson 2017-05-26 19:09:10 +01:00
  • cddfe7e6ef Fix inconsistent quoting in topic messages David Baker 2017-05-26 19:00:44 +01:00
  • 7034300dd5 A much more cutdown thing without bootstrap, but unfortunately without images and without having tested the links to the rooms actually work, and all the links currently point to lant.uk which obvs needs changing Thomas Lant 2017-05-26 17:57:38 +00:00
  • 563b85ceb8 Merge https://github.com/MTRNord/matrix-react-sdk/pull/115 David Baker 2017-05-26 18:53:23 +01:00
  • 1bcdf31afc Merge pull request #3993 from vector-im/t3chguy/tidy_electron_files Matthew Hodgson 2017-05-26 18:52:41 +01:00
  • ff5adeff2c Merge branch 'develop' into t3chguy/tidy_electron_files Matthew Hodgson 2017-05-26 18:50:48 +01:00
  • fd27d6dab1 Merge pull request #936 from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings Luke Barnard 2017-05-26 18:48:55 +01:00
  • 75eca60d76 Merge pull request #4037 from vector-im/luke/new-guest-access-login-button Matthew Hodgson 2017-05-26 18:47:26 +01:00
  • 445a55c7ca Merge pull request #3992 from vector-im/t3chguy/electron_call_sleep Matthew Hodgson 2017-05-26 18:44:53 +01:00
  • d313f4c7b6 Merge https://github.com/MTRNord/riot-web/pull/70/ David Baker 2017-05-26 18:44:08 +01:00
  • aa604612a7 Add "Login" button to RHS when user is a guest Luke Barnard 2017-05-26 18:42:07 +01:00
  • 5e0457c32d Merge pull request #4035 from vector-im/dbkr/translations David Baker 2017-05-26 18:39:07 +01:00
  • f4184bc695 Merge pull request #934 from matrix-org/dbkr/translations David Baker 2017-05-26 18:38:04 +01:00
  • 8f083a5fdd Welcome page + too much bootstrap stuff for now Thomas Lant 2017-05-26 17:23:34 +00:00
  • 9156a871f5 Merge pull request #3961 from Kieran-Gould/kieran-gould/12hourtimestamp Matthew Hodgson 2017-05-26 18:23:11 +01:00
  • e26422ef10 fix a typo Matthew Hodgson 2017-05-26 18:22:53 +01:00
  • 647c1b6169 Once more, with braces David Baker 2017-05-26 18:19:32 +01:00
  • 97aeb57a8b Merge remote-tracking branch 'origin/develop' into dbkr/translations David Baker 2017-05-26 18:15:32 +01:00
  • 276d3cad9c Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix Luke Barnard 2017-05-26 18:07:10 +01:00
  • 62ffe929e4 Translate Add Threepid labels David Baker 2017-05-26 18:03:24 +01:00
  • cf0073a631 Missing translations in User Interface section David Baker 2017-05-26 17:59:19 +01:00
  • 23fbce66a2 Translate 'email' threepid label David Baker 2017-05-26 17:56:51 +01:00
  • 40680d55e0 Fix merge fail David Baker 2017-05-26 17:55:48 +01:00
  • ed79a3adef Merge pull request #935 from matrix-org/luke/new-guest-access-no-barf-on-username-check-err Matthew Hodgson 2017-05-26 17:47:52 +01:00
  • 44f479c38b Merge pull request #930 from matrix-org/luke/new-guest-access-reset-stores-on-logged-out Matthew Hodgson 2017-05-26 17:45:32 +01:00
  • c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations David Baker 2017-05-26 17:30:02 +01:00
  • ac44151e2a Put the reset method in the right scope... Luke Barnard 2017-05-26 17:27:31 +01:00
  • 9311b9012a Use the same .reset as RoomViewStore Luke Barnard 2017-05-26 17:23:02 +01:00
  • 3d688a6ada Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart Matthew Hodgson 2017-05-26 17:17:23 +01:00
  • 84cef00f1f Mismatched oneUser / severalUsers David Baker 2017-05-26 17:16:23 +01:00
  • d3875ec794 Oops, include file extension in language list David Baker 2017-05-26 17:11:11 +01:00
  • 1c7785535f Merge pull request #929 from matrix-org/luke/new-guest-access-fix-view-next-room Matthew Hodgson 2017-05-26 17:09:35 +01:00
  • fbc3f83625 Merge pull request #928 from matrix-org/luke/new-guest-access-inidicate-joining-early Matthew Hodgson 2017-05-26 17:08:34 +01:00
  • 4fcaccbc7f Merge https://github.com/MTRNord/riot-web/pull/69 David Baker 2017-05-26 16:56:49 +01:00
  • fde553a809 Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp Matthew Hodgson 2017-05-26 16:52:09 +01:00
  • 6c3c4fc547 Language generation and file structure David Baker 2017-05-26 16:48:21 +01:00
  • 9f902c1190 Merge pull request #932 from matrix-org/luke/new-guest-access-no-notif-bar-if-is-guest Luke Barnard 2017-05-26 16:42:12 +01:00
  • e07f9a8bc9 Pass through i18n keys in karma tests David Baker 2017-05-26 15:29:58 +01:00
  • 0f8e560247 Add function to display i18n keys in UI David Baker 2017-05-26 15:29:11 +01:00