Author: esj@rezo.net
Date: 2008-08-26 09:45:54 +0200 (mar, 26 aoû 2008)
New Revision: 12409
Log:
Report des dépôts concernant la mise en squelette des flux RSS (certains des dépots entre [12385] à [12405]). La commande {{{svn merge }}} a refusé de fonctionner, apparamment parce qu'elle ne sait pas gérer la création de répertoires et/ou le déplacement de fichier. Donc création et copie à la main des différences repérées. Tests semblent ok.
A noter que les deux branches ne sont néanmoins pas égales: les fichiers action/tourner et inc/ajouter_document diffèrent, plus qq fichiers que la doc automatique a traités différrement.
Added:
branches/spip-2.0.0/dist/rss_forum_article.html
branches/spip-2.0.0/dist/rss_forum_breve.html
branches/spip-2.0.0/dist/rss_forum_rubrique.html
branches/spip-2.0.0/dist/rss_forum_syndic.html
branches/spip-2.0.0/dist/rss_forum_thread.html
branches/spip-2.0.0/prive/rss.html
branches/spip-2.0.0/prive/rss/
branches/spip-2.0.0/prive/rss/a_suivre.html
branches/spip-2.0.0/prive/rss/forums.html
branches/spip-2.0.0/prive/rss/forums_interne.html
branches/spip-2.0.0/prive/rss/forums_prop.html
branches/spip-2.0.0/prive/rss/forums_public.html
branches/spip-2.0.0/prive/rss/forums_spam.html
branches/spip-2.0.0/prive/rss/forums_vide.html
branches/spip-2.0.0/prive/rss/messagerie.html
branches/spip-2.0.0/prive/rss/revisions.html
branches/spip-2.0.0/prive/rss/signatures.html
Modified:
branches/spip-2.0.0/ecrire/action/rss.php
branches/spip-2.0.0/ecrire/exec/accueil.php
branches/spip-2.0.0/ecrire/exec/articles_forum.php
branches/spip-2.0.0/ecrire/exec/controle_forum.php
branches/spip-2.0.0/ecrire/exec/suivi_revisions.php
branches/spip-2.0.0/ecrire/exec/valider_xml.php
branches/spip-2.0.0/ecrire/inc/acces.php
branches/spip-2.0.0/ecrire/inc/filtres.php
branches/spip-2.0.0/ecrire/inc/presentation.php
branches/spip-2.0.0/ecrire/inc/suivi_versions.php
branches/spip-2.0.0/ecrire/inc/utils.php
branches/spip-2.0.0/ecrire/public/parametrer.php
branches/spip-2.0.0/prive/ical_prive.html