Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

smart-mirror 0.0.3 #358

Merged
merged 45 commits into from
Jul 28, 2016
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
072cf0b
RSS Service (#161)
yaydogan Jun 13, 2016
ac20ffd
Removing ding as a result of #287
evancohen Jun 15, 2016
854c9fb
adding installer and a small sound-cloud visualization tweek
evancohen Jun 18, 2016
eeb45c6
[SPELLING] tempreture > temperature (#298)
joelhawksley Jun 20, 2016
056f6ff
[CLEANUP] Remove SCSS (#302)
joelhawksley Jun 23, 2016
b083f60
[FEATURE] Add minutely summary to weather week descriptor (#304)
joelhawksley Jun 24, 2016
f152f87
add Hyperion support (#229)
7h30n3 Jun 28, 2016
7ecb922
Motion detect (#311)
justbill2020 Jun 28, 2016
221a068
[FEATURE] Reload weather every two minutes. (#313)
joelhawksley Jun 29, 2016
227855f
Auto-Sleep / Auto-Wake Functionality + HDMI Power Control (#128)
Jun 29, 2016
995d668
[FEATURE] Group events by day for simpler display. (#314)
joelhawksley Jun 29, 2016
52521fd
Fix broken development branch. (#319)
joelhawksley Jun 29, 2016
4cbb99a
[CLEANUP] Config keys should be camelCased (#320)
joelhawksley Jun 29, 2016
82aa918
resolving merge conflicts
evancohen Jun 30, 2016
4a0e61d
making sense out of all these refreshes. fixing #313
evancohen Jun 30, 2016
d6ec61c
fixing weather refresh
evancohen Jun 30, 2016
fd05157
adding refresh fallback values to all refreshable services
evancohen Jun 30, 2016
b601ca1
taking a crack at #327
evancohen Jul 1, 2016
47d0ffb
[FEATURE] Use Today/Tomorrow/Day name for calendar entries (#329)
joelhawksley Jul 1, 2016
4f88928
[FEATURE] Optionally show calendar names above events (#328)
joelhawksley Jul 1, 2016
bb6fde8
fixing calendar issue for days 7+ out
evancohen Jul 2, 2016
5b28d37
Fixed the discontinued google feed api as defined in #332.
kurtdb Jul 3, 2016
2a7af14
Add the stock-ticker information on screen. (#331)
kurtdb Jul 4, 2016
aafb40c
experamental on-device model trainer (#330)
evancohen Jul 6, 2016
ec4b365
resolving conflicts and preparing for merge
evancohen Jul 7, 2016
392b774
Merge branch 'R3dRuM-master' into dev
evancohen Jul 7, 2016
8a6515a
simplifying example config
evancohen Jul 7, 2016
086d031
checking in bash boot script fixes #109 (#339)
evancohen Jul 10, 2016
9edd1ab
Attempt to improve the RSS functionality.
kurtdb Jul 11, 2016
ac82b6c
Added localization and made use of ng-show to hide fitbit data when n…
dehlen Jul 12, 2016
33a7aa2
Made descriptions consistent, changed some wording or localizations
dehlen Jul 12, 2016
eda23f0
Merge pull request #343 from dehlen/fitbit-localization
kurtdb Jul 12, 2016
5837819
Merge remote-tracking branch 'origin/fitbit-localization' into locale…
dehlen Jul 12, 2016
d4faa2b
Merge pull request #344 from dehlen/locales-consistency
kurtdb Jul 12, 2016
162a64f
Switching to use Dependency CI
evancohen Jul 13, 2016
c868110
Merge pull request #338 from evancohen/rss-update
kurtdb Jul 15, 2016
5320ed8
reverting #311 because of IPC issues
evancohen Jul 16, 2016
b8f64ed
[CALENDAR] Polish day/multi-day formatting. (#347)
joelhawksley Jul 18, 2016
023f086
Added scrobbler support. (#346)
kurtdb Jul 21, 2016
83dd214
Updated the stock information to the yahoo yql service. (#354)
kurtdb Jul 22, 2016
7f451de
Performance improvements (#352)
evancohen Jul 22, 2016
6385727
Fixed issue with an individual stock quote not rendering. (#357)
kurtdb Jul 23, 2016
ffc54a7
version bump
evancohen Jul 26, 2016
18577f4
Removing PulseAudio
evancohen Jul 26, 2016
2834be5
:rocket: v0.0.3 resolve merge conflicts
evancohen Jul 26, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed the discontinued google feed api as defined in #332.
kurtdb committed Jul 3, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 5b28d37ae3b8c6b1d8fa5545d11ca55a7a70b4f1
13 changes: 6 additions & 7 deletions js/services/rss.js
Original file line number Diff line number Diff line change
@@ -13,16 +13,15 @@

if (typeof config.rss != 'undefined'){
angular.forEach(config.rss.feeds, function(url) {
$http.jsonp('http://ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=50&callback=JSON_CALLBACK&q=' + encodeURIComponent(url)).then(function(response) {
for (var i=0; i < response.data.responseData.feed.entries.length; i++){
$http.jsonp('https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20xml%20where%20url%20%3D%20\'' + encodeURIComponent(url) + '\'&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys&callback=JSON_CALLBACK').then(function(response) {
for (var i=0; i < response.data.query.results.rss.channel.item.length; i++){
var feedEntry = {
title : response.data.responseData.feed.title,
content: response.data.responseData.feed.entries[i].title,
title : response.data.query.results.rss.channel.title,
content: response.data.query.results.rss.channel.item[i].title,
lastUpdated : currentTime,
};
//console.log(feedEntry);
service.feed.push(feedEntry);
}
}
});
});
}
@@ -49,7 +48,7 @@
}
else {
service.currentFeed = service.currentFeed + 1;
}
}
};
return service.feed[service.currentFeed];
} ;