Commit f7b2b038 authored by Thierry BUGEAT's avatar Thierry BUGEAT

Merge branch '13_aol_reader' into develop

parents 42811a66 8bd8f6d0
......@@ -226,6 +226,7 @@
<script type="text/javascript" src="scripts/classes/MyUi.class.js"></script>
<script type="text/javascript" src="scripts/classes/MyFeeds/Feedly.class.js"></script>
<script type="text/javascript" src="scripts/classes/MyFeeds/TheOldReader.class.js"></script>
<script type="text/javascript" src="scripts/classes/MyFeeds/AolReader.class.js"></script>
<script type="text/javascript" src="scripts/classes/MyFeeds/GoogleFeed.class.js"></script>
<script type="text/javascript" src="scripts/gestures.js"></script>
......
......@@ -51,4 +51,5 @@ confirm-add-keyword=Are you sure you want add this keyword ?
keyword-was-added=Keyword was added.
keyword-was-not-added=Keyword was not added.
feedly-get-subscriptions-error=Feedly error:
aolreader-get-subscriptions-error=Aol Reader error:
no-news=No news
......@@ -51,4 +51,5 @@ confirm-add-keyword=¿Esta seguro de quere añadir esta palabra clave?
keyword-was-added=La palabra clave ha sido añadida.
keyword-was-not-added=La palabra clave no ha sido añadida.
feedly-get-subscriptions-error=Feedly error:
aolreader-get-subscriptions-error=Aol Reader error:
no-news=No noticia
......@@ -51,4 +51,5 @@ confirm-add-keyword=Voulez-vous vraiment ajouter ce mot clé ?
keyword-was-added=Le mot clé a été ajouté.
keyword-was-not-added=Le mot clé n'a pas été ajouté.
feedly-get-subscriptions-error=Erreur Feedly:
aolreader-get-subscriptions-error=Erreur Aol Reader:
no-news=Pas d'actualité
......@@ -50,4 +50,5 @@ confirm-add-keyword=Are you sure you want add this keyword ?
keyword-was-added=Keyword was added.
keyword-was-not-added=Keyword was not added.
feedly-get-subscriptions-error=Feedly erro:
aolreader-get-subscriptions-error=Aol Reader erro:
no-news=No notícia
{
"name": "my Feeds",
"description": "RSS & ATOM feeds reader",
"version": "1.1.1",
"version": "1.2.0",
"launch_path": "/index.html",
"icons": {
"60": "/images/icon-60.png",
......@@ -26,7 +26,8 @@
"type": "privileged",
"csp": "default-src *; script-src 'self'; object-src 'none'; style-src 'self' 'unsafe-inline'",
"redirects": [
{"from": "http://localhost/", "to": "/scripts/feedly/loginCallback.html"}
{"from": "http://localhost/", "to": "/scripts/feedly/loginCallback.html"},
{"from": "http://localhost:8080/", "to": "/scripts/aolreader/loginCallback.html"}
],
"permissions": {
"desktop-notification": {
......
<!--
Copyright 2015 Thierry BUGEAT
This file is part of myFeeds.
myFeeds is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
myFeeds is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with myFeeds. If not, see <http://www.gnu.org/licenses/>.
-->
<html>
<header></header>
<body>
<script type="text/javascript" src="loginCallback.js"></script>
</body>
</html>
/**
* Copyright 2015 Thierry BUGEAT
*
* This file is part of myFeeds.
*
* myFeeds is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* myFeeds is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with myFeeds. If not, see <http://www.gnu.org/licenses/>.
*/
opener.aolreader._loginCallback(location.href);
window.close();
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment