Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jarrodek committed Mar 23, 2019
2 parents 520604b + ae4b2e3 commit 93cd898
Show file tree
Hide file tree
Showing 6 changed files with 605 additions and 21 deletions.
3 changes: 1 addition & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "advanced-rest-client",
"description": "The web developers helper program to create and test custom HTTP requests.",
"homepage": "https://advancedrestclient.com/",
"version": "13.0.0",
"version": "13.0.1",
"keywords": [
"chrome",
"REST",
Expand Down Expand Up @@ -55,7 +55,6 @@
"web-animations-js": "web-animations/web-animations-js#^2.3",
"app-pouchdb": "PolymerElements/app-pouchdb#^2.1.1",
"api-console": "mulesoft/api-console#^5.0.0",
"electron-http-transport": "advanced-rest-client/electron-http-transport#^2.0.0",
"host-rules-editor": "advanced-rest-client/host-rules-editor#^2.0.0",
"cookie-manager": "advanced-rest-client/cookie-manager#^2.0.0",
"web-url-input": "advanced-rest-client/web-url-input#^2.0.0",
Expand Down
32 changes: 16 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "advanced-rest-client",
"description": "The Advanced REST Client desktop application.",
"version": "13.0.0",
"version": "13.0.1",
"homepage": "https://advancedrestclient.com",
"license": "Apache-2.0",
"author": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class ElectronAmfService {
opts = {};
}
if (!opts.zip && this._bufferIsZip(buffer)) {
opts.zip = opts;
opts.zip = true;
}
if (!this.amfService) {
this.amfService = new AmfService(buffer, opts);
Expand Down
2 changes: 1 addition & 1 deletion src/arc-electron.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
<link rel="import" href="../bower_components/paper-tabs/paper-tab.html">
<link rel="import" href="../bower_components/request-hooks-logic/request-hooks-logic.html">
<link rel="import" href="../bower_components/arc-request-logic/arc-request-logic.html">
<link rel="import" href="../bower_components/electron-http-transport/electron-http-transport.html">
<link rel="import" href="../bower_components/oauth-authorization/oauth1-authorization.html">
<link rel="import" href="../bower_components/environment-selector/environment-selector.html">
<link rel="import" href="../bower_components/arc-app-mixin/arc-app-mixin.html">
Expand All @@ -65,6 +64,7 @@
<link rel="import" href="../bower_components/arc-electron-experiment-settings/arc-electron-experiment-settings.html">
<link rel="import" href="../bower_components/api-candidates-dialog/api-candidates-dialog.html">
<link rel="import" href="../bower_components/arc-onboarding/arc-onboarding.html">
<link rel="import" href="./electron-http-transport/electron-http-transport.html">
<dom-module id="arc-electron">
<template>
<style>
Expand Down
Loading

0 comments on commit 93cd898

Please sign in to comment.