Merge lp://qastaging/ubuntu-uy-website into lp://qastaging/ubuntu-uy-website/trunk
Proposed by
Pablo Rubianes
Status: | Merged |
---|---|
Approved by: | Pablo Rubianes |
Approved revision: | 68 |
Merged at revision: | 33 |
Proposed branch: | lp://qastaging/ubuntu-uy-website |
Merge into: | lp://qastaging/ubuntu-uy-website/trunk |
Diff against target: |
101482 lines (+82070/-17446) 270 files modified
Auth/OpenID.php (+563/-0) Auth/OpenID/AX.php (+1022/-0) Auth/OpenID/Association.php (+610/-0) Auth/OpenID/BigMath.php (+452/-0) Auth/OpenID/Consumer.php (+2230/-0) Auth/OpenID/CryptUtil.php (+108/-0) Auth/OpenID/DatabaseConnection.php (+130/-0) Auth/OpenID/DiffieHellman.php (+113/-0) Auth/OpenID/Discover.php (+606/-0) Auth/OpenID/DumbStore.php (+99/-0) Auth/OpenID/Extension.php (+61/-0) Auth/OpenID/FileStore.php (+618/-0) Auth/OpenID/HMAC.php (+98/-0) Auth/OpenID/Interface.php (+196/-0) Auth/OpenID/KVForm.php (+111/-0) Auth/OpenID/MDB2Store.php (+413/-0) Auth/OpenID/MemcachedStore.php (+207/-0) Auth/OpenID/Message.php (+920/-0) Auth/OpenID/MySQLStore.php (+77/-0) Auth/OpenID/Nonce.php (+108/-0) Auth/OpenID/PAPE.php (+300/-0) Auth/OpenID/Parse.php (+377/-0) Auth/OpenID/PostgreSQLStore.php (+112/-0) Auth/OpenID/SQLStore.php (+557/-0) Auth/OpenID/SQLiteStore.php (+70/-0) Auth/OpenID/SReg.php (+521/-0) Auth/OpenID/Server.php (+1765/-0) Auth/OpenID/ServerRequest.php (+36/-0) Auth/OpenID/TrustRoot.php (+461/-0) Auth/OpenID/URINorm.php (+249/-0) Auth/Yadis/HTTPFetcher.php (+174/-0) Auth/Yadis/Manager.php (+521/-0) Auth/Yadis/Misc.php (+58/-0) Auth/Yadis/ParanoidHTTPFetcher.php (+245/-0) Auth/Yadis/ParseHTML.php (+258/-0) Auth/Yadis/PlainHTTPFetcher.php (+248/-0) Auth/Yadis/XML.php (+352/-0) Auth/Yadis/XRDS.php (+478/-0) Auth/Yadis/XRI.php (+234/-0) Auth/Yadis/XRIRes.php (+72/-0) Auth/Yadis/Yadis.php (+382/-0) Doc/BluePrints.txt (+14/-0) Doc/COPYRIGHT.txt (+22/-0) Doc/LICENCE.txt (+133/-0) Doc/LICENCIA.txt (+117/-0) Doc/Launchpad.txt (+7/-0) Doc/Readme.txt (+86/-0) Doc/openid/Auth/OpenID.php (+552/-0) Doc/openid/Auth/OpenID/AX.php (+1023/-0) Doc/openid/Auth/OpenID/Association.php (+613/-0) Doc/openid/Auth/OpenID/BigMath.php (+471/-0) Doc/openid/Auth/OpenID/Consumer.php (+2227/-0) Doc/openid/Auth/OpenID/CryptUtil.php (+109/-0) Doc/openid/Auth/OpenID/DatabaseConnection.php (+131/-0) Doc/openid/Auth/OpenID/DiffieHellman.php (+113/-0) Doc/openid/Auth/OpenID/Discover.php (+548/-0) Doc/openid/Auth/OpenID/DumbStore.php (+100/-0) Doc/openid/Auth/OpenID/Extension.php (+62/-0) Doc/openid/Auth/OpenID/FileStore.php (+618/-0) Doc/openid/Auth/OpenID/HMAC.php (+99/-0) Doc/openid/Auth/OpenID/Interface.php (+197/-0) Doc/openid/Auth/OpenID/KVForm.php (+112/-0) Doc/openid/Auth/OpenID/MemcachedStore.php (+208/-0) Doc/openid/Auth/OpenID/Message.php (+915/-0) Doc/openid/Auth/OpenID/MySQLStore.php (+78/-0) Doc/openid/Auth/OpenID/Nonce.php (+109/-0) Doc/openid/Auth/OpenID/PAPE.php (+301/-0) Doc/openid/Auth/OpenID/Parse.php (+352/-0) Doc/openid/Auth/OpenID/PostgreSQLStore.php (+113/-0) Doc/openid/Auth/OpenID/SQLStore.php (+569/-0) Doc/openid/Auth/OpenID/SQLiteStore.php (+71/-0) Doc/openid/Auth/OpenID/SReg.php (+521/-0) Doc/openid/Auth/OpenID/Server.php (+1754/-0) Doc/openid/Auth/OpenID/ServerRequest.php (+37/-0) Doc/openid/Auth/OpenID/TrustRoot.php (+462/-0) Doc/openid/Auth/OpenID/URINorm.php (+249/-0) Doc/openid/Auth/Yadis/HTTPFetcher.php (+147/-0) Doc/openid/Auth/Yadis/Manager.php (+529/-0) Doc/openid/Auth/Yadis/Misc.php (+59/-0) Doc/openid/Auth/Yadis/ParanoidHTTPFetcher.php (+228/-0) Doc/openid/Auth/Yadis/ParseHTML.php (+259/-0) Doc/openid/Auth/Yadis/PlainHTTPFetcher.php (+251/-0) Doc/openid/Auth/Yadis/XML.php (+374/-0) Doc/openid/Auth/Yadis/XRDS.php (+478/-0) Doc/openid/Auth/Yadis/XRI.php (+234/-0) Doc/openid/Auth/Yadis/XRIRes.php (+72/-0) Doc/openid/Auth/Yadis/Yadis.php (+382/-0) Doc/openid/conectar.html (+28/-0) Doc/openid/conectar.php (+28/-0) Doc/openid/config.php (+12/-0) Doc/openid/formulario-registro.php (+114/-0) Doc/openid/index.html (+44/-0) Doc/openid/login.php (+42/-0) Doc/openid/logout.php (+7/-0) Doc/openid/openid.php (+40/-0) Doc/openid/openid_return.php (+64/-0) Doc/openid/usuarios.sql (+8/-0) Doc/openid/zona-restringida.php (+10/-0) Readme.txt (+0/-18) SQL/locoportal.sql (+103/-0) admin/css/UnitySlide.css (+313/-0) admin/css/Unityslide.css (+311/-0) admin/css/default.css (+334/-0) admin/css/ie.css (+299/-0) admin/css/ie6.css (+301/-0) admin/css/lightbox.css (+27/-0) admin/css/wireframe-default.css (+120/-0) admin/css/wireframe-ie.css (+123/-0) admin/css/wireframe-ie6.css (+123/-0) admin/highslide/highslide-full.js (+3302/-0) admin/highslide/highslide-full.min.js (+9/-0) admin/highslide/highslide-full.packed.js (+9/-0) admin/highslide/highslide-ie6.css (+76/-0) admin/highslide/highslide-with-gallery.js (+2639/-0) admin/highslide/highslide-with-gallery.min.js (+9/-0) admin/highslide/highslide-with-gallery.packed.js (+9/-0) admin/highslide/highslide-with-html.js (+2477/-0) admin/highslide/highslide-with-html.min.js (+9/-0) admin/highslide/highslide-with-html.packed.js (+9/-0) admin/highslide/highslide.css (+886/-0) admin/highslide/highslide.js (+1886/-0) admin/highslide/highslide.min.js (+9/-0) admin/highslide/highslide.packed.js (+9/-0) admin/index.php (+84/-0) admin/js/builder.js (+136/-0) admin/js/effects.js (+1123/-0) admin/js/lightbox-web.js (+497/-0) admin/js/lightbox.js (+496/-0) admin/js/main.js (+43/-0) admin/js/pngFix.js (+13/-0) admin/js/prototype.js (+6081/-0) admin/js/scriptaculous.js (+68/-0) admin/js/ventanas.js (+20/-0) admin/template.php (+61/-0) auth.php (+84/-0) calendario.php (+82/-115) cerrar.php (+11/-0) common.php (+97/-0) conex.php (+14/-14) css/default.css (+23/-5) css/lightbox.css (+27/-0) enviarPedido.php (+107/-0) estadisticas.php (+42/-45) examples/ajax.html (+51/-0) examples/flash.html (+61/-0) examples/gallery-controls-in-heading.html (+89/-0) examples/gallery-dark.html (+93/-0) examples/gallery-floating-caption.html (+91/-0) examples/gallery-floating-thumbs.html (+144/-0) examples/gallery-horizontal-strip.html (+147/-0) examples/gallery-in-box.html (+95/-0) examples/gallery-in-page.html (+221/-0) examples/gallery-thumbstrip-above.html (+142/-0) examples/gallery-vertical-strip.html (+178/-0) examples/gallery-white.html (+90/-0) examples/headline.html (+49/-0) examples/html.html (+67/-0) examples/iframe.html (+44/-0) examples/image-map.html (+49/-0) examples/includes/ajax.htm (+45/-0) examples/includes/include-short.htm (+40/-0) examples/inline.html (+50/-0) examples/mini-galleries.html (+135/-0) examples/mini-gallery.html (+89/-0) examples/no-border.html (+62/-0) examples/no-outline.html (+52/-0) examples/outer-glow.html (+53/-0) examples/white-10px.html (+51/-0) examples/white-rounded-outline.html (+51/-0) examples/youtube.html (+62/-0) finish_auth.php (+97/-0) footer.php (+90/-93) highslide/highslide-full.js (+3302/-0) highslide/highslide-full.min.js (+9/-0) highslide/highslide-full.packed.js (+9/-0) highslide/highslide-ie6.css (+76/-0) highslide/highslide-with-gallery.js (+2639/-0) highslide/highslide-with-gallery.min.js (+9/-0) highslide/highslide-with-gallery.packed.js (+9/-0) highslide/highslide-with-html.js (+2477/-0) highslide/highslide-with-html.min.js (+9/-0) highslide/highslide-with-html.packed.js (+9/-0) highslide/highslide.css (+886/-0) highslide/highslide.js (+1886/-0) highslide/highslide.min.js (+9/-0) highslide/highslide.packed.js (+9/-0) index.php (+193/-157) irc.php (+57/-51) js/builder.js (+136/-0) js/effects.js (+1123/-0) js/lightbox-web.js (+497/-0) js/lightbox.js (+496/-0) js/prototype.js (+6081/-0) js/scriptaculous.js (+68/-0) live.php (+3/-2) login/Auth/OpenID.php (+0/-563) login/Auth/OpenID/AX.php (+0/-1022) login/Auth/OpenID/Association.php (+0/-610) login/Auth/OpenID/BigMath.php (+0/-452) login/Auth/OpenID/Consumer.php (+0/-2230) login/Auth/OpenID/CryptUtil.php (+0/-108) login/Auth/OpenID/DatabaseConnection.php (+0/-130) login/Auth/OpenID/DiffieHellman.php (+0/-113) login/Auth/OpenID/Discover.php (+0/-606) login/Auth/OpenID/DumbStore.php (+0/-99) login/Auth/OpenID/Extension.php (+0/-61) login/Auth/OpenID/FileStore.php (+0/-618) login/Auth/OpenID/HMAC.php (+0/-98) login/Auth/OpenID/Interface.php (+0/-196) login/Auth/OpenID/KVForm.php (+0/-111) login/Auth/OpenID/MDB2Store.php (+0/-413) login/Auth/OpenID/MemcachedStore.php (+0/-207) login/Auth/OpenID/Message.php (+0/-920) login/Auth/OpenID/MySQLStore.php (+0/-77) login/Auth/OpenID/Nonce.php (+0/-108) login/Auth/OpenID/PAPE.php (+0/-300) login/Auth/OpenID/Parse.php (+0/-377) login/Auth/OpenID/PostgreSQLStore.php (+0/-112) login/Auth/OpenID/SQLStore.php (+0/-557) login/Auth/OpenID/SQLiteStore.php (+0/-70) login/Auth/OpenID/SReg.php (+0/-521) login/Auth/OpenID/Server.php (+0/-1765) login/Auth/OpenID/ServerRequest.php (+0/-36) login/Auth/OpenID/TrustRoot.php (+0/-461) login/Auth/OpenID/URINorm.php (+0/-249) login/Auth/Yadis/HTTPFetcher.php (+0/-174) login/Auth/Yadis/Manager.php (+0/-521) login/Auth/Yadis/Misc.php (+0/-58) login/Auth/Yadis/ParanoidHTTPFetcher.php (+0/-245) login/Auth/Yadis/ParseHTML.php (+0/-258) login/Auth/Yadis/PlainHTTPFetcher.php (+0/-248) login/Auth/Yadis/XML.php (+0/-352) login/Auth/Yadis/XRDS.php (+0/-478) login/Auth/Yadis/XRI.php (+0/-234) login/Auth/Yadis/XRIRes.php (+0/-72) login/Auth/Yadis/Yadis.php (+0/-382) login/conectar.php (+0/-28) login/config.php (+0/-12) login/formulario-registro.php (+0/-114) login/index.html (+0/-44) login/login.php (+0/-42) login/logout.php (+0/-7) login/openid.php (+0/-42) login/openid_return.php (+0/-72) login/usuarios.sql (+0/-8) login/zona-restringida.php (+0/-10) menu.php (+37/-16) planet/uyplanet/config.php (+66/-0) planet/uyplanet/css/2c-r-fixed.css (+68/-0) planet/uyplanet/css/images.css (+64/-0) planet/uyplanet/css/reset.css (+64/-0) planet/uyplanet/css/typography.css (+141/-0) planet/uyplanet/index.php (+169/-0) planet/uyplanet/magpierss/extlib/Snoopy.class.inc (+900/-0) planet/uyplanet/magpierss/rss_cache.inc (+200/-0) planet/uyplanet/magpierss/rss_fetch.inc (+458/-0) planet/uyplanet/magpierss/rss_parse.inc (+605/-0) planet/uyplanet/magpierss/rss_utils.inc (+67/-0) planet/uyplanet/planet.php (+57/-0) planet/uyplanet/style.css (+274/-0) shipituy.php (+275/-0) shipituypopup.php (+264/-0) slide/fotos-uy.html (+14/-11) slide/novedades.html (+1/-0) slide/webdevel.html (+1/-0) template.php (+82/-78) ubuntu.php (+120/-123) unity.php (+95/-127) webdevel.php (+222/-0) webdevel/website.xhtml (+130/-0) |
To merge this branch: | bzr merge lp://qastaging/ubuntu-uy-website |
Related bugs: | |
Related blueprints: |
Foro del sitio
(High)
Slide de noticias
(Low)
Formulario para pedido de CD's
(Medium)
Estilo de programacion
(High)
Galeria de Imagenes
(Undefined)
Links de Footer
(High)
Planet
(Undefined)
Update de carĂ¡tulas de eventos realizados
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Pablo Rubianes | merge | Approve | |
Review via email:
|
This proposal supersedes a proposal from 2011-06-19.
Description of the change
Pasar a trunk todo el desarollo de la version 1.0
To post a comment you must log in.
Se aprueba