Skip to content

Commit acca958

Browse files
jpevarnekjpevarnek
committed
Merge branch 'release-candidate' into release
2 parents e8c71a6 + 03b78f5 commit acca958

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3181
-332
lines changed

‎bower.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "uProxy",
3-
"version": "0.8.9",
3+
"version": "0.8.10",
44
"dependencies": {
55
"polymer": "^0.5.6",
66
"paper-elements": "Polymer/paper-elements#^0.5.6",
@@ -16,6 +16,7 @@
1616
"core-drawer-panel": "Polymer/core-drawer-panel#^0.5.6",
1717
"core-overlay": "Polymer/core-overlay#^0.5.6",
1818
"paper-toast": "Polymer/paper-toast#^0.5.6",
19+
"paper-dropdown": "Polymer/paper-dropdown#~0.5.6",
1920
"webcomponentsjs": "0.6.1"
2021
},
2122
"resolutions": {

‎package.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "uProxy",
33
"description": "Share your pathway to the Internet",
4-
"version": "0.8.9",
4+
"version": "0.8.10",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/uproxy/uproxy"
@@ -22,11 +22,11 @@
2222
"circular-json": "^0.1.6",
2323
"crypto": "^0.0.3",
2424
"es6-promise": "^2.0.0",
25-
"freedomjs-anonymized-metrics": "~0.1.0",
2625
"freedom-for-chrome": "^0.4.11",
27-
"freedom-for-firefox": "0.6.10",
26+
"freedom-for-firefox": "^0.6.13",
2827
"freedom-social-firebase": "^1.0.1",
29-
"freedom-social-xmpp": "^0.3.6",
28+
"freedom-social-xmpp": "^0.4.0",
29+
"freedomjs-anonymized-metrics": "~0.1.0",
3030
"fs-extra": "^0.12.0",
3131
"grunt": "^0.4.2",
3232
"grunt-browserify": "^3.3.1",
@@ -38,15 +38,17 @@
3838
"grunt-mozilla-addon-sdk": "^0.4.0",
3939
"grunt-string-replace": "^1.0.0",
4040
"grunt-template-jasmine-istanbul": "^0.3.0",
41-
"grunt-ts": "^4.0.0",
41+
"grunt-ts": "~4.1.0",
4242
"grunt-verbosity": "^0.2.2",
4343
"grunt-vulcanize": "^0.6.0",
44+
"i18next-client": "^1.8.2",
4445
"ipaddr.js": "^0.1.3",
4546
"lodash": "^3.7.0",
4647
"regex2dfa": "^0.1.6",
4748
"tsd": "^0.5.7",
48-
"uproxy-lib": "^27.2.0",
49-
"utransformers": "^0.2.1"
49+
"uproxy-lib": "27.2.0",
50+
"utransformers": "^0.2.1",
51+
"xregexp": "^2.0.0"
5052
},
5153
"peerDependencies": {
5254
"freedom": "^0.6.18"

‎src/chrome/app/install-incomplete.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
</head>
2525

2626
<body>
27-
<uproxy-ext-missing></uproxy-ext-missing>
27+
<!-- TODO: Remove dir attribute once the ext-missing element is translated. -->
28+
<uproxy-ext-missing dir='ltr'></uproxy-ext-missing>
2829
</body>
2930

3031
</html>

‎src/chrome/app/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "__MSG_appName__",
44
"description": "__MSG_appDescription__",
55
"minimum_chrome_version": "41.0.2272.63",
6-
"version": "0.8.9",
6+
"version": "0.8.10",
77
"default_locale": "en",
88
"icons": {
99
"128": "icons/128_online.png"

‎src/chrome/app/polymer/ext-missing.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
}
2020
</style>
2121

22+
<!-- TODO: Translate this. Currently not translated because translator.ts is only accessible from the extension. -->
2223
<h1>You're almost ready to use uProxy!</h1>
2324
Download and enable part 1 of uProxy to get started.
2425
<br><br>

‎src/chrome/extension/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "__MSG_extName__",
3-
"version": "0.8.9",
3+
"version": "0.8.10",
44
"manifest_version": 2,
55
"description": "__MSG_extDescription__",
66
"minimum_chrome_version": "41.0.2272.63",

‎src/chrome/extension/polymer/app-missing.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
.highlightedButton {
1717
background: #009688; /* dark green */
1818
color: white;
19+
text-transform: uppercase;
1920
}
2021
</style>
2122
<div>
22-
<h1>You're almost ready to use uProxy!</h1>
23-
<div>Download and enable part 2 of uProxy to get started.</div><br>
24-
<paper-button class='highlightedButton' raised on-tap='{{ downloadApp }}'>NEXT</paper-button>
23+
<h1>{{ 'appMissingTitle' | $$ }}</h1>
24+
<div>{{ 'appMissingMessage' | $$ }}</div><br>
25+
<paper-button class='highlightedButton' raised on-tap='{{ downloadApp }}'>{{ 'next' | $$ }}</paper-button>
2526
</div>
2627

2728
</template>

‎src/chrome/extension/scripts/chrome_tab_auth.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,11 @@ import background = require('./background');
1717
// success.
1818
class ChromeTabAuth {
1919

20-
// last OAuth reponse URL.
21-
private lastOAuthURL_ :string;
22-
2320
constructor() {
2421
}
2522

2623
public login = (oauthInfo :chromeInterface.OAuthInfo) : void => {
27-
if (user_interface.model.reconnecting && this.lastOAuthURL_) {
28-
this.sendCredentials_(this.lastOAuthURL_);
29-
} else {
30-
this.launchAuthTab_(oauthInfo.url, oauthInfo.redirect);
31-
}
24+
this.launchAuthTab_(oauthInfo.url, oauthInfo.redirect);
3225
}
3326

3427

@@ -37,7 +30,6 @@ class ChromeTabAuth {
3730
if (tab.url.indexOf(redirectUrl) === 0) {
3831
chrome.tabs.onUpdated.removeListener(onTabChange);
3932
chrome.tabs.remove(tabId);
40-
this.lastOAuthURL_ = tab.url;
4133
this.sendCredentials_(tab.url);
4234
}
4335
};

‎src/firefox/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"description": "This is the alpha version of uProxy.",
66
"author": "uProxy Team <info@uproxy.org>",
77
"license": "Apache 2.0",
8-
"version": "0.8.9",
8+
"version": "0.8.10",
99
"permissions": {
1010
"private-browsing": true
1111
}

‎src/generic_core/freedom-module.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,7 @@ var dailyMetricsReporter = new metrics_module.DailyMetricsReporter(
119119
{payload: payload, cloudfrontPath: 'submit-rappor-stats'});
120120
}
121121
});
122+
123+
ui_connector.onPromiseCommand(
124+
uproxy_core_api.Command.PING_UNTIL_ONLINE,
125+
core.pingUntilOnline);

0 commit comments

Comments
 (0)