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

Commit Graph

  • 5c51797420 Merge remote-tracking branch 'origin/new-guest-access' into experimental David Baker 2017-06-07 10:51:25 +01:00
  • 332a5b49a5 Merge remote-tracking branch 'origin/develop' into experimental David Baker 2017-06-07 10:51:18 +01:00
  • 9a6e0440f9 Merge pull request #4220 from vector-im/dbkr/right_branch_chop_origin David Baker 2017-06-07 10:50:27 +01:00
  • 9c94f2ac14 Use bash magic instead of sed David Baker 2017-06-07 10:39:46 +01:00
  • b0486e333d Chop off 'origin/' David Baker 2017-06-07 10:35:08 +01:00
  • 784e52f249 Align message timestamp centrally about the avatar mid-point Luke Barnard 2017-06-07 10:19:58 +01:00
  • 012c02ff7d Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-06-07 09:01:10 +00:00
  • fe4738996a Translated using Weblate (Russian) Stanislav N 2017-06-07 05:19:23 +00:00
  • fd8709e434 Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-06-06 20:03:18 +00:00
  • ccb058f4cf Translated using Weblate (Russian) Stanislav N 2017-06-07 05:25:05 +00:00
  • f1fd4e5d26 Translated using Weblate (Hungarian) Szimszon 2017-06-06 20:41:54 +00:00
  • 3d59d72aaa Fixed pagination infinite loop caused by long messages Oliver Hunt 2017-06-07 04:49:41 +01:00
  • 76880e0de7 App icon tile styling Richard Lewis 2017-06-06 23:46:27 +01:00
  • f6f660fa9a Initial app icon tiles Richard Lewis 2017-06-06 23:45:17 +01:00
  • d235e2276f Translated using Weblate (Hungarian) (#4214) RiotTranslate 2017-06-07 00:23:29 +02:00
  • c117ceb0b6 Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-06-06 20:37:25 +00:00
  • f815097ee9 Translated using Weblate (Hungarian) Szimszon 2017-06-06 20:36:21 +00:00
  • 096edabd45 Translated using Weblate (German) Krombel 2017-06-06 20:01:02 +00:00
  • bc4c9ec4fd Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-06-06 18:18:09 +00:00
  • 0f452062b1 Translated using Weblate (German) Bamstam 2017-06-06 17:32:11 +00:00
  • 79d6ced201 change electron -> electron_app which was previously missed Michael Telatynski 2017-06-06 18:39:54 +01:00
  • 080cbea080 Merge pull request #4211 from uhoreg/compact Matthew Hodgson 2017-06-06 18:07:32 +01:00
  • 184c2d5e58 Merge pull request #1015 from matrix-org/t3chguy/random_fix_1 Matthew Hodgson 2017-06-06 18:02:35 +01:00
  • 968e21a67d Merge branch 'master' into develop David Baker 2017-06-06 17:48:32 +01:00
  • 26bb962a3c v0.10.2 v0.10.2 David Baker 2017-06-06 17:45:07 +01:00
  • 88e159e462 Prepare changelog for v0.10.2 David Baker 2017-06-06 17:45:06 +01:00
  • 951b63898b v0.10.2 David Baker 2017-06-06 17:43:57 +01:00
  • 3d51156b7e Temporarily revert David Baker 2017-06-06 17:43:34 +01:00
  • d648dc867e v0.10.2 David Baker 2017-06-06 17:41:57 +01:00
  • a62ed0eb03 reatc-sdk 0.9.2 David Baker 2017-06-06 17:41:26 +01:00
  • 9f15e8e152 Merge branch 'master' into develop David Baker 2017-06-06 17:41:05 +01:00
  • 31f1e421f2 v0.9.2 David Baker 2017-06-06 17:40:30 +01:00
  • 5191f93432 Prepare changelog for v0.9.2 David Baker 2017-06-06 17:40:30 +01:00
  • 00ccf4bb51 Revert "Call MatrixClient.clearStores on logout" David Baker 2017-06-05 15:54:44 +01:00
  • df6940c5f3 Merge pull request #1044 from matrix-org/luke/fix-password-recovery-landing David Baker 2017-06-06 17:27:09 +01:00
  • 205fd1fad4 Allow password reset when logged in Luke Barnard 2017-06-06 17:22:49 +01:00
  • 383f6b619b adjust alignment of message menu button Hubert Chathi 2017-06-06 12:11:02 -04:00
  • 13c780c7c5 add traditional chinese, thai, greek Matthew Hodgson 2017-06-06 16:51:00 +01:00
  • dbbb916be8 Merge pull request #4207 from RiotTranslate/weblate-riot-web-riot-web Matthew Hodgson 2017-06-06 16:45:09 +01:00
  • 71c12b0615 Update from Weblate. (#1042) RiotTranslate 2017-06-06 17:44:28 +02:00
  • 1deadf5aad Merge branch 'new-guest-access' into experimental David Baker 2017-06-06 16:43:01 +01:00
  • 5c1866c1c6 Add get_membership_count scalar API (#1043) Kegsay 2017-06-06 16:41:08 +01:00
  • 8fee4941c3 Merge pull request #4209 from vector-im/dbkr/ilag_fix_tests Luke Barnard 2017-06-06 16:20:14 +01:00
  • 8e288e14bf Add more hacky q.delays David Baker 2017-06-06 15:59:24 +01:00
  • e8353edb06 Disable test postmessag Richard Lewis 2017-06-06 15:57:40 +01:00
  • 15d0bd9271 Partially revert https://github.com/vector-im/riot-web/pull/4201 David Baker 2017-06-06 15:54:45 +01:00
  • 1efd3513f2 Translated using Weblate (German) Bamstam 2017-06-06 13:46:03 +00:00
  • e9f110a4c5 Don't show add widget if there are more than one existing widgets Richard Lewis 2017-06-06 14:50:43 +01:00
  • 99178b7932 [WEBLATE] fix th.json merge issues RiotTranslate 2017-06-06 13:11:24 +00:00
  • 8a6b940520 Merge remote-tracking branch 'origin/develop' into develop RiotTranslate 2017-06-06 13:09:41 +00:00
  • 5ad7099b6c Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-06-05 18:05:43 +00:00
  • 6518b9ac86 Translated using Weblate (Swedish) Max Sandholm 2017-06-05 16:30:37 +00:00
  • 3843762123 Translated using Weblate (Russian) Vladi 2017-06-05 19:00:35 +00:00
  • 82e1959f22 Translated using Weblate (Hungarian) Szimszon 2017-06-05 20:26:04 +00:00
  • d06934c5f6 Add velocity as a dep David Baker 2017-06-06 14:00:36 +01:00
  • 0b56d33bd2 Null guard all interpolated strings passed to _t (#1035) Kegsay 2017-06-06 13:56:37 +01:00
  • fd42698cf0 Added svg for copy icon - I'm not a designer, someone else should probably replace these! Oliver Hunt 2017-06-06 13:21:50 +01:00
  • 503302fcea Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-06-05 23:45:22 +00:00
  • 1ad9e6e6fa Translated using Weblate (Russian) Vladi 2017-06-05 19:07:19 +00:00
  • da2cca539f Translated using Weblate (Hungarian) Szimszon 2017-06-05 20:23:02 +00:00
  • ccafdfd7d3 Translated using Weblate (German) Bitti 2017-06-05 17:54:26 +00:00
  • 4cec4f066d Fix #4191: add defaults to avoid throwing (#4195) Kegsay 2017-06-06 12:38:06 +01:00
  • 7098ca9df0 Added styling for copy to clipboard button - currently using the edit button's image as a placeholder Oliver Hunt 2017-06-06 00:24:30 +01:00
  • dd6171a39e Review changes Oliver Hunt 2017-06-06 12:29:23 +01:00
  • a640e943f7 Added button that copies code to clipboard Oliver Hunt 2017-06-06 00:29:14 +01:00
  • 9c30de0eaa Merge pull request #1041 from matrix-org/dbkr/reset_first_sync_promise David Baker 2017-06-06 11:43:28 +01:00
  • c27f50207d comment David Baker 2017-06-06 11:43:07 +01:00
  • e30fcdba4c Merge branch 'develop' into new-guest-access David Baker 2017-06-06 11:39:47 +01:00
  • 12d2480916 Reset 'first sync' flag / promise on log in David Baker 2017-06-06 11:36:33 +01:00
  • 22df03944c Merge branch 'develop' into new-guest-access David Baker 2017-06-06 10:35:28 +01:00
  • f8198ba9c9 Merge branch 'develop' into new-guest-access David Baker 2017-06-06 10:33:01 +01:00
  • ce01bcac2d Merge pull request #4197 from RiotTranslate/weblate-riot-web-riot-web David Baker 2017-06-06 10:22:45 +01:00
  • e7af9bde23 Merge pull request #1036 from matrix-org/luke/fix-people-section-disappearing-again David Baker 2017-06-06 10:20:44 +01:00
  • ed7c138d91 quick and dirty override to disable MD globally Matthew Hodgson 2017-06-05 21:38:25 +01:00
  • d77a09adba quick and dirty override to disable MD globally Matthew Hodgson 2017-06-05 21:32:51 +01:00
  • a99f6525c9 Merge pull request #1039 from matrix-org/dbkr/ilag_cancel_action David Baker 2017-06-05 21:27:13 +01:00
  • 88e843d992 Merge pull request #4201 from vector-im/luke/fix-tests David Baker 2017-06-05 21:25:59 +01:00
  • ad74075346 Merge pull request #1034 from matrix-org/luke/ilag-i18n Luke Barnard 2017-06-05 20:30:01 +01:00
  • 4ab6dc9ddd Merge branch 'new-guest-access' into luke/ilag-i18n Luke Barnard 2017-06-05 20:28:51 +01:00
  • feaff9d99d Fix tests for new-guest-access Luke Barnard 2017-06-05 20:16:44 +01:00
  • 4e0989b077 Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-06-05 17:11:24 +00:00
  • 86ca384bc4 Translated using Weblate (Swedish) Max Sandholm 2017-06-05 16:30:36 +00:00
  • 6ba1c01ff7 Translated using Weblate (German) Bamstam 2017-06-05 17:13:13 +00:00
  • f6cfff9098 Cancel deferred actions David Baker 2017-06-05 18:37:38 +01:00
  • 0ef800073b App drawer styling Richard Lewis 2017-06-05 18:21:52 +01:00
  • dc4f321707 Pass room and user id to apps draw Richard Lewis 2017-06-05 18:21:31 +01:00
  • e8d5021b48 Translated using Weblate (Thai) Pitchaya Boonsarngsuk 2017-06-05 17:11:30 +00:00
  • 32e3ea0601 Address review comments Richard van der Hoff 2017-06-05 17:58:11 +01:00
  • 3553aea5df Merge pull request #1038 from matrix-org/dbkr/ilag_defer_create_room David Baker 2017-06-05 17:52:57 +01:00
  • 5924654f9d Defer an intention for creating a room David Baker 2017-06-05 17:45:01 +01:00
  • c690acc638 Add missing command Luke Barnard 2017-06-05 17:40:00 +01:00
  • 2030c1882f Merge pull request #1037 from matrix-org/dbkr/fix_create_room_button_ilag Luke Barnard 2017-06-05 17:35:55 +01:00
  • ad87e9bd50 Apply https://github.com/matrix-org/matrix-react-sdk/commit/9cae667c063e67b32e60b89e7256d714a056559b to ilag branch David Baker 2017-06-05 17:28:36 +01:00
  • 7a9784fd6e KeyRequestHandler: clear redundant users/devices on cancellations Richard van der Hoff 2017-06-05 17:26:25 +01:00
  • 998a55a590 Add basic group view Erik Johnston 2017-06-05 16:51:50 +01:00
  • 5e67bcdac7 Merge pull request #4198 from vector-im/luke/ilag-i18n Luke Barnard 2017-06-05 17:00:21 +01:00
  • cc8078837d Remove DM-guessing code (again) Luke Barnard 2017-06-05 16:57:30 +01:00
  • 015cac9a9e Merge pull request #1033 from matrix-org/dbkr/always_show_spinner_during_first_sync David Baker 2017-06-05 16:56:32 +01:00
  • 3dbea45426 Comment David Baker 2017-06-05 16:50:00 +01:00
  • 3c0290588c Always show the spinner during the first sync David Baker 2017-06-05 16:17:32 +01:00