Commit 0dbdc7c6 authored by yPhil's avatar yPhil

Merge branch 'bugs'

parents f96d874d a22fb029
Pipeline #45252 passed with stage
in 5 minutes 33 seconds
......@@ -34,7 +34,7 @@ Pétrolette is given to you by the Free, Libre & Open-Source movement. I worked
### Installation
```sh
git clone https://yphil@bitbucket.org/yphil/petrolette.git
git clone https://framagit.org/yphil/petrolette
cd petrolette
npm install
npm start
......
......@@ -2,72 +2,72 @@
PTL.prefs = (function() {
var newList =
[
{"name":"news",
"columns": [
[
{"url":"http://rss.nytimes.com/services/xml/rss/nyt/World.xml","type":"mixed","limit": 4}
],
[
{"url":"https://www.reddit.com/r/worldnews.rss","type":"mixed","limit": 8},
{"url":"http://feeds.reuters.com/Reuters/worldNews","type":"text","limit": 16},
],
[
{"url":"http://www.lemonde.fr/rss/une.xml","type":"photo","limit": 4}
]
]
},
{"name":"tek",
"columns": [
[
{"url":"https://www.reddit.com/.rss","type":"mixed","limit": 4},
{"url":"http://feeds.feedburner.com/thechangelog","type":"mixed","limit": 4}
],
[
{"url":"https://hackernoon.com/feed","type":"mixed","limit": 8},
{"url":"http://feeds.feedburner.com/hackaday/LgoM/","type":"mixed","limit": 16},
],
[
{"url":"http://feeds.feedburner.com/hackaday/LgoM/","type":"photo","limit": 4}
]
]
},
{"name":"imgs",
"columns": [
[
{"url":"https://www.reddit.com/r/EarthPorn.rss","type":"photo","limit": 16},
{"url":"http://cabinporn.com/rss/","type":"photo","limit": 16},
{"url":"http://superphazed.tumblr.com/rss","type":"photo","limit": 8}
]
]
},
{"name":"comics",
"columns": [
[
{"url":"http://xkcd.com/rss.xml","type":"photo","limit": 8}
],
[
{"url":"http://comicfeeds.chrisbenard.net/view/dilbert/default","type":"photo","limit": 8}
]
]
},
{"name":"music",
"columns": [
[
{"url":"http://createdigitalmusic.com/feed/","type":"mixed","limit": 16},
{"url":"http://phdcomics.com/gradfeed.php","type":"photo","limit": 4}
],
[
{"url":"https://www.rollingstone.com/music/rss","type":"photo","limit": 8},
{"url":"http://planet.linuxaudio.org/rss20.xml","type":"photo","limit": 8}
],
[
{"url":"https://dangerousminds.net/atom","type":"photo","limit": 8} ]
]
}
];
var newList = [
{"name":"news",
"columns": [
[
{"url":"http://rss.nytimes.com/services/xml/rss/nyt/World.xml","type":"mixed","limit": 4}
],
[
{"url":"https://www.reddit.com/r/worldnews.rss","type":"mixed","limit": 8},
{"url":"http://feeds.reuters.com/Reuters/worldNews","type":"text","limit": 16},
],
[
{"url":"http://www.lemonde.fr/rss/une.xml","type":"mixed","limit": 4}
]
]
},
{"name":"tek",
"columns": [
[
{"url":"https://www.reddit.com/.rss","type":"mixed","limit": 4},
{"url":"http://feeds.feedburner.com/thechangelog","type":"mixed","limit": 4}
],
[
{"url":"https://hackernoon.com/feed","type":"mixed","limit": 8},
{"url":"http://feeds.feedburner.com/hackaday/LgoM/","type":"mixed","limit": 16},
],
[
{"url":"http://feeds.feedburner.com/hackaday/LgoM/","type":"photo","limit": 4},
{"url":"https://thepiratebay.org/rss/top100/202","type":"text","limit": 12}
]
]
},
{"name":"imgs",
"columns": [
[
{"url":"https://www.reddit.com/r/EarthPorn.rss","type":"photo","limit": 16},
{"url":"http://cabinporn.com/rss/","type":"photo","limit": 16},
{"url":"http://superphazed.tumblr.com/rss","type":"photo","limit": 8}
]
]
},
{"name":"comics",
"columns": [
[
{"url":"http://xkcd.com/rss.xml","type":"photo","limit": 8}
],
[
{"url":"http://comicfeeds.chrisbenard.net/view/dilbert/default","type":"photo","limit": 8}
]
]
},
{"name":"music",
"columns": [
[
{"url":"http://createdigitalmusic.com/feed/","type":"mixed","limit": 8},
{"url":"https://www.youtube.com/feeds/videos.xml?channel_id=UC3I2GFN_F8WudD_2jUZbojA","type":"mixed","limit": 8}
],
[
{"url":"https://www.rollingstone.com/music/rss","type":"photo","limit": 4},
{"url":"http://planet.linuxaudio.org/rss20.xml","type":"mixed","limit": 12}
],
[
{"url":"https://dangerousminds.net/atom","type":"photo","mixed": 12}
]
]
}
];
var defaults = {
'gallerySlideTransition': 'fade',
......
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