[mb-commits] branch, master, updated. Merge branch 'beta' Fake-merge the broken 'origin/beta' to preserve history M...
MusicBrainz Git Server <[email protected]>
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1Thy2S-0002qD-HJ@wiley> |
The branch, master has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=041642df3759db24305825938cf9999973c8db50 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7b42a0221bf4065d42def9a50d5212b6933335de (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=564ce4eb390d65a7619e6aedc0c8117059ec1ced (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=4240bbd879c62dd2439d6926cc55d564e0743052 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=110d1c7efc19c4f0a529b778a9d8f5d064032f2d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=97666a3f4a374e4e75f2075ee269cb5e83455d75 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9c84c6a2934c918188ff12a9d9bd711df6c8260b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3399a7f66c912144e06803843f881efba6ebeb33 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=614bd98187b984631ef7f2f8a605f2eed3dae020 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e47d5d0c461e717b334a5eb6f92668e7975175e0 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8aa530fcb7f49da3074b0ec877ac1eca4a67d937 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5e7ed2cdf36e4a03459bb35534aac50b7cc470b6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d67e1a09c0c4f1a52fe488a22b37946dc36970d2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c74933d025bc9053d60e511f96d8103ca63dd865 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a8dfdd5326635708048b797f652934649aae5e46 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d94b32096b5a968a3e18e96fb4ec4da053192a83 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9cb38bdf3dcc102d4dddabb410a723ed18beccfc (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6f7048674a085f68fd138000d51cfd0671e604be (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=91df07123a4fb3defb108e87496bfd404cf06346 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=02c209cf0a968f87a8b01ee328230cd06eebd229 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=459e9f782985c23af0c4cce6a2ee2b684746f8b7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=02ffb9b76832efec42bd8466e4452833769b1c12 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=309f3bb3530e44d921d7d889949ee16cd07fa02d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=adf0509920e857415d49ea0de00a8a485693792a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=28de439a67929b20de63d43fd4b0f16e59e72fc6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=4c045ec040d48feb10b7dac787b801f95bd3f723 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=520ea4e1df2d98c953538ee3f3c36ed02807dda2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d816f942c0e6431c7d00df3244a3781bcc4ebe37 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=57fc67be2656da1e7363f1bd752c7199c8f3eedb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cb03b1687bf5d43fc91c5a7bdfd0796c738a9189 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6027b1521b2273d5d980c01ac9dcdb4dc2736d43 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e1f732d0a6030102f0e2d9c2b2ff51e1561be7bc (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=4aa6715db0a0aa0be285cba5206a4502e47d11be (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=62d5846b07e3ffae3da55891de37013adffc308a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a240caf306a75c3a2aec521a0da7c5de7f39f8ca (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=dce7b60b89d56545ba1bc704c0a6a7f2e97648e5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8cc2e760c627fe0393838cc3284ea35dd896eca6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=952294a618a94320de6bc532430ee23f52801c03 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=eef0a2ed3873203adc9c3c979b4f6119f88657bd (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8d7b78e8b913f00e171ffea0eb7a11d9b6350ec1 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f383b93bf0e5251a51706d96de1b91e318e30cc6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=07983e7c2172f5bd722e7c8a3f1422b152ff6786 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1f7aff8bf47351aaf354af41bee2bf4211904b3f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e2ff2237d0424a7edb6755bbe4ffd0dca9da61c9 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b524e5378a1896e517017bf517eb175a7c36d82d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a2a2f115a57d711a2678af4d202b49ad525e5d0a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e5cc1ba0571bbd19cd9be2dbf38f8ba09fc329cb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=786cc4354a8269f987776dc51edcd5240f13451c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cd18b74cc198b002918548aa144a2c66cf09f32e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3b673e3232c5ac60031717495a01fb5f55e55539 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d0760218100736a3259b083b55bee73daab35510 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=597dfbf058c1b6554ea685fb71ce5fbdf2ccf3d3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=bb063f399f4ffc03c21c3d2874734ca6601aebc9 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1d8bce086ae910a027ce8363efe59f9319efc53f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=79d3d0f1eb3705eea7d0ce2ae9e92e09af9b4ee1 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3139b9274ebd70622821dfc0bd6c6a4961ccc1af (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=aea7f79a12df01b5ca4d56bd52bbd43ea886b7c7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fd78521419d77655693a2a64fe1a4c8f48e52dbf (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=eed2499952cddd801062f27e83071d247e4c4645 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f3ec53f76a666887da99daf6d2f25bbbef0ed75f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0980b5784b237dd3ef7dde7dd721f15a2a46170c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=14610b4dbbd035ce96911a5515c75d7946bd9db5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=bbac5ef52d678a14ceaad6c4a8da54ff796943f3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=aa5d506c026b89cd246657e7343116405c026f65 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e11a6d3f1443b2e8d1abbdc72654c40b2c32f2f5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b948fd9de002efda93cc3896d44d2119e8daf103 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5a826ee98cd8b7594cd3010882efe8af287fef93 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ce8267f674b8d203d2f0e2cf1480257d798b6cea (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d3bb04315f284bd3b9a02b10ab21ca97e186b6f2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=86cb4adfd943c4da4c96a16336f1fc56ec7c7873 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b8bab5d13c6d6c29f291ae8cce45f7b61bdc4373 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ff8e4aa9c5a02f3ddc1b20ac9fb93a5f4f206635 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a39ebc378013b927ce6dbc3c24760e2eca8c2488 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=826276b1c5c507ffa431376cbced133596aad5ef (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7c0210be7d96d40d69c54bdd3d54f0b28253a155 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8edb24d218fb93ed32a14c6e20242ee3e5f54967 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ab038263b1cb29548c17898726e720ef3ea1f1a9 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b0491433b58ebc62363e6ef23744e811d6982aeb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1fef68d7706a50679fba548d83e27d17f3d30dcf (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=94a84cc18badbbf833bb31cb679bb6552e3d05db (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3cd8cb99255cf40b8344585ff05767112e66294f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ba9aef0abe1c4e886d131293340ae9cecd37b0c4 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5c582219f6c1a6afd0fdd774deb9c32bd0a012d5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=da574fd83ddeba7f7088f7bc506a14de1ec49eee (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=00ae5da085ab0b1f2037d4ac8639cca1c83ba05c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ebf1b4c9f0f22ffe57dcc5d7ebea100a88c74727 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cd037d00fe21e82c7d0487686bbe9a088ca94344 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=17690bcc4d06d0575337400997db498d506b3844 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a1ef210204d514a6a5ed0b189a1f80b2dcf3017b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c65039dc3ad96e3198f2981b280130765b5b9502 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=396bd51c68ee773271b09e58eaea95995ac67d11 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5dfaeba3b4550d3fb493c432ed64bb60936b145e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3c886524a56cd9bbed1966f16527b13617e899f2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6ac1e7a274b6f8aa7c787073152fb8f28b441fec (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=00dfb90267e7b7f37b097dab416c77ed922b17c6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ee45a9a92a42f3bd82ea422e87ee34364a5cf103 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=edd89935c0773e3f3e8bc51180efa1725af25b9e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0a2110972a0ec9a0506332b4b6e51f1fe73abc0d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8d66f90396cc8de351fe9f41a58577ed29208dd1 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c0590b92500c3a3fc3ba1b960a0793e167020f70 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3972d4c3b7d2991cb5e97d48cab8ee1450cf3732 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3e75177783025c8326a832e8b76cf81667491216 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1f631ccd1aedabb234d7a187660d2a5fe352fe6d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0262cef4bb44d7e2315cc4a02fe5bce5b7e2f73c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=57ff8d4ac0cc1d1f14843485bd5de1beff21243b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8949e6d6ffdbe7d98fcba52e7bea8ca52fb3135c (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=667064ed94d95f4a5cb04d28cadf59079440266f (commit)
Summary of changes:
admin/RunExport | 6 +
admin/replication/BundleReplicationPackets | 243 +++++++++++
admin/replication/LoadReplicationChanges | 90 +++-
lib/MusicBrainz/Server/Controller/Account.pm | 2 +-
lib/MusicBrainz/Server/Controller/Artist.pm | 1 +
lib/MusicBrainz/Server/Controller/JS.pm | 24 +-
lib/MusicBrainz/Server/Controller/Label.pm | 1 +
lib/MusicBrainz/Server/Controller/ReleaseGroup.pm | 1 +
.../Server/Controller/Role/WikipediaExtract.pm | 69 +++
.../Server/Controller/WS/2/Annotation.pm | 56 +++
lib/MusicBrainz/Server/Controller/WS/2/CDStub.pm | 2 +-
.../Server/Controller/WS/2/Collection.pm | 2 +-
lib/MusicBrainz/Server/Controller/WS/2/DiscID.pm | 3 +-
lib/MusicBrainz/Server/Controller/WS/2/FreeDB.pm | 2 +-
lib/MusicBrainz/Server/Controller/WS/2/ISRC.pm | 3 +-
lib/MusicBrainz/Server/Controller/WS/2/PUID.pm | 3 +-
lib/MusicBrainz/Server/Controller/WS/2/Tag.pm | 2 +-
lib/MusicBrainz/Server/Controller/Work.pm | 1 +
lib/MusicBrainz/Server/Data/Artwork.pm | 6 +-
lib/MusicBrainz/Server/Data/CoverArtArchive.pm | 8 +-
lib/MusicBrainz/Server/Data/FileCache.pm | 42 ++
lib/MusicBrainz/Server/Data/WebService.pm | 6 +-
lib/MusicBrainz/Server/Data/WikipediaExtract.pm | 172 ++++++++
lib/MusicBrainz/Server/Entity/URL/Wikipedia.pm | 32 ++-
.../Entity/{WikiDocPage.pm => WikipediaExtract.pm} | 26 +-
lib/MusicBrainz/Server/Test/HTML5.pm | 2 +-
.../WebService/Serializer/JSON/2/Recording.pm | 2 +-
.../WebService/Serializer/JSON/2/ReleaseGroup.pm | 3 +-
.../WebService/Serializer/JSON/2/Role/LifeSpan.pm | 10 +-
.../Server/WebService/Serializer/JSON/2/Work.pm | 4 +
po/attributes.it.po | 2 +-
po/countries.de.po | 261 +++++++++++-
po/countries.el.po | 2 +-
po/countries.es.po | 261 +++++++++++-
po/countries.et.po | 261 +++++++++++-
po/countries.fi.po | 261 +++++++++++-
po/countries.fr_FR.po | 261 +++++++++++-
po/countries.it.po | 263 ++++++++++++-
po/countries.nl.po | 261 +++++++++++-
po/fixup/20121127-html5.sh | 5 +
po/instrument_descriptions.de.po | 2 +-
po/instrument_descriptions.el.po | 2 +-
po/instrument_descriptions.es.po | 4 +-
po/instrument_descriptions.et.po | 2 +-
po/instrument_descriptions.fi.po | 2 +-
po/instrument_descriptions.fr_FR.po | 2 +-
po/instrument_descriptions.it.po | 2 +-
po/instrument_descriptions.nl.po | 2 +-
po/instruments.de.po | 2 +-
po/instruments.el.po | 2 +-
po/instruments.es.po | 2 +-
po/instruments.et.po | 2 +-
po/instruments.fi.po | 2 +-
po/instruments.fr_FR.po | 2 +-
po/instruments.it.po | 2 +-
po/instruments.nl.po | 2 +-
po/languages.it.po | 2 +-
po/mb_server.de.po | 367 +++++++++-------
po/mb_server.el.po | 297 ++++++++------
po/mb_server.es.po | 294 ++++++++------
po/mb_server.et.po | 424 ++++++++++---------
po/mb_server.fi.po | 447 +++++++++++---------
po/mb_server.fr_FR.po | 288 ++++++++------
po/mb_server.it.po | 302 ++++++++------
po/mb_server.nl.po | 297 ++++++++------
po/mb_server.pot | 308 +++++++++-----
po/relationships.de.po | 8 +-
po/relationships.el.po | 8 +-
po/relationships.es.po | 8 +-
po/relationships.it.po | 8 +-
po/scripts.de.po | 2 +-
po/scripts.es.po | 328 +++++++-------
po/scripts.fi.po | 324 +++++++-------
po/scripts.fr_FR.po | 322 +++++++-------
po/scripts.it.po | 324 +++++++-------
po/scripts.nl.po | 322 +++++++-------
po/statistics.de.po | 319 ++++++++-------
po/statistics.el.po | 317 ++++++++-------
po/statistics.es.po | 317 ++++++++-------
po/statistics.et.po | 335 ++++++++-------
po/statistics.fi.po | 317 ++++++++-------
po/statistics.fr_FR.po | 317 ++++++++-------
po/statistics.it.po | 317 ++++++++-------
po/statistics.nl.po | 319 ++++++++-------
po/statistics.pot | 105 +++--
root/alias/delete.tt | 12 +
root/alias/edit_form.tt | 6 +
root/artist/add_alias.tt | 10 +-
root/artist/delete_alias.tt | 20 +-
root/artist/edit_alias.tt | 10 +-
root/artist/index.tt | 2 +
root/artist/layout.tt | 4 +-
root/cdtoc/attach_filter_release.tt | 2 +-
root/components/aliases.tt | 5 +
root/components/common-macros.tt | 51 ++-
root/components/wikipedia_extract.tt | 5 +
root/label/add_alias.tt | 10 +-
root/label/delete_alias.tt | 19 +-
root/label/edit_alias.tt | 10 +-
root/label/index.tt | 2 +
root/label/layout.tt | 4 +-
root/layout.tt | 11 +-
root/recording/layout.tt | 4 +-
root/release/sidebar.tt | 4 +-
root/release_group/index.tt | 3 +
root/release_group/layout.tt | 20 +-
root/release_group/set_cover_art.tt | 6 +-
root/search/lib/inline-results-artist.tt | 2 +-
root/statistics/timeline.tt | 9 +-
root/url/layout.tt | 4 +-
root/user/profile/layout.tt | 2 +-
root/work/add_alias.tt | 10 +-
root/work/delete_alias.tt | 19 +-
root/work/edit_alias.tt | 10 +-
root/work/index.tt | 3 +
root/work/layout.tt | 4 +-
.../Server/Controller/WS/2/JSON/BrowseArtists.pm | 38 ++-
.../Server/Controller/WS/2/JSON/BrowseLabels.pm | 5 +
.../Server/Controller/WS/2/JSON/BrowseWorks.pm | 10 +
.../Server/Controller/WS/2/JSON/LookupArtist.pm | 97 ++++-
.../Server/Controller/WS/2/JSON/LookupLabel.pm | 20 +-
.../Server/Controller/WS/2/JSON/LookupWork.pm | 4 +
.../t/MusicBrainz/Server/Data/WikipediaExtract.pm | 75 ++++
t/lwp-sessions/data_wikipedia.en-en.lwp-mock | Bin 0 -> 1617 bytes
t/lwp-sessions/data_wikipedia.ja-en.lwp-mock | Bin 0 -> 3358 bytes
.../data_wikipedia.nl-en-fallback.lwp-mock | Bin 0 -> 3527 bytes
126 files changed, 6893 insertions(+), 3678 deletions(-)
create mode 100755 admin/replication/BundleReplicationPackets
create mode 100644 lib/MusicBrainz/Server/Controller/Role/WikipediaExtract.pm
create mode 100644 lib/MusicBrainz/Server/Controller/WS/2/Annotation.pm
create mode 100644 lib/MusicBrainz/Server/Data/WikipediaExtract.pm
copy lib/MusicBrainz/Server/Entity/{WikiDocPage.pm => WikipediaExtract.pm} (77%)
create mode 100644 po/fixup/20121127-html5.sh
create mode 100644 root/components/wikipedia_extract.tt
create mode 100644 t/lib/t/MusicBrainz/Server/Data/WikipediaExtract.pm
create mode 100644 t/lwp-sessions/data_wikipedia.en-en.lwp-mock
create mode 100644 t/lwp-sessions/data_wikipedia.ja-en.lwp-mock
create mode 100644 t/lwp-sessions/data_wikipedia.nl-en-fallback.lwp-mock
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 041642df3759db24305825938cf9999973c8db50
Merge: 667064e 7b42a02
Author: warp <[email protected]>
Date: Mon Dec 10 08:44:03 2012 +0100
Merge branch 'beta'
* beta: (65 commits)
MBS-5432 temporary fix: revert cover art types i18n where it was causing breakage
HTML5 Test still had a lurking DBDefs::, changed to ->
MBS-3308, always display "Open edits" link.
MBS-5610, always display "Set cover art" link, remove "Remove release group" link.
MBS-5607, don't crash when serializing a release group without a primary type for json /ws/2.
MBS-5612, revert the changes to load_for_release_groups in the previous commit, the previous sort behaviour was correct.
MBS-5610, Move "Set cover art" link to the correct section.
MBS-5616, move "set cover art" from label to h1.
MBS-5622: pass $c->req->secure to Captcha::reCAPTCHA->get_html to ensure correct API endpoint is used
Update translatios from transifex.
MBS-5620: Use 54px image on profile pages.
MBS-5620: Fix ampersand encoding in gravatar URLs.
MBS-5620: Made it actually work.
MBS-5620: Implementing size option for Gravatar macro.
MBS-5620: Add "&s=12" to Gravatar URLs.
MBS-4108: actually sort the list *at all*
MBS-4108: reverse sort in order to correctly preference same-language wikipedia links
Update .pot files and run fixup script on .po files checked-in
Update translations from transifex.
MBS-5581: create a .po fixup script for the HTML5 changes
...
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server