Merge lp:pplivesite into lp:~wester/pplivesite/infalls

Proposed by Torbjörn Wester on 2011-05-09
Status: Rejected
Rejected by: Torbjörn Wester on 2011-05-09
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
Reviewer Review Type Date Requested Status
Torbjörn Wester Approve on 2011-05-09
Review via email: mp+60418@code.launchpad.net

Description of the change

test

To post a comment you must log in.
Torbjörn Wester (wester) :
review: Approve

Unmerged revisions

609. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-07

sourceid

608. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-04

sourceid

607. By www-data <www-data@pplive> on 2012-05-03

bloglinks

606. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-03

bloglinks

605. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-03

bloglinks

604. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-05-03

frekar, ershag

603. By www-data <www-data@pplive> on 2012-05-03

Breddning

602. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-03-08

Hax24

601. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-03-08

Hax24

600. By Mikael Nilsson <mikaeln@giskard-glaptop> on 2012-03-07

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
6
7
8-# Har försökt fråga via marcin, men inte hört något.
9-[http://blog.brokep.com/category/piracy/feed/]
10-name = Copy me happy
11-face = brokep.png
12-sourceid = brokep
13-
14-[http://blog.brokep.com/category/big-brother/feed/]
15-name = Copy me happy
16-face = brokep.png
17-suppress = True
18-sourceid = brokep
19-
20-[http://blog.brokep.com/category/the-trial/feed/]
21-name = Copy me happy
22-face = brokep.png
23-suppress = True
24-sourceid = brokep
25+# XXX Har försökt fråga via marcin, men inte hört något.
26+#[http://blog.brokep.com/category/piracy/feed/]
27+#name = Copy me happy
28+#face = brokep.png
29+#sourceid = brokep
30+
31+#[http://blog.brokep.com/category/big-brother/feed/]
32+#name = Copy me happy
33+#face = brokep.png
34+#suppress = True
35+#sourceid = brokep
36+
37+#[http://blog.brokep.com/category/the-trial/feed/]
38+#name = Copy me happy
39+#face = brokep.png
40+#suppress = True
41+#sourceid = brokep
42
43
44
45@@ -328,7 +328,7 @@
46 suppress = True
47 sourceid = mini
48
49-# denna innehåller bara blogginlägg nu...
50+# XXX denna innehåller bara blogginlägg nu...
51 #[http://www.piratpartiet.se/node/feed]
52 #name = Piratpartiet Nyheter
53 #pirat = True
54@@ -389,11 +389,12 @@
55 face = pp.png
56 sourceid = syd
57
58-[http://nord.piratpartiet.se/feed/]
59-name = Piratpartiet Norra distriktet
60+[http://sodertalje.piratpartiet.se/feed/]
61+name = Piratpartiet Södertälje
62 pirat = True
63 face = pp.png
64-sourceid = nord
65+sourceid = sodertalje
66+
67
68
69
70@@ -467,9 +468,6 @@
71 sourceid = piratpartisten
72 face = piratpartisten.png
73
74-# Inte längre aktuell
75-# [http://nyheter24.se/nyheter/blogg/oscar-swartz/?service=rss]
76-# name = Nyheter24: Oscar Swartz
77
78
79 [http://ppdrift.wordpress.com/category/live/feed/]
80@@ -482,7 +480,7 @@
81
82
83 # Kalle ville ha "Pirate"
84-# Har flyttat till I2P ....
85+# XXX Har flyttat till I2P ....
86 #[http://xorbot.org/txt-category/pirate/feed]
87 #name = XORBOT
88 #pirat = True
89@@ -519,15 +517,6 @@
90
91
92
93-# TODO, har inte fått svar
94-[http://jacobdexe.wordpress.com/feed/]
95-name = Jacob Dexe
96-pirat = True
97-face = dexe.png
98-sourceid = dexe
99-
100-
101-
102 # Piratfrågor enligt Simon
103 [http://stenskott.wordpress.com/category/piratfragor/feed/]
104 name = Stenskott
105@@ -575,6 +564,7 @@
106 # TODO inte kollat
107 [http://blog.erlandsson.info/category/piratpartiet/feed/]
108 name = Leo Erlandsson
109+link = http://blog.erlandsson.info/
110 pirat = True
111 face = leo.png
112 sourceid = leo
113@@ -668,7 +658,6 @@
114 # Josh vill ha "pirat"
115 [http://scriptorium.se/josh/category/pirat/feed/]
116 name = Enligt min humla
117-pirat = True
118 face = enligtminhumla.png
119 sourceid = joshen
120 detect_encoding = False
121@@ -742,7 +731,7 @@
122
123
124 # Thomas ville detta
125-# Siten är nere
126+# XXX Siten är nere
127 #[http://www.selig.se/tag/Piratpartiet/feed/]
128 #name = Selig.se
129 #pirat = True
130@@ -767,7 +756,7 @@
131
132
133 # allt ville johan ha
134-[http://piratpartist.wordpress.com/feed/]
135+[http://piratpartist.nu/?feed=rss2]
136 name = Piratpartistens Blogg
137 pirat = True
138 face = piratpartist.png
139@@ -910,11 +899,13 @@
140 sourceid = erikj
141
142
143-[http://paranoianormal.se/blog/tag/piratpartiet/feed/]
144-name = Paranoianormal
145-pirat = True
146-face = paranoianormal.png
147-sourceid = paranoianormal
148+# XXX nere
149+#[http://paranoianormal.se/blog/tag/piratpartiet/feed/]
150+#name = Paranoianormal
151+#link = http://paranoianormal.se/blog/
152+#pirat = True
153+#face = paranoianormal.png
154+#sourceid = paranoianormal
155
156
157 [http://farmorgun.blogspot.com/feeds/posts/default/-/PP?alt=rss]
158@@ -955,14 +946,6 @@
159
160
161
162-# Tobias ville ha "politik"
163-[http://tobias.funderar.se/tag/politik/feed/]
164-name = En objektiv sanning
165-pirat = True
166-face = objektivsanning.png
167-sourceid = objektivsanning
168-
169-
170 # Ville ha Live
171 [http://www.piratplatsen.se/?q=taxonomy/term/1/all/feed]
172 name = Piratplatsen
173@@ -1018,7 +1001,6 @@
174 # Olof ville ha informationspolitik
175 [http://olofb.wordpress.com/tag/informationspolitik/feed/]
176 name = OlofB[eta]
177-pirat = True
178 face = olofb.png
179 sourceid = olofb
180
181@@ -1035,7 +1017,7 @@
182
183 # Nipe ville ha "piratpartiet"
184 [http://gustavnipe.wordpress.com/category/piratpartiet/feed/]
185-name = I polemik
186+name = Förbundsordföranden
187 pirat = True
188 face = gustavnipe.png
189 sourceid = gustavnipe
190@@ -1059,6 +1041,7 @@
191 # Bara Övervakningssamhället, **eget filter**
192 [http://scabernestor.blogg.se/index.rss]
193 name = Scaber Nestor
194+annatparti = l
195 filters = scaber_nestor_categories.py
196 face = scabernestor.png
197 sourceid = scabernestor
198@@ -1828,6 +1811,7 @@
199 # Dolkow ville ha "piratpartiet"
200 [http://dolkow.se/blog/post.php/category/piratpartiet/feed/]
201 name = Snilds korta
202+link = http://dolkow.se/blog/
203 pirat = True
204 face = dolkow.png
205 sourceid = dolkow
206@@ -1956,6 +1940,7 @@
207 # Sandra ville ha "piratpartiet"
208 [http://www.sandrability.com/taggar/piratpartiet/feed/]
209 name = Sandrability.com
210+link = http://www.sandrability.com/
211 pirat = True
212 face = sandrability.png
213 sourceid = sandrability
214@@ -2021,6 +2006,7 @@
215 sourceid = grodornakokar
216
217
218+# XXX invite only
219 # Eva ville Piratpartiet, integritet, patent och immaterialrätt.
220 #[http://generalklausul.blogspot.com/feeds/posts/default/-/piratpartiet?alt=rss]
221 #name = Hundratusentals Ögonblick
222@@ -2157,13 +2143,6 @@
223 detect_encoding = False
224
225
226-[http://tjejsnack.piratpartiet.se/feed/]
227-name = Tjejsnack
228-pirat = True
229-face = tjejsnack.png
230-sourceid = tjejsnack
231-
232-
233 # Björn ville ha "pp" och "pirat"
234 [http://bjornodlund.wordpress.com/tag/pp/feed/]
235 name = Björn Odlund
236@@ -2202,26 +2181,20 @@
237 suppress = True
238
239
240-# Victoria ville ha Ung Pirat, Piratpartiet, och Piratrörelsen.
241-[http://borgmi.wordpress.com/tag/ung-pirat/feed/]
242-name = Borgmi
243-pirat = True
244-face = borgmi.png
245-sourceid = borgmi
246-
247-[http://borgmi.wordpress.com/tag/piratpartiet/feed/]
248-name = Borgmi
249-pirat = True
250-face = borgmi.png
251-sourceid = borgmi
252-suppress = True
253-
254-[http://borgmi.wordpress.com/tag/piratrorelsen/feed/]
255-name = Borgmi
256-pirat = True
257-face = borgmi.png
258-sourceid = borgmi
259-suppress = True
260+# Victoria ville ha Ung Pirat, Piratpartiet.
261+[http://victoriawestberg.se/tag/ung-pirat/feed/]
262+name = Victoria Westberg
263+pirat = True
264+face = victoriawestberg.png
265+sourceid = victoriawestberg
266+
267+[http://victoriawestberg.se/tag/piratpartiet/feed/]
268+name = Victoria Westberg
269+pirat = True
270+face = victoriawestberg.png
271+sourceid = victoriawestberg
272+suppress = True
273+
274
275
276 #Ville ha "piratpartiet"
277@@ -2292,12 +2265,13 @@
278 suppress = True
279
280
281+# XXX nere
282 # Ville ha "live"
283-[http://www.piratus.se/?tag=live&feed=rss2]
284-name = Piratus
285-pirat = True
286-face = piratus.png
287-sourceid = piratus
288+#[http://www.piratus.se/?tag=live&feed=rss2]
289+#name = Piratus
290+#pirat = True
291+#face = piratus.png
292+#sourceid = piratus
293
294
295 # ville ha piratpartiet
296@@ -2486,20 +2460,13 @@
297 # Filtrera på fritext "Nunc aut nuncuam" **eget filter**
298 [http://blogg.aftonbladet.se/feeds/entries/21909/rss]
299 name = Svensk Myndighetskontroll
300+annatparti = l
301 filters = svensk_myndighetskontroll_categories.py
302 face = svensk_myndighetskontroll.png
303 link = http://blogg.aftonbladet.se/21909
304 sourceid = svensk_myndighetskontroll
305
306
307-[http://www.piratnytt.nu/index.php?format=feed&type=rss]
308-name = Piratnytt
309-pirat = True
310-link = http://www.piratnytt.nu/
311-face = piratnytt.png
312-sourceid = piratnytt
313-
314-
315
316 # Hela relevant
317 [http://acta.mpbloggar.se/feed/]
318@@ -2528,13 +2495,6 @@
319
320
321
322-# pplive
323-[http://www.meastro.se/?cat=58&feed=rss2]
324-name = Maestro.se
325-pirat = True
326-face = maestro.png
327-sourceid = maestro
328-
329
330 #
331 [http://jonasnordgren.se/?cat=3&feed=rss2]
332@@ -2588,18 +2548,18 @@
333
334
335
336-
337+# XXX nere
338 # Propiratism
339-[http://nordicbattlegroup.org/?cat=4&feed=rss2]
340-name = Nördic Battlegroup – Ad Omnia Piratus
341-pirat = True
342-face = nordicbattlegroup.png
343-sourceid = nordicbattlegroup
344-
345-
346-
347-
348-# ville ha PP lokalt, PP internt och Politik
349+#[http://nordicbattlegroup.org/?cat=4&feed=rss2]
350+#name = Nördic Battlegroup – Ad Omnia Piratus
351+#pirat = True
352+#face = nordicbattlegroup.png
353+#sourceid = nordicbattlegroup
354+
355+
356+
357+
358+# ville ha PP lokalt, PP internt, Ung pirat och Politik
359 [http://jppirat.blogspot.com/feeds/posts/default/-/PP%20lokalt?alt=rss]
360 name = värmlandspiraten
361 pirat = True
362@@ -2615,6 +2575,14 @@
363 sourceid = jppirat
364 suppress = True
365
366+[http://jppirat.blogspot.com/feeds/posts/default/-/Ung%20Pirat?alt=rss]
367+name = värmlandspiraten
368+pirat = True
369+link = http://jppirat.blogspot.com/
370+face = jppirat.png
371+sourceid = jppirat
372+suppress = True
373+
374 [http://jppirat.blogspot.com/feeds/posts/default/-/Politik?alt=rss]
375 name = värmlandspiraten
376 pirat = True
377@@ -2721,7 +2689,7 @@
378 sourceid = ruhovi
379
380
381-# Aktivism!
382+# XXX Aktivism!
383 #[http://data.piratpartiet.se/Rss/Activism.aspx?OrganizationId=1]
384 #name = Piratpartiet aktivism!
385 #pirat = True
386@@ -2775,28 +2743,6 @@
387 sourceid = anonwret
388
389
390-# "piratrelaterat", "ung pirat" och taggen "piratpartiet"
391-[http://olofnoaksson.wordpress.com/category/piratrelaterat/feed/]
392-name = Olof Noaksson's Blogg
393-pirat = True
394-face = olofnoaksson.png
395-sourceid = olofnoaksson
396-
397-[http://olofnoaksson.wordpress.com/category/ung-pirat/feed/]
398-name = Olof Noaksson's Blogg
399-pirat = True
400-face = olofnoaksson.png
401-sourceid = olofnoaksson
402-suppress = True
403-
404-[http://olofnoaksson.wordpress.com/tag/piratpartiet/feed/]
405-name = Olof Noaksson's Blogg
406-pirat = True
407-face = olofnoaksson.png
408-sourceid = olofnoaksson
409-suppress = True
410-
411-
412
413 # Piratpartiet och Piratfrågor
414 [http://hansblogg.wordpress.com/category/piratfragor/feed/]
415@@ -2886,6 +2832,7 @@
416 name = [insert random stupid name here]
417 face = jamtsved.png
418 sourceid = jamtsved
419+suppress = True
420
421
422
423@@ -2907,13 +2854,14 @@
424 sourceid = hell-man
425
426
427+# XXX nere
428 # "pirat"
429-[http://www.fredrikhallund.com/?tag=integritet&feed=rss2]
430-pirat = True
431-link = http://www.fredrikhallund.com/
432-name = På djupa vatten
433-face = djupavatten.png
434-sourceid = djupavatten
435+#[http://www.fredrikhallund.com/?tag=integritet&feed=rss2]
436+#pirat = True
437+#link = http://www.fredrikhallund.com/
438+#name = På djupa vatten
439+#face = djupavatten.png
440+#sourceid = djupavatten
441
442
443 # "piratpartiet"
444@@ -2960,3 +2908,67 @@
445 sourceid = ekferjan
446
447
448+[http://cmagnusb.wordpress.com/tag/pplive/feed/]
449+pirat = True
450+link = http://cmagnusb.wordpress.com/
451+name = Det är en bra dag idag!
452+face = cmagnusb.png
453+sourceid = cmagnusb
454+
455+
456+
457+[http://ppnow.blog.com/feed/]
458+pirat = True
459+name = Strategies for the Pirate Movement
460+face = ppnow.png
461+sourceid = ppnow
462+
463+
464+[http://anton.nordenfur.se/tag/piratpartiet/feed/]
465+pirat = True
466+name = Anton Nordenfur
467+link = http://anton.nordenfur.se/
468+face = nordenfur.png
469+sourceid = nordenfur
470+
471+
472+[http://simonlindgren.se/?category_name=piratpartiet&feed=rss2]
473+pirat = True
474+name = Simon Lindgren
475+link = http://simonlindgren.se/
476+face = simonlindgren.png
477+sourceid = simonlindgren
478+
479+
480+[http://fildelning.se/feed/]
481+link = http://fildelning.se/
482+name = Fildelning
483+face = fildelning.png
484+sourceid = fildelning
485+
486+
487+# Sandra ville ha "Politik"
488+[http://terobi.se/category/politik/feed/]
489+name = terobi
490+pirat = True
491+face = terobi.png
492+link = http://terobi.se/
493+sourceid = terobi
494+
495+
496+# Dexe ville ha "live"
497+[http://dexe.nu/tag/live/feed/]
498+name = Jacob Dexe
499+face = dexe.png
500+sourceid = dexe
501+link = http://dexe.nu/
502+
503+
504+[http://svpol.se/tag/pplive/feed/]
505+name = #svpol
506+face = svpol.png
507+sourceid = svpol
508+link = http://svpol.se/
509+
510+
511+
512
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 #!/bin/bash
518
519+if [ "$(whoami)" = "root" ]; then echo "Fuck off."; exit; fi
520+
521 PLANET=venus/planet.py
522 CONFIGS="highlight live"
523
524
525=== added file 'www/images/faces/cmagnusb.png'
526Binary 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'
528Binary 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'
530Binary 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'
532Binary 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'
534Binary 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'
536Binary 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'
538Binary 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'
540Binary 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'
542Binary 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'
544Binary 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'
546Binary 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'
548Binary 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'
550Binary 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'
552Binary 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'

Subscribers

People subscribed via source and target branches