Merge lp:pplivesite into lp:~wester/pplivesite/infalls
- main
- Merge into infalls
Proposed by
Torbjörn Wester
Status: | Rejected |
---|---|
Rejected by: | Torbjörn Wester |
Proposed branch: | lp:pplivesite |
Merge into: | lp:~wester/pplivesite/infalls |
Diff against target: |
553 lines (+153/-139) 2 files modified
config/live (+151/-139) run.sh (+2/-0) |
To merge this branch: | bzr merge lp:pplivesite |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Torbjörn Wester | Approve | ||
Review via email: mp+60418@code.launchpad.net |
Commit message
Description of the change
test
To post a comment you must log in.
Revision history for this message
Torbjörn Wester (wester) : | # |
review:
Approve
Unmerged revisions
- 609. By Mikael Nilsson <mikaeln@giskard-glaptop>
-
sourceid
- 608. By Mikael Nilsson <mikaeln@giskard-glaptop>
-
sourceid
- 607. By www-data <www-data@pplive>
-
bloglinks
- 606. By Mikael Nilsson <mikaeln@giskard-glaptop>
-
bloglinks
- 605. By Mikael Nilsson <mikaeln@giskard-glaptop>
-
bloglinks
- 604. By Mikael Nilsson <mikaeln@giskard-glaptop>
-
frekar, ershag
- 603. By www-data <www-data@pplive>
-
Breddning
- 602. By Mikael Nilsson <mikaeln@giskard-glaptop>
-
Hax24
- 601. By Mikael Nilsson <mikaeln@giskard-glaptop>
-
Hax24
- 600. By Mikael Nilsson <mikaeln@giskard-glaptop>
-
Holm och 5101
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'config/live' | |||
2 | --- config/live 2011-03-18 08:05:06 +0000 | |||
3 | +++ config/live 2011-05-09 19:32:09 +0000 | |||
4 | @@ -207,23 +207,23 @@ | |||
5 | 207 | 207 | ||
6 | 208 | 208 | ||
7 | 209 | 209 | ||
25 | 210 | # Har försökt fråga via marcin, men inte hört något. | 210 | # XXX Har försökt fråga via marcin, men inte hört något. |
26 | 211 | [http://blog.brokep.com/category/piracy/feed/] | 211 | #[http://blog.brokep.com/category/piracy/feed/] |
27 | 212 | name = Copy me happy | 212 | #name = Copy me happy |
28 | 213 | face = brokep.png | 213 | #face = brokep.png |
29 | 214 | sourceid = brokep | 214 | #sourceid = brokep |
30 | 215 | 215 | ||
31 | 216 | [http://blog.brokep.com/category/big-brother/feed/] | 216 | #[http://blog.brokep.com/category/big-brother/feed/] |
32 | 217 | name = Copy me happy | 217 | #name = Copy me happy |
33 | 218 | face = brokep.png | 218 | #face = brokep.png |
34 | 219 | suppress = True | 219 | #suppress = True |
35 | 220 | sourceid = brokep | 220 | #sourceid = brokep |
36 | 221 | 221 | ||
37 | 222 | [http://blog.brokep.com/category/the-trial/feed/] | 222 | #[http://blog.brokep.com/category/the-trial/feed/] |
38 | 223 | name = Copy me happy | 223 | #name = Copy me happy |
39 | 224 | face = brokep.png | 224 | #face = brokep.png |
40 | 225 | suppress = True | 225 | #suppress = True |
41 | 226 | sourceid = brokep | 226 | #sourceid = brokep |
42 | 227 | 227 | ||
43 | 228 | 228 | ||
44 | 229 | 229 | ||
45 | @@ -328,7 +328,7 @@ | |||
46 | 328 | suppress = True | 328 | suppress = True |
47 | 329 | sourceid = mini | 329 | sourceid = mini |
48 | 330 | 330 | ||
50 | 331 | # denna innehåller bara blogginlägg nu... | 331 | # XXX denna innehåller bara blogginlägg nu... |
51 | 332 | #[http://www.piratpartiet.se/node/feed] | 332 | #[http://www.piratpartiet.se/node/feed] |
52 | 333 | #name = Piratpartiet Nyheter | 333 | #name = Piratpartiet Nyheter |
53 | 334 | #pirat = True | 334 | #pirat = True |
54 | @@ -389,11 +389,12 @@ | |||
55 | 389 | face = pp.png | 389 | face = pp.png |
56 | 390 | sourceid = syd | 390 | sourceid = syd |
57 | 391 | 391 | ||
60 | 392 | [http://nord.piratpartiet.se/feed/] | 392 | [http://sodertalje.piratpartiet.se/feed/] |
61 | 393 | name = Piratpartiet Norra distriktet | 393 | name = Piratpartiet Södertälje |
62 | 394 | pirat = True | 394 | pirat = True |
63 | 395 | face = pp.png | 395 | face = pp.png |
65 | 396 | sourceid = nord | 396 | sourceid = sodertalje |
66 | 397 | |||
67 | 397 | 398 | ||
68 | 398 | 399 | ||
69 | 399 | 400 | ||
70 | @@ -467,9 +468,6 @@ | |||
71 | 467 | sourceid = piratpartisten | 468 | sourceid = piratpartisten |
72 | 468 | face = piratpartisten.png | 469 | face = piratpartisten.png |
73 | 469 | 470 | ||
74 | 470 | # Inte längre aktuell | ||
75 | 471 | # [http://nyheter24.se/nyheter/blogg/oscar-swartz/?service=rss] | ||
76 | 472 | # name = Nyheter24: Oscar Swartz | ||
77 | 473 | 471 | ||
78 | 474 | 472 | ||
79 | 475 | [http://ppdrift.wordpress.com/category/live/feed/] | 473 | [http://ppdrift.wordpress.com/category/live/feed/] |
80 | @@ -482,7 +480,7 @@ | |||
81 | 482 | 480 | ||
82 | 483 | 481 | ||
83 | 484 | # Kalle ville ha "Pirate" | 482 | # Kalle ville ha "Pirate" |
85 | 485 | # Har flyttat till I2P .... | 483 | # XXX Har flyttat till I2P .... |
86 | 486 | #[http://xorbot.org/txt-category/pirate/feed] | 484 | #[http://xorbot.org/txt-category/pirate/feed] |
87 | 487 | #name = XORBOT | 485 | #name = XORBOT |
88 | 488 | #pirat = True | 486 | #pirat = True |
89 | @@ -519,15 +517,6 @@ | |||
90 | 519 | 517 | ||
91 | 520 | 518 | ||
92 | 521 | 519 | ||
93 | 522 | # TODO, har inte fått svar | ||
94 | 523 | [http://jacobdexe.wordpress.com/feed/] | ||
95 | 524 | name = Jacob Dexe | ||
96 | 525 | pirat = True | ||
97 | 526 | face = dexe.png | ||
98 | 527 | sourceid = dexe | ||
99 | 528 | |||
100 | 529 | |||
101 | 530 | |||
102 | 531 | # Piratfrågor enligt Simon | 520 | # Piratfrågor enligt Simon |
103 | 532 | [http://stenskott.wordpress.com/category/piratfragor/feed/] | 521 | [http://stenskott.wordpress.com/category/piratfragor/feed/] |
104 | 533 | name = Stenskott | 522 | name = Stenskott |
105 | @@ -575,6 +564,7 @@ | |||
106 | 575 | # TODO inte kollat | 564 | # TODO inte kollat |
107 | 576 | [http://blog.erlandsson.info/category/piratpartiet/feed/] | 565 | [http://blog.erlandsson.info/category/piratpartiet/feed/] |
108 | 577 | name = Leo Erlandsson | 566 | name = Leo Erlandsson |
109 | 567 | link = http://blog.erlandsson.info/ | ||
110 | 578 | pirat = True | 568 | pirat = True |
111 | 579 | face = leo.png | 569 | face = leo.png |
112 | 580 | sourceid = leo | 570 | sourceid = leo |
113 | @@ -668,7 +658,6 @@ | |||
114 | 668 | # Josh vill ha "pirat" | 658 | # Josh vill ha "pirat" |
115 | 669 | [http://scriptorium.se/josh/category/pirat/feed/] | 659 | [http://scriptorium.se/josh/category/pirat/feed/] |
116 | 670 | name = Enligt min humla | 660 | name = Enligt min humla |
117 | 671 | pirat = True | ||
118 | 672 | face = enligtminhumla.png | 661 | face = enligtminhumla.png |
119 | 673 | sourceid = joshen | 662 | sourceid = joshen |
120 | 674 | detect_encoding = False | 663 | detect_encoding = False |
121 | @@ -742,7 +731,7 @@ | |||
122 | 742 | 731 | ||
123 | 743 | 732 | ||
124 | 744 | # Thomas ville detta | 733 | # Thomas ville detta |
126 | 745 | # Siten är nere | 734 | # XXX Siten är nere |
127 | 746 | #[http://www.selig.se/tag/Piratpartiet/feed/] | 735 | #[http://www.selig.se/tag/Piratpartiet/feed/] |
128 | 747 | #name = Selig.se | 736 | #name = Selig.se |
129 | 748 | #pirat = True | 737 | #pirat = True |
130 | @@ -767,7 +756,7 @@ | |||
131 | 767 | 756 | ||
132 | 768 | 757 | ||
133 | 769 | # allt ville johan ha | 758 | # allt ville johan ha |
135 | 770 | [http://piratpartist.wordpress.com/feed/] | 759 | [http://piratpartist.nu/?feed=rss2] |
136 | 771 | name = Piratpartistens Blogg | 760 | name = Piratpartistens Blogg |
137 | 772 | pirat = True | 761 | pirat = True |
138 | 773 | face = piratpartist.png | 762 | face = piratpartist.png |
139 | @@ -910,11 +899,13 @@ | |||
140 | 910 | sourceid = erikj | 899 | sourceid = erikj |
141 | 911 | 900 | ||
142 | 912 | 901 | ||
148 | 913 | [http://paranoianormal.se/blog/tag/piratpartiet/feed/] | 902 | # XXX nere |
149 | 914 | name = Paranoianormal | 903 | #[http://paranoianormal.se/blog/tag/piratpartiet/feed/] |
150 | 915 | pirat = True | 904 | #name = Paranoianormal |
151 | 916 | face = paranoianormal.png | 905 | #link = http://paranoianormal.se/blog/ |
152 | 917 | sourceid = paranoianormal | 906 | #pirat = True |
153 | 907 | #face = paranoianormal.png | ||
154 | 908 | #sourceid = paranoianormal | ||
155 | 918 | 909 | ||
156 | 919 | 910 | ||
157 | 920 | [http://farmorgun.blogspot.com/feeds/posts/default/-/PP?alt=rss] | 911 | [http://farmorgun.blogspot.com/feeds/posts/default/-/PP?alt=rss] |
158 | @@ -955,14 +946,6 @@ | |||
159 | 955 | 946 | ||
160 | 956 | 947 | ||
161 | 957 | 948 | ||
162 | 958 | # Tobias ville ha "politik" | ||
163 | 959 | [http://tobias.funderar.se/tag/politik/feed/] | ||
164 | 960 | name = En objektiv sanning | ||
165 | 961 | pirat = True | ||
166 | 962 | face = objektivsanning.png | ||
167 | 963 | sourceid = objektivsanning | ||
168 | 964 | |||
169 | 965 | |||
170 | 966 | # Ville ha Live | 949 | # Ville ha Live |
171 | 967 | [http://www.piratplatsen.se/?q=taxonomy/term/1/all/feed] | 950 | [http://www.piratplatsen.se/?q=taxonomy/term/1/all/feed] |
172 | 968 | name = Piratplatsen | 951 | name = Piratplatsen |
173 | @@ -1018,7 +1001,6 @@ | |||
174 | 1018 | # Olof ville ha informationspolitik | 1001 | # Olof ville ha informationspolitik |
175 | 1019 | [http://olofb.wordpress.com/tag/informationspolitik/feed/] | 1002 | [http://olofb.wordpress.com/tag/informationspolitik/feed/] |
176 | 1020 | name = OlofB[eta] | 1003 | name = OlofB[eta] |
177 | 1021 | pirat = True | ||
178 | 1022 | face = olofb.png | 1004 | face = olofb.png |
179 | 1023 | sourceid = olofb | 1005 | sourceid = olofb |
180 | 1024 | 1006 | ||
181 | @@ -1035,7 +1017,7 @@ | |||
182 | 1035 | 1017 | ||
183 | 1036 | # Nipe ville ha "piratpartiet" | 1018 | # Nipe ville ha "piratpartiet" |
184 | 1037 | [http://gustavnipe.wordpress.com/category/piratpartiet/feed/] | 1019 | [http://gustavnipe.wordpress.com/category/piratpartiet/feed/] |
186 | 1038 | name = I polemik | 1020 | name = Förbundsordföranden |
187 | 1039 | pirat = True | 1021 | pirat = True |
188 | 1040 | face = gustavnipe.png | 1022 | face = gustavnipe.png |
189 | 1041 | sourceid = gustavnipe | 1023 | sourceid = gustavnipe |
190 | @@ -1059,6 +1041,7 @@ | |||
191 | 1059 | # Bara Övervakningssamhället, **eget filter** | 1041 | # Bara Övervakningssamhället, **eget filter** |
192 | 1060 | [http://scabernestor.blogg.se/index.rss] | 1042 | [http://scabernestor.blogg.se/index.rss] |
193 | 1061 | name = Scaber Nestor | 1043 | name = Scaber Nestor |
194 | 1044 | annatparti = l | ||
195 | 1062 | filters = scaber_nestor_categories.py | 1045 | filters = scaber_nestor_categories.py |
196 | 1063 | face = scabernestor.png | 1046 | face = scabernestor.png |
197 | 1064 | sourceid = scabernestor | 1047 | sourceid = scabernestor |
198 | @@ -1828,6 +1811,7 @@ | |||
199 | 1828 | # Dolkow ville ha "piratpartiet" | 1811 | # Dolkow ville ha "piratpartiet" |
200 | 1829 | [http://dolkow.se/blog/post.php/category/piratpartiet/feed/] | 1812 | [http://dolkow.se/blog/post.php/category/piratpartiet/feed/] |
201 | 1830 | name = Snilds korta | 1813 | name = Snilds korta |
202 | 1814 | link = http://dolkow.se/blog/ | ||
203 | 1831 | pirat = True | 1815 | pirat = True |
204 | 1832 | face = dolkow.png | 1816 | face = dolkow.png |
205 | 1833 | sourceid = dolkow | 1817 | sourceid = dolkow |
206 | @@ -1956,6 +1940,7 @@ | |||
207 | 1956 | # Sandra ville ha "piratpartiet" | 1940 | # Sandra ville ha "piratpartiet" |
208 | 1957 | [http://www.sandrability.com/taggar/piratpartiet/feed/] | 1941 | [http://www.sandrability.com/taggar/piratpartiet/feed/] |
209 | 1958 | name = Sandrability.com | 1942 | name = Sandrability.com |
210 | 1943 | link = http://www.sandrability.com/ | ||
211 | 1959 | pirat = True | 1944 | pirat = True |
212 | 1960 | face = sandrability.png | 1945 | face = sandrability.png |
213 | 1961 | sourceid = sandrability | 1946 | sourceid = sandrability |
214 | @@ -2021,6 +2006,7 @@ | |||
215 | 2021 | sourceid = grodornakokar | 2006 | sourceid = grodornakokar |
216 | 2022 | 2007 | ||
217 | 2023 | 2008 | ||
218 | 2009 | # XXX invite only | ||
219 | 2024 | # Eva ville Piratpartiet, integritet, patent och immaterialrätt. | 2010 | # Eva ville Piratpartiet, integritet, patent och immaterialrätt. |
220 | 2025 | #[http://generalklausul.blogspot.com/feeds/posts/default/-/piratpartiet?alt=rss] | 2011 | #[http://generalklausul.blogspot.com/feeds/posts/default/-/piratpartiet?alt=rss] |
221 | 2026 | #name = Hundratusentals Ögonblick | 2012 | #name = Hundratusentals Ögonblick |
222 | @@ -2157,13 +2143,6 @@ | |||
223 | 2157 | detect_encoding = False | 2143 | detect_encoding = False |
224 | 2158 | 2144 | ||
225 | 2159 | 2145 | ||
226 | 2160 | [http://tjejsnack.piratpartiet.se/feed/] | ||
227 | 2161 | name = Tjejsnack | ||
228 | 2162 | pirat = True | ||
229 | 2163 | face = tjejsnack.png | ||
230 | 2164 | sourceid = tjejsnack | ||
231 | 2165 | |||
232 | 2166 | |||
233 | 2167 | # Björn ville ha "pp" och "pirat" | 2146 | # Björn ville ha "pp" och "pirat" |
234 | 2168 | [http://bjornodlund.wordpress.com/tag/pp/feed/] | 2147 | [http://bjornodlund.wordpress.com/tag/pp/feed/] |
235 | 2169 | name = Björn Odlund | 2148 | name = Björn Odlund |
236 | @@ -2202,26 +2181,20 @@ | |||
237 | 2202 | suppress = True | 2181 | suppress = True |
238 | 2203 | 2182 | ||
239 | 2204 | 2183 | ||
260 | 2205 | # Victoria ville ha Ung Pirat, Piratpartiet, och Piratrörelsen. | 2184 | # Victoria ville ha Ung Pirat, Piratpartiet. |
261 | 2206 | [http://borgmi.wordpress.com/tag/ung-pirat/feed/] | 2185 | [http://victoriawestberg.se/tag/ung-pirat/feed/] |
262 | 2207 | name = Borgmi | 2186 | name = Victoria Westberg |
263 | 2208 | pirat = True | 2187 | pirat = True |
264 | 2209 | face = borgmi.png | 2188 | face = victoriawestberg.png |
265 | 2210 | sourceid = borgmi | 2189 | sourceid = victoriawestberg |
266 | 2211 | 2190 | ||
267 | 2212 | [http://borgmi.wordpress.com/tag/piratpartiet/feed/] | 2191 | [http://victoriawestberg.se/tag/piratpartiet/feed/] |
268 | 2213 | name = Borgmi | 2192 | name = Victoria Westberg |
269 | 2214 | pirat = True | 2193 | pirat = True |
270 | 2215 | face = borgmi.png | 2194 | face = victoriawestberg.png |
271 | 2216 | sourceid = borgmi | 2195 | sourceid = victoriawestberg |
272 | 2217 | suppress = True | 2196 | suppress = True |
273 | 2218 | 2197 | ||
254 | 2219 | [http://borgmi.wordpress.com/tag/piratrorelsen/feed/] | ||
255 | 2220 | name = Borgmi | ||
256 | 2221 | pirat = True | ||
257 | 2222 | face = borgmi.png | ||
258 | 2223 | sourceid = borgmi | ||
259 | 2224 | suppress = True | ||
274 | 2225 | 2198 | ||
275 | 2226 | 2199 | ||
276 | 2227 | #Ville ha "piratpartiet" | 2200 | #Ville ha "piratpartiet" |
277 | @@ -2292,12 +2265,13 @@ | |||
278 | 2292 | suppress = True | 2265 | suppress = True |
279 | 2293 | 2266 | ||
280 | 2294 | 2267 | ||
281 | 2268 | # XXX nere | ||
282 | 2295 | # Ville ha "live" | 2269 | # Ville ha "live" |
288 | 2296 | [http://www.piratus.se/?tag=live&feed=rss2] | 2270 | #[http://www.piratus.se/?tag=live&feed=rss2] |
289 | 2297 | name = Piratus | 2271 | #name = Piratus |
290 | 2298 | pirat = True | 2272 | #pirat = True |
291 | 2299 | face = piratus.png | 2273 | #face = piratus.png |
292 | 2300 | sourceid = piratus | 2274 | #sourceid = piratus |
293 | 2301 | 2275 | ||
294 | 2302 | 2276 | ||
295 | 2303 | # ville ha piratpartiet | 2277 | # ville ha piratpartiet |
296 | @@ -2486,20 +2460,13 @@ | |||
297 | 2486 | # Filtrera på fritext "Nunc aut nuncuam" **eget filter** | 2460 | # Filtrera på fritext "Nunc aut nuncuam" **eget filter** |
298 | 2487 | [http://blogg.aftonbladet.se/feeds/entries/21909/rss] | 2461 | [http://blogg.aftonbladet.se/feeds/entries/21909/rss] |
299 | 2488 | name = Svensk Myndighetskontroll | 2462 | name = Svensk Myndighetskontroll |
300 | 2463 | annatparti = l | ||
301 | 2489 | filters = svensk_myndighetskontroll_categories.py | 2464 | filters = svensk_myndighetskontroll_categories.py |
302 | 2490 | face = svensk_myndighetskontroll.png | 2465 | face = svensk_myndighetskontroll.png |
303 | 2491 | link = http://blogg.aftonbladet.se/21909 | 2466 | link = http://blogg.aftonbladet.se/21909 |
304 | 2492 | sourceid = svensk_myndighetskontroll | 2467 | sourceid = svensk_myndighetskontroll |
305 | 2493 | 2468 | ||
306 | 2494 | 2469 | ||
307 | 2495 | [http://www.piratnytt.nu/index.php?format=feed&type=rss] | ||
308 | 2496 | name = Piratnytt | ||
309 | 2497 | pirat = True | ||
310 | 2498 | link = http://www.piratnytt.nu/ | ||
311 | 2499 | face = piratnytt.png | ||
312 | 2500 | sourceid = piratnytt | ||
313 | 2501 | |||
314 | 2502 | |||
315 | 2503 | 2470 | ||
316 | 2504 | # Hela relevant | 2471 | # Hela relevant |
317 | 2505 | [http://acta.mpbloggar.se/feed/] | 2472 | [http://acta.mpbloggar.se/feed/] |
318 | @@ -2528,13 +2495,6 @@ | |||
319 | 2528 | 2495 | ||
320 | 2529 | 2496 | ||
321 | 2530 | 2497 | ||
322 | 2531 | # pplive | ||
323 | 2532 | [http://www.meastro.se/?cat=58&feed=rss2] | ||
324 | 2533 | name = Maestro.se | ||
325 | 2534 | pirat = True | ||
326 | 2535 | face = maestro.png | ||
327 | 2536 | sourceid = maestro | ||
328 | 2537 | |||
329 | 2538 | 2498 | ||
330 | 2539 | # | 2499 | # |
331 | 2540 | [http://jonasnordgren.se/?cat=3&feed=rss2] | 2500 | [http://jonasnordgren.se/?cat=3&feed=rss2] |
332 | @@ -2588,18 +2548,18 @@ | |||
333 | 2588 | 2548 | ||
334 | 2589 | 2549 | ||
335 | 2590 | 2550 | ||
337 | 2591 | 2551 | # XXX nere | |
338 | 2592 | # Propiratism | 2552 | # Propiratism |
349 | 2593 | [http://nordicbattlegroup.org/?cat=4&feed=rss2] | 2553 | #[http://nordicbattlegroup.org/?cat=4&feed=rss2] |
350 | 2594 | name = Nördic Battlegroup – Ad Omnia Piratus | 2554 | #name = Nördic Battlegroup – Ad Omnia Piratus |
351 | 2595 | pirat = True | 2555 | #pirat = True |
352 | 2596 | face = nordicbattlegroup.png | 2556 | #face = nordicbattlegroup.png |
353 | 2597 | sourceid = nordicbattlegroup | 2557 | #sourceid = nordicbattlegroup |
354 | 2598 | 2558 | ||
355 | 2599 | 2559 | ||
356 | 2600 | 2560 | ||
357 | 2601 | 2561 | ||
358 | 2602 | # ville ha PP lokalt, PP internt och Politik | 2562 | # ville ha PP lokalt, PP internt, Ung pirat och Politik |
359 | 2603 | [http://jppirat.blogspot.com/feeds/posts/default/-/PP%20lokalt?alt=rss] | 2563 | [http://jppirat.blogspot.com/feeds/posts/default/-/PP%20lokalt?alt=rss] |
360 | 2604 | name = värmlandspiraten | 2564 | name = värmlandspiraten |
361 | 2605 | pirat = True | 2565 | pirat = True |
362 | @@ -2615,6 +2575,14 @@ | |||
363 | 2615 | sourceid = jppirat | 2575 | sourceid = jppirat |
364 | 2616 | suppress = True | 2576 | suppress = True |
365 | 2617 | 2577 | ||
366 | 2578 | [http://jppirat.blogspot.com/feeds/posts/default/-/Ung%20Pirat?alt=rss] | ||
367 | 2579 | name = värmlandspiraten | ||
368 | 2580 | pirat = True | ||
369 | 2581 | link = http://jppirat.blogspot.com/ | ||
370 | 2582 | face = jppirat.png | ||
371 | 2583 | sourceid = jppirat | ||
372 | 2584 | suppress = True | ||
373 | 2585 | |||
374 | 2618 | [http://jppirat.blogspot.com/feeds/posts/default/-/Politik?alt=rss] | 2586 | [http://jppirat.blogspot.com/feeds/posts/default/-/Politik?alt=rss] |
375 | 2619 | name = värmlandspiraten | 2587 | name = värmlandspiraten |
376 | 2620 | pirat = True | 2588 | pirat = True |
377 | @@ -2721,7 +2689,7 @@ | |||
378 | 2721 | sourceid = ruhovi | 2689 | sourceid = ruhovi |
379 | 2722 | 2690 | ||
380 | 2723 | 2691 | ||
382 | 2724 | # Aktivism! | 2692 | # XXX Aktivism! |
383 | 2725 | #[http://data.piratpartiet.se/Rss/Activism.aspx?OrganizationId=1] | 2693 | #[http://data.piratpartiet.se/Rss/Activism.aspx?OrganizationId=1] |
384 | 2726 | #name = Piratpartiet aktivism! | 2694 | #name = Piratpartiet aktivism! |
385 | 2727 | #pirat = True | 2695 | #pirat = True |
386 | @@ -2775,28 +2743,6 @@ | |||
387 | 2775 | sourceid = anonwret | 2743 | sourceid = anonwret |
388 | 2776 | 2744 | ||
389 | 2777 | 2745 | ||
390 | 2778 | # "piratrelaterat", "ung pirat" och taggen "piratpartiet" | ||
391 | 2779 | [http://olofnoaksson.wordpress.com/category/piratrelaterat/feed/] | ||
392 | 2780 | name = Olof Noaksson's Blogg | ||
393 | 2781 | pirat = True | ||
394 | 2782 | face = olofnoaksson.png | ||
395 | 2783 | sourceid = olofnoaksson | ||
396 | 2784 | |||
397 | 2785 | [http://olofnoaksson.wordpress.com/category/ung-pirat/feed/] | ||
398 | 2786 | name = Olof Noaksson's Blogg | ||
399 | 2787 | pirat = True | ||
400 | 2788 | face = olofnoaksson.png | ||
401 | 2789 | sourceid = olofnoaksson | ||
402 | 2790 | suppress = True | ||
403 | 2791 | |||
404 | 2792 | [http://olofnoaksson.wordpress.com/tag/piratpartiet/feed/] | ||
405 | 2793 | name = Olof Noaksson's Blogg | ||
406 | 2794 | pirat = True | ||
407 | 2795 | face = olofnoaksson.png | ||
408 | 2796 | sourceid = olofnoaksson | ||
409 | 2797 | suppress = True | ||
410 | 2798 | |||
411 | 2799 | |||
412 | 2800 | 2746 | ||
413 | 2801 | # Piratpartiet och Piratfrågor | 2747 | # Piratpartiet och Piratfrågor |
414 | 2802 | [http://hansblogg.wordpress.com/category/piratfragor/feed/] | 2748 | [http://hansblogg.wordpress.com/category/piratfragor/feed/] |
415 | @@ -2886,6 +2832,7 @@ | |||
416 | 2886 | name = [insert random stupid name here] | 2832 | name = [insert random stupid name here] |
417 | 2887 | face = jamtsved.png | 2833 | face = jamtsved.png |
418 | 2888 | sourceid = jamtsved | 2834 | sourceid = jamtsved |
419 | 2835 | suppress = True | ||
420 | 2889 | 2836 | ||
421 | 2890 | 2837 | ||
422 | 2891 | 2838 | ||
423 | @@ -2907,13 +2854,14 @@ | |||
424 | 2907 | sourceid = hell-man | 2854 | sourceid = hell-man |
425 | 2908 | 2855 | ||
426 | 2909 | 2856 | ||
427 | 2857 | # XXX nere | ||
428 | 2910 | # "pirat" | 2858 | # "pirat" |
435 | 2911 | [http://www.fredrikhallund.com/?tag=integritet&feed=rss2] | 2859 | #[http://www.fredrikhallund.com/?tag=integritet&feed=rss2] |
436 | 2912 | pirat = True | 2860 | #pirat = True |
437 | 2913 | link = http://www.fredrikhallund.com/ | 2861 | #link = http://www.fredrikhallund.com/ |
438 | 2914 | name = På djupa vatten | 2862 | #name = På djupa vatten |
439 | 2915 | face = djupavatten.png | 2863 | #face = djupavatten.png |
440 | 2916 | sourceid = djupavatten | 2864 | #sourceid = djupavatten |
441 | 2917 | 2865 | ||
442 | 2918 | 2866 | ||
443 | 2919 | # "piratpartiet" | 2867 | # "piratpartiet" |
444 | @@ -2960,3 +2908,67 @@ | |||
445 | 2960 | sourceid = ekferjan | 2908 | sourceid = ekferjan |
446 | 2961 | 2909 | ||
447 | 2962 | 2910 | ||
448 | 2911 | [http://cmagnusb.wordpress.com/tag/pplive/feed/] | ||
449 | 2912 | pirat = True | ||
450 | 2913 | link = http://cmagnusb.wordpress.com/ | ||
451 | 2914 | name = Det är en bra dag idag! | ||
452 | 2915 | face = cmagnusb.png | ||
453 | 2916 | sourceid = cmagnusb | ||
454 | 2917 | |||
455 | 2918 | |||
456 | 2919 | |||
457 | 2920 | [http://ppnow.blog.com/feed/] | ||
458 | 2921 | pirat = True | ||
459 | 2922 | name = Strategies for the Pirate Movement | ||
460 | 2923 | face = ppnow.png | ||
461 | 2924 | sourceid = ppnow | ||
462 | 2925 | |||
463 | 2926 | |||
464 | 2927 | [http://anton.nordenfur.se/tag/piratpartiet/feed/] | ||
465 | 2928 | pirat = True | ||
466 | 2929 | name = Anton Nordenfur | ||
467 | 2930 | link = http://anton.nordenfur.se/ | ||
468 | 2931 | face = nordenfur.png | ||
469 | 2932 | sourceid = nordenfur | ||
470 | 2933 | |||
471 | 2934 | |||
472 | 2935 | [http://simonlindgren.se/?category_name=piratpartiet&feed=rss2] | ||
473 | 2936 | pirat = True | ||
474 | 2937 | name = Simon Lindgren | ||
475 | 2938 | link = http://simonlindgren.se/ | ||
476 | 2939 | face = simonlindgren.png | ||
477 | 2940 | sourceid = simonlindgren | ||
478 | 2941 | |||
479 | 2942 | |||
480 | 2943 | [http://fildelning.se/feed/] | ||
481 | 2944 | link = http://fildelning.se/ | ||
482 | 2945 | name = Fildelning | ||
483 | 2946 | face = fildelning.png | ||
484 | 2947 | sourceid = fildelning | ||
485 | 2948 | |||
486 | 2949 | |||
487 | 2950 | # Sandra ville ha "Politik" | ||
488 | 2951 | [http://terobi.se/category/politik/feed/] | ||
489 | 2952 | name = terobi | ||
490 | 2953 | pirat = True | ||
491 | 2954 | face = terobi.png | ||
492 | 2955 | link = http://terobi.se/ | ||
493 | 2956 | sourceid = terobi | ||
494 | 2957 | |||
495 | 2958 | |||
496 | 2959 | # Dexe ville ha "live" | ||
497 | 2960 | [http://dexe.nu/tag/live/feed/] | ||
498 | 2961 | name = Jacob Dexe | ||
499 | 2962 | face = dexe.png | ||
500 | 2963 | sourceid = dexe | ||
501 | 2964 | link = http://dexe.nu/ | ||
502 | 2965 | |||
503 | 2966 | |||
504 | 2967 | [http://svpol.se/tag/pplive/feed/] | ||
505 | 2968 | name = #svpol | ||
506 | 2969 | face = svpol.png | ||
507 | 2970 | sourceid = svpol | ||
508 | 2971 | link = http://svpol.se/ | ||
509 | 2972 | |||
510 | 2973 | |||
511 | 2974 | |||
512 | 2963 | 2975 | ||
513 | === modified file 'run.sh' | |||
514 | --- run.sh 2011-01-14 11:41:18 +0000 | |||
515 | +++ run.sh 2011-05-09 19:32:09 +0000 | |||
516 | @@ -1,5 +1,7 @@ | |||
517 | 1 | #!/bin/bash | 1 | #!/bin/bash |
518 | 2 | 2 | ||
519 | 3 | if [ "$(whoami)" = "root" ]; then echo "Fuck off."; exit; fi | ||
520 | 4 | |||
521 | 3 | PLANET=venus/planet.py | 5 | PLANET=venus/planet.py |
522 | 4 | CONFIGS="highlight live" | 6 | CONFIGS="highlight live" |
523 | 5 | 7 | ||
524 | 6 | 8 | ||
525 | === added file 'www/images/faces/cmagnusb.png' | |||
526 | 7 | Binary files www/images/faces/cmagnusb.png 1970-01-01 00:00:00 +0000 and www/images/faces/cmagnusb.png 2011-05-09 19:32:09 +0000 differ | 9 | Binary files www/images/faces/cmagnusb.png 1970-01-01 00:00:00 +0000 and www/images/faces/cmagnusb.png 2011-05-09 19:32:09 +0000 differ |
527 | === modified file 'www/images/faces/dexe.png' | |||
528 | 8 | Binary files www/images/faces/dexe.png 2011-01-14 11:41:18 +0000 and www/images/faces/dexe.png 2011-05-09 19:32:09 +0000 differ | 10 | Binary files www/images/faces/dexe.png 2011-01-14 11:41:18 +0000 and www/images/faces/dexe.png 2011-05-09 19:32:09 +0000 differ |
529 | === added file 'www/images/faces/fildelning.png' | |||
530 | 9 | Binary files www/images/faces/fildelning.png 1970-01-01 00:00:00 +0000 and www/images/faces/fildelning.png 2011-05-09 19:32:09 +0000 differ | 11 | Binary files www/images/faces/fildelning.png 1970-01-01 00:00:00 +0000 and www/images/faces/fildelning.png 2011-05-09 19:32:09 +0000 differ |
531 | === removed file 'www/images/faces/maestro.png' | |||
532 | 10 | Binary files www/images/faces/maestro.png 2011-01-14 11:41:18 +0000 and www/images/faces/maestro.png 1970-01-01 00:00:00 +0000 differ | 12 | Binary files www/images/faces/maestro.png 2011-01-14 11:41:18 +0000 and www/images/faces/maestro.png 1970-01-01 00:00:00 +0000 differ |
533 | === added file 'www/images/faces/nordenfur.png' | |||
534 | 11 | Binary files www/images/faces/nordenfur.png 1970-01-01 00:00:00 +0000 and www/images/faces/nordenfur.png 2011-05-09 19:32:09 +0000 differ | 13 | Binary files www/images/faces/nordenfur.png 1970-01-01 00:00:00 +0000 and www/images/faces/nordenfur.png 2011-05-09 19:32:09 +0000 differ |
535 | === removed file 'www/images/faces/objektivsanning.png' | |||
536 | 12 | Binary files www/images/faces/objektivsanning.png 2011-01-14 11:41:18 +0000 and www/images/faces/objektivsanning.png 1970-01-01 00:00:00 +0000 differ | 14 | Binary files www/images/faces/objektivsanning.png 2011-01-14 11:41:18 +0000 and www/images/faces/objektivsanning.png 1970-01-01 00:00:00 +0000 differ |
537 | === removed file 'www/images/faces/olofnoaksson.png' | |||
538 | 13 | Binary files www/images/faces/olofnoaksson.png 2011-01-14 11:41:18 +0000 and www/images/faces/olofnoaksson.png 1970-01-01 00:00:00 +0000 differ | 15 | Binary files www/images/faces/olofnoaksson.png 2011-01-14 11:41:18 +0000 and www/images/faces/olofnoaksson.png 1970-01-01 00:00:00 +0000 differ |
539 | === modified file 'www/images/faces/piratjonas.png' | |||
540 | 14 | Binary files www/images/faces/piratjonas.png 2011-01-14 11:41:18 +0000 and www/images/faces/piratjonas.png 2011-05-09 19:32:09 +0000 differ | 16 | Binary files www/images/faces/piratjonas.png 2011-01-14 11:41:18 +0000 and www/images/faces/piratjonas.png 2011-05-09 19:32:09 +0000 differ |
541 | === removed file 'www/images/faces/piratnytt.png' | |||
542 | 15 | Binary files www/images/faces/piratnytt.png 2011-01-14 11:41:18 +0000 and www/images/faces/piratnytt.png 1970-01-01 00:00:00 +0000 differ | 17 | Binary files www/images/faces/piratnytt.png 2011-01-14 11:41:18 +0000 and www/images/faces/piratnytt.png 1970-01-01 00:00:00 +0000 differ |
543 | === modified file 'www/images/faces/piratplatsen.png' | |||
544 | 16 | Binary files www/images/faces/piratplatsen.png 2011-01-14 11:41:18 +0000 and www/images/faces/piratplatsen.png 2011-05-09 19:32:09 +0000 differ | 18 | Binary files www/images/faces/piratplatsen.png 2011-01-14 11:41:18 +0000 and www/images/faces/piratplatsen.png 2011-05-09 19:32:09 +0000 differ |
545 | === added file 'www/images/faces/ppnow.png' | |||
546 | 17 | Binary files www/images/faces/ppnow.png 1970-01-01 00:00:00 +0000 and www/images/faces/ppnow.png 2011-05-09 19:32:09 +0000 differ | 19 | Binary files www/images/faces/ppnow.png 1970-01-01 00:00:00 +0000 and www/images/faces/ppnow.png 2011-05-09 19:32:09 +0000 differ |
547 | === added file 'www/images/faces/simonlindgren.png' | |||
548 | 18 | Binary files www/images/faces/simonlindgren.png 1970-01-01 00:00:00 +0000 and www/images/faces/simonlindgren.png 2011-05-09 19:32:09 +0000 differ | 20 | Binary files www/images/faces/simonlindgren.png 1970-01-01 00:00:00 +0000 and www/images/faces/simonlindgren.png 2011-05-09 19:32:09 +0000 differ |
549 | === added file 'www/images/faces/svpol.png' | |||
550 | 19 | Binary files www/images/faces/svpol.png 1970-01-01 00:00:00 +0000 and www/images/faces/svpol.png 2011-05-09 19:32:09 +0000 differ | 21 | Binary files www/images/faces/svpol.png 1970-01-01 00:00:00 +0000 and www/images/faces/svpol.png 2011-05-09 19:32:09 +0000 differ |
551 | === removed file 'www/images/faces/tjejsnack.png' | |||
552 | 20 | Binary files www/images/faces/tjejsnack.png 2011-01-14 11:41:18 +0000 and www/images/faces/tjejsnack.png 1970-01-01 00:00:00 +0000 differ | 22 | Binary files www/images/faces/tjejsnack.png 2011-01-14 11:41:18 +0000 and www/images/faces/tjejsnack.png 1970-01-01 00:00:00 +0000 differ |
553 | === renamed file 'www/images/faces/borgmi.png' => 'www/images/faces/victoriawestberg.png' |