enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • 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 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
  • 5aa1bc4185 Rename twentyFourHour Pad time Kieran Gould 2017-05-19 21:31:24 +01:00
  • 008cc95e9c Add 12 hour support Maxwell Kepler 2017-05-18 22:00:44 +01:00
  • 1ebe819aa2 Revert _EventTile.scss padding. Kieran Gould 2017-05-19 21:14:01 +01:00
  • 9e37fa46b1 Add 12 hour support Maxwell Kepler 2017-05-18 22:01:00 +01:00
  • cc3673d2d2 Make the linked versions open a new tab, turt2live complained :P Michael Telatynski 2017-05-19 17:39:21 +01:00
  • 8afc9f9a09 Add widget iframes and styling Richard Lewis 2017-05-19 17:17:48 +01:00
  • dc990f47be Fix app breakage with a 'version' file David Baker 2017-05-19 17:02:48 +01:00
  • a9b5282ba3 Merge pull request #3909 from vector-im/t3chguy/favicon_improvements David Baker 2017-05-19 16:22:11 +01:00
  • 8eea8c0fd7 Merge pull request #909 from matrix-org/rav/fix_missing_page_type Richard van der Hoff 2017-05-19 15:22:18 +01:00
  • d7f1e01cfa Don't fail if reskindex symlink exists David Baker 2017-05-19 14:47:44 +01:00
  • e3dbf057fb Fix 'missing page_type' error Richard van der Hoff 2017-05-17 18:49:59 +01:00
  • c61294f71c Delintify some of MatrixChat (#907) Richard van der Hoff 2017-05-19 13:53:11 +01:00
  • 0a920df05d Merge pull request #3966 from vector-im/rav/more_deflakification Richard van der Hoff 2017-05-19 13:51:51 +01:00
  • ea67fa9c16 More riot-web test deflakification Richard van der Hoff 2017-05-19 13:33:50 +01:00
  • 50b46af943 Merge pull request #3945 from vector-im/dbkr/fetch_deps_script David Baker 2017-05-19 13:14:07 +01:00
  • 68a39b2783 Update process to not set deps to #develop David Baker 2017-05-19 11:59:27 +01:00
  • 4df51a2b0b Reskindex to a temp file, to confuse the babel watcher less (#908) Richard van der Hoff 2017-05-19 11:44:04 +01:00
  • 448ac8dce1 Merge pull request #3964 from vector-im/luke/fix-logo-svgs-style-type Luke Barnard 2017-05-19 11:38:27 +01:00
  • 76bf869d87 Add type="text/css" to SVG logos Luke Barnard 2017-05-19 11:19:30 +01:00
  • da14d7eb8c v0.9.10-rc.1 David Baker 2017-05-19 10:43:11 +01:00
  • 3a44cb65b7 Prepare changelog for v0.9.10-rc.1 David Baker 2017-05-19 10:43:10 +01:00
  • 029dfe5ed0 v0.9.10-rc.1 David Baker 2017-05-19 10:41:22 +01:00
  • c0c1972d56 Released js-sdk & react-sdk David Baker 2017-05-19 10:40:44 +01:00
  • 1addd6e304 v0.8.9-rc.1 David Baker 2017-05-19 10:39:14 +01:00
  • 4cfd04969e Prepare changelog for v0.8.9-rc.1 David Baker 2017-05-19 10:39:14 +01:00
  • f615bc129f Released js-sdk David Baker 2017-05-19 10:37:33 +01:00
  • c51f4b14ea Merge pull request #905 from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy Luke Barnard 2017-05-19 10:08:49 +01:00
  • 2bec44a517 Remove suffix and prefix from login input username Luke Barnard 2017-05-19 10:03:51 +01:00
  • 96c3bf56f8 Implement warm-fuzzy success dialog for SetMxIdDialog Luke Barnard 2017-05-19 09:43:56 +01:00
  • 09f987559b rename action, now forwarding any event is possible, limited by where button is shown, i.e easy to modify Michael Telatynski 2017-05-19 01:30:36 +01:00