Commit Graph

  • b95da4a40c No longer need counterpart David Baker 2017-05-25 11:40:31 +01:00
  • ee85eb961a Bulk change counterpart imports David Baker 2017-05-25 11:39:56 +01:00
  • 5c359e63ab Bulk change counterpart imports David Baker 2017-05-25 11:39:08 +01:00
  • 5531f27435 Make the left panel more friendly to new users David Baker 2017-04-26 18:59:16 +01:00
  • ec146c7f45 Switch to stock counterpart David Baker 2017-05-25 11:24:17 +01:00
  • c894c83fbe Remove GuestWarningBar Luke Barnard 2017-05-25 11:02:48 +01:00
  • 365a46777c Remove GuestWarningBar Luke Barnard 2017-05-25 11:02:26 +01:00
  • 36ec156d2e Merge pull request #4015 from vector-im/luke/new-guest-access-default-welcome Luke Barnard 2017-05-25 10:28:55 +01:00
  • e253f86c63 Improve teamToken prop doc on homePage Luke Barnard 2017-05-25 10:23:26 +01:00
  • 43bd88777c Remove potentially confusing sample config Luke Barnard 2017-05-25 10:10:26 +01:00
  • f3fc459875 Merge pull request #922 from matrix-org/luke/new-guest-access-default-welcome Luke Barnard 2017-05-25 10:08:34 +01:00
  • 454134661e Merge pull request #921 from matrix-org/luke/new-guest-access-room-view-store Luke Barnard 2017-05-25 10:07:39 +01:00
  • 8fc44a9b66 Add comment to explain sync_state dispatch Luke Barnard 2017-05-25 09:30:57 +01:00
  • 52a8039eb3 add more generic class for links/highlights within UserSettings Michael Telatynski 2017-05-25 01:21:11 +01:00
  • 8158ec6d54 touchups Michael Telatynski 2017-05-25 01:25:17 +01:00
  • 09d0ab7df5 attempt to make media selector work everywhere (TM) loadDevices not only in electron Michael Telatynski 2017-05-25 01:01:40 +01:00
  • a4b2bacc7e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings Michael Telatynski 2017-05-25 00:26:38 +01:00
  • fffe425730 Add non-null RoomView key Luke Barnard 2017-05-24 18:04:04 +01:00
  • dcf2fb68ae Remove console log Luke Barnard 2017-05-24 18:02:17 +01:00
  • efb6316ba0 Implement default welcome page and allow custom URL /w config Luke Barnard 2017-05-24 17:58:03 +01:00
  • 5f36f797da Implement default welcome page and allow custom URL /w config Luke Barnard 2017-05-24 17:55:36 +01:00
  • c96d93b0d0 Merge branch 'new-guest-access' into luke/new-guest-access-room-view-store Luke Barnard 2017-05-24 17:28:18 +01:00
  • 298c5e4df3 Implement a store for RoomView Luke Barnard 2017-05-24 16:56:13 +01:00
  • b9ac1222ed remove listener on unmount Michael Telatynski 2017-05-24 15:55:37 +01:00
  • a98792b05e auto-launch support, ux =checkbox in UserSettings[Electron] settings are sorta generic, probably reusable for proxy settings Michael Telatynski 2017-05-24 15:52:08 +01:00
  • 1186207658 Initial Electron Settings - for Auto Launch (opens path for Proxy Settings) Michael Telatynski 2017-05-24 15:40:50 +01:00
  • aaf948017a Make language dropdown a more sensible width David Baker 2017-05-24 14:37:12 +01:00
  • b677a2002f Minimal UI fixes David Baker 2017-05-24 14:36:14 +01:00
  • aef068b00e Indenting David Baker 2017-05-24 14:28:30 +01:00
  • d4aa428321 Move translation status image to i18n section David Baker 2017-05-24 14:23:34 +01:00
  • d5425b62a1 Don't inject languages into the config David Baker 2017-05-24 11:27:06 +01:00
  • c2df23395d Fix up language dropdown David Baker 2017-05-24 11:25:06 +01:00
  • edcfb77a6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_call_sleep Michael Telatynski 2017-05-24 10:56:41 +01:00
  • c63e429c76 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep Michael Telatynski 2017-05-24 10:56:36 +01:00
  • a95f3252b8 s/tabs/spaces/ David Baker 2017-05-24 10:48:10 +01:00
  • f412552c2c Fix imports/exports David Baker 2017-05-23 18:32:45 +01:00
  • cc0924f1c7 Fix imports David Baker 2017-05-23 18:16:02 +01:00
  • 9bce417400 fix algorithm ReferenceError MTRNord 2017-05-23 19:00:30 +02:00
  • ff1567ed2a Remove spurious import David Baker 2017-05-23 17:09:09 +01:00
  • af6cc7bf9c I don't really see why this is necessary David Baker 2017-05-23 17:06:49 +01:00
  • caca5cc00b Remove c+ped UserSettingsStore functions David Baker 2017-05-23 17:06:02 +01:00
  • 241d95293e Code style fixes David Baker 2017-05-23 16:44:54 +01:00
  • a6b11968a4 s/tabs/spaces/ David Baker 2017-05-23 16:15:52 +01:00
  • dd1c50ce80 README formatting David Baker 2017-05-23 14:29:21 +01:00
  • d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 David Baker 2017-05-23 15:16:31 +01:00
  • 3f3f230a77 Remove accidentally comitted yarn stuff David Baker 2017-05-23 14:20:51 +01:00
  • 6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 David Baker 2017-05-23 14:12:53 +01:00
  • 46bb29a3af Merge pull request #910 from matrix-org/t3chguy/version_anchor_newtab David Baker 2017-05-23 13:51:40 +01:00
  • a10c2faac1 lets not open an attack vector :) Michael Telatynski 2017-05-23 12:24:27 +01:00
  • b65ba6b080 Merge pull request #919 from matrix-org/rav/delint_slashcommands Michael Telatynski 2017-05-23 12:10:34 +01:00
  • 6d30bc7182 Merge pull request #911 from matrix-org/t3chguy/autofocus_directorysearchbox David Baker 2017-05-23 09:57:20 +01:00
  • 5df4b9de16 Fix lint errors in SlashCommands Richard van der Hoff 2017-05-23 09:44:11 +01:00
  • 26c8540d03 Add in a "verify" slash command to confirm signing keys (#912) Richard van der Hoff 2017-05-23 09:24:18 +01:00
  • 8994c2bad1 missed a concat :) Michael Telatynski 2017-05-22 19:28:01 +01:00
  • e0fb2fd074 /me forgets we don't have babel Michael Telatynski 2017-05-22 19:25:56 +01:00
  • 4bb054c955 electron stuff isn't actually using flow, so don't enable it Michael Telatynski 2017-05-22 19:25:18 +01:00
  • 911c3bcf6e tidy electron files, they were starting to annoy me Michael Telatynski 2017-05-22 19:21:52 +01:00
  • 024964aceb pass call state through, for things that don't have access to full API Michael Telatynski 2017-05-22 18:33:14 +01:00
  • 4944bfdaa2 onAction support in Electron process, disable powersave when in call Michael Telatynski 2017-05-22 18:32:39 +01:00
  • f57d8e4cb9 make ESLint a touch happier Michael Telatynski 2017-05-22 18:31:30 +01:00
  • 755c66b9f1 pass dispatcher through to electron, on a whitelist basis Michael Telatynski 2017-05-22 18:30:45 +01:00
  • 998739a7dc Edit icon and styling Richard Lewis 2017-05-22 18:00:40 +01:00
  • b111579aed App tile events Richard Lewis 2017-05-22 18:00:17 +01:00
  • 7d59742a22 Merge pull request #3975 from vector-im/t3chguy/riot-desktopt-linux-cat David Baker 2017-05-22 16:59:27 +01:00
  • 867f8914e1 Merge pull request #917 from matrix-org/dbkr/use_right_riot_branch Luke Barnard 2017-05-22 16:59:17 +01:00
  • f2e526f1d5 Merge pull request #916 from matrix-org/dbkr/use_right_riot_branch Luke Barnard 2017-05-22 16:57:03 +01:00
  • 6e8516e537 fiiine! Michael Telatynski 2017-05-22 16:53:46 +01:00
  • 52d3dd4de9 cd first so we checkout the right repo David Baker 2017-05-22 16:48:53 +01:00
  • c5a873c316 Remove depth=1 otherwise we won't find the branch David Baker 2017-05-22 16:41:43 +01:00
  • 77cd9d78db Use develop if no matching branch found David Baker 2017-05-22 16:34:15 +01:00
  • b0a824c941 Remove double declaration of TextInputDialog Luke Barnard 2017-05-22 16:28:23 +01:00
  • 2c462bdfb4 Add right-branch logic to travis test script David Baker 2017-05-22 16:27:41 +01:00
  • 05aaa599cc Merge branch 'develop' into new-guest-access Luke Barnard 2017-05-22 16:19:10 +01:00
  • 299dc7fe84 Merge branch 'develop' into new-guest-access Luke Barnard 2017-05-22 16:17:36 +01:00
  • b057e8a92f Merge pull request #3989 from vector-im/luke/new-guest-access-set-pwd-dialog-fuzzy David Baker 2017-05-22 16:15:00 +01:00
  • 9fc57786f1 Add warm-fuzzy for successful password entry Luke Barnard 2017-05-22 16:11:52 +01:00
  • 24584bee4a Merge pull request #3982 from vector-im/luke/new-guest-access-autoFocus-new-password David Baker 2017-05-22 15:57:45 +01:00
  • e4d35881f6 Merge pull request #915 from matrix-org/luke/new-guest-access-autoFocus-new-password David Baker 2017-05-22 15:19:56 +01:00
  • a1f10ff46d Add prop to toggle whether new password input is autoFocused Luke Barnard 2017-05-22 14:46:49 +01:00
  • 5d712d27d3 autoFocus new password input in SetPasswordDialog Luke Barnard 2017-05-22 14:45:40 +01:00
  • e8837d28ef App tile and app dialog styling Richard Lewis 2017-05-22 12:34:27 +01:00
  • 0d70f796e2 Merge pull request #914 from matrix-org/rav/key_formatting Michael Telatynski 2017-05-22 12:14:14 +01:00
  • fc08dc33c6 Group e2e keys into blocks of 4 characters Richard van der Hoff 2017-05-22 12:01:09 +01:00
  • 73ec3e1f4d Merge branch 'master' into develop David Baker 2017-05-22 11:44:31 +01:00
  • 86bce146e8 v0.9.10 v0.9.10 David Baker 2017-05-22 11:41:10 +01:00
  • 734a28e0f3 Prepare changelog for v0.9.10 David Baker 2017-05-22 11:41:09 +01:00
  • 5c4e3cec08 v0.9.10 David Baker 2017-05-22 11:40:10 +01:00
  • c03d12238a Released js-sdk & react-sdk David Baker 2017-05-22 11:39:25 +01:00
  • 2ba7d91869 Merge pull request #913 from matrix-org/rav/factor_out_verify Richard van der Hoff 2017-05-22 11:38:52 +01:00
  • f05de44646 Merge branch 'master' into develop David Baker 2017-05-22 11:37:29 +01:00
  • eadd6192e8 v0.8.9 David Baker 2017-05-22 11:36:56 +01:00
  • 545bcbdc77 Prepare changelog for v0.8.9 David Baker 2017-05-22 11:36:55 +01:00
  • 3a0ee385b8 Released js-sdk David Baker 2017-05-22 11:35:02 +01:00
  • 574b820d11 Factor out DeviceVerifyDialog Richard van der Hoff 2017-05-17 16:40:48 +01:00
  • 90ab4a02f2 add category so it doesn't get dropped into Default/Lost+Found Michael Telatynski 2017-05-20 13:11:31 +01:00
  • 02a1c1868c autoFocus input box Michael Telatynski 2017-05-20 00:07:55 +01:00
  • 47e5e8d678 Moved isTwelveHour alllll the way up to TimelinePanel. Kieran Gould 2017-05-19 22:45:56 +01:00
  • 6b32975e0c Add 12 hour class to mx_EventTile Kieran Gould 2017-05-19 22:26:24 +01:00
  • cae62c8383 MessageTimestamp now has 12 hour prop Kieran Gould 2017-05-19 22:29:06 +01:00
  • f9152b205c Add parameter showTwelveHours to formatTime Kieran Gould 2017-05-19 22:24:02 +01:00