[mb-commits] branch, master, updated. Merge branch 'beta' Merge branch 'mbs-3072-ipis' into beta Merge branch ' mbs-...
MusicBrainz Git Server <[email protected]> Mon, 24 Dec 2012 09:35:56 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1Tn4Rw-0005Yf-77@wiley> |
The branch, master has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b19943e311da0f50aae70b2aafbfb61700db697c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b66dca205df699de4dae32ff66303180e322de50 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a166caf670ce0e63ade4145619bba8faff5b6d2d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2d94fa45013bb55ab6edd3cc38793d655e7e92e6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=df5e382ef85ab7adb3c18c2a551d5f365a8ca939 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ff802b95ff80248bb6640d14aec83be8727a42be (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7b69f533d7fcea39ec8a73de5b0dfc7dc05e685a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=557a2013aad4a62d60f2be9e471ea4b11eaef422 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e4909197c4d6d55e1451213131fe27fce44263bd (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=33849da6b9e973231ac0a4848e1a3c693e8058f8 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=35fb793baf969adff7cc039bee765824514ea6a8 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cf94719f12b21c5518c6d2d32ad6396d09e496f6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6f4967de098fb627a20adbb7a40c5ab8552ac5f6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=250548d04803d032e22760bb4d7d83cfa80c265d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9ed7e4880a6445e5a7dafea136d9aafcd361cc1c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=163e6f519bb16d0625ace1f996bb9b11f84fe12b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f90c2e553edc074ac42091eb25135725420937f3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=26a26fa67d0be89648f8aa92b01b01002f0be5b1 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=299eef8bdc0bcc2952899c209b23af8f06cbe697 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5ea100b16adc54d8264989fb645f0c89d007cb0c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5d2dc8cd7c3814b64786c9b80d84984b163166a3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c0c0f6646132ffceefc767159bdba5d5fc4afcc2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2d46c5daaebb70424c0095e16585861afd6ea1b5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ad501205be4f6bc069697f2237bd846f84ba8151 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6e3ab21b83217ae87cb6070f1aa7e29e30644985 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9e92f83f4ad82c0d7c3a29d441b66811be287dd8 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=954df0ad6fb76c403aec95c0c7c0d914d13bbc4c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8d675e67f847fd2e938f4d365025bde3a29099b8 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=628957e4d112aba3d23f18935d7f3c7689fb6b5e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3b5e4ae9bfb2ffaec30de3d4b717569deddfe1d1 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e1e7d8c380cd2726fa0e81efb809c4de212eaa52 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8990c8eb34737a75eed90259af624c23b9526d30 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d5029fa2b0cd644510ab4c933cde790df6f84ed6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a21c913581cc7b8797a06ca3e9df4e70af5f9608 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=af6e35e30677b780ec59a7e9158a96b6f78d41a3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fa1be26ca911745b709d61966f0b34087a8d73b3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=088949f2d1da2dc4d5064b634956171b848118e1 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d98ce0ac17d005ecfc21984951c9c7d4a3522280 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7cb5e289eb93fe29df1801ac72a8c8d67caf43bf (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f20513a87abb8a9b3618821d15159e5b72d32138 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a03a82b4c9b2bc7a5b1a94bd7d54aa7d9db021b7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5e33a8a5a45d29370ac17e6971e25fa097ce0c2b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=df36c4c6cb43233546e793c5b624f531e3a3920b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b81a8b15aaa95db1c684e71d5bb51775d6bbe052 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e546f42ac8e3583f48e1d3f4f47bbf3226da86fa (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5da4d24d96fd6640c675c89ea30b4941dfc08edd (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1fecf9a26fdc60e49d9e64c980e91c480a7d4361 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e3ad930fcfc5bb89cd9b144cfb45fc015a9ceb08 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=78c6355bea3bd8bc5a0a1063ec57f862dbd24cd7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5f9d8852579fa4a8868c3b7ff7a35c7761482e23 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ddcbc529ef700c032be08871bfe8d19285d2d31b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=31aa5f7e064a34f414c237e601ef7aab4f529e01 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=642022a2be24684eb246e7cd9bbd4dd2e794141d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=84d770db6b5e313906bd7d0922372a4569cf8444 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c669c70ee228a71d17fa6d9127a76b1151950fb5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7d593ada121740788ff013e7b3841725cbaf6a9f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c9dfb462ef1c45b123cf99f293ded72e97ca3b91 (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f862b74455551ef66831582eb303941bbeed6173 (commit)
Summary of changes:
admin/sql/CreateFunctions.sql | 2 +-
lib/DBDefs/Default.pm | 17 ++--
lib/MusicBrainz/Server/Controller/Admin/WikiDoc.pm | 11 +-
.../Server/Controller/WS/js/WikiDocVersion.pm | 39 ------
lib/MusicBrainz/Server/Data/CoverArtArchive.pm | 25 +++--
lib/MusicBrainz/Server/Data/Link.pm | 6 +
lib/MusicBrainz/Server/Data/URL.pm | 1 +
lib/MusicBrainz/Server/Data/WikiDoc.pm | 24 ----
lib/MusicBrainz/Server/Data/WikiDocIndex.pm | 12 +-
lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm | 1 +
.../Server/Edit/Release/EditCoverArt.pm | 1 +
.../Server/Edit/Release/RemoveCoverArt.pm | 1 +
lib/MusicBrainz/Server/Edit/Role/CoverArt.pm | 21 ++--
.../Server/Entity/URL/{45cat.pm => Lieder.pm} | 4 +-
.../Server/WebService/Serializer/JSON/2/Artist.pm | 1 +
.../Server/WebService/Serializer/JSON/2/Label.pm | 1 +
.../Server/WebService/Serializer/JSON/2/Medium.pm | 2 +-
.../WebService/Serializer/JSON/2/Recording.pm | 3 +-
.../WebService/Serializer/JSON/2/Relation.pm | 1 +
.../JSON/2/Role/{Annotation.pm => IPIs.pm} | 10 +--
.../Server/WebService/Serializer/JSON/2/Utils.pm | 2 +-
.../Server/WebService/Serializer/JSON/2/Work.pm | 1 +
po/attributes.fi.po | 24 ++--
po/instrument_descriptions.fi.po | 12 +-
po/instruments.fi.po | 22 ++--
po/mb_server.fi.po | 30 +++---
po/relationships.de.po | 132 ++++++++++----------
po/relationships.fi.po | 56 ++++----
po/statistics.fi.po | 66 +++++-----
root/admin/wikidoc/index.tt | 129 ++++++-------------
root/components/common-macros.tt | 8 +-
root/components/rdfa-macros.tt | 9 +-
root/layout/menu.tt | 6 +
root/main/index.tt | 2 +
root/static/images/favicons/lieder-16.png | Bin 0 -> 155 bytes
root/static/scripts/edit/MB/Control/URLCleanup.js | 2 +-
root/static/scripts/tests/Control/URLCleanup.js | 4 +
root/static/styles/layout.css | 4 +
.../Server/Controller/WS/2/JSON/BrowseArtists.pm | 10 ++-
.../Server/Controller/WS/2/JSON/BrowseLabels.pm | 1 +
.../Controller/WS/2/JSON/BrowseReleaseGroups.pm | 3 +
.../Server/Controller/WS/2/JSON/BrowseReleases.pm | 2 +
.../Server/Controller/WS/2/JSON/BrowseWorks.pm | 10 ++
.../Server/Controller/WS/2/JSON/LookupArtist.pm | 47 ++++++-
.../Server/Controller/WS/2/JSON/LookupLabel.pm | 8 +-
.../Server/Controller/WS/2/JSON/LookupRecording.pm | 2 +
.../Server/Controller/WS/2/JSON/LookupRelease.pm | 6 +-
.../Controller/WS/2/JSON/LookupReleaseGroup.pm | 3 +
.../Server/Controller/WS/2/JSON/LookupWork.pm | 4 +
.../Server/Controller/WS/2/LookupWork.pm | 6 +-
t/lib/t/MusicBrainz/Server/Data/Link.pm | 11 ++
t/lib/t/MusicBrainz/Server/Edit/Recording/Merge.pm | 9 ++
t/sql/tracklist.sql | 13 ++
t/sql/webservice.sql | 3 +-
54 files changed, 436 insertions(+), 394 deletions(-)
delete mode 100644 lib/MusicBrainz/Server/Controller/WS/js/WikiDocVersion.pm
copy lib/MusicBrainz/Server/Entity/URL/{45cat.pm => Lieder.pm} (91%)
copy lib/MusicBrainz/Server/WebService/Serializer/JSON/2/Role/{Annotation.pm => IPIs.pm} (83%)
create mode 100644 root/static/images/favicons/lieder-16.png
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 b19943e311da0f50aae70b2aafbfb61700db697c
Merge: f862b74 b66dca20
Author: warp <[email protected]>
Date: Mon Dec 24 10:35:41 2012 +0100
Merge branch 'beta'
* beta: (36 commits)
MBS-5228, Partially revert 642022a2be24684eb246e7cd9bbd4dd2e794141d to fix wikidoc tests.
MBS-5678, Release group was missing from JSON release group release group relationships
MBS-5600, fix two internal server errors in /ws/2 json serialization.
Added test, meh
Adding lieder.net to whitelist and sidebar
Added the SongKong tagger
Added new amazon store ids
MBS-5672, use artist-credit as a key instead of artist_credit, in the /ws/2 json serialization of media.
MBS-3072, add IPIs to label and artist json serializations for /ws/2.
MBS-4627, add ->cover_art_id method to cover art edit classes to avoid having to know these details in Edit::Role::CoverArt.
When creating the 'page_index' function, specifically alias the 'musicbrainz.musicbrainz_unaccent' function
Added to yate to the home page too
Added the yate tagger
Update translations from transifex
Fix syntax in CoverArtArchive
MBS-5637, find_or_insert() should look for links with the correct "ended" value for links with end dates.
MBS-5637, Add a relationship to the Edit::Recording::Merge test.
MBS-4627, use the correct image identifier in Edit::Role::CoverArt->adjust_edit_pending().
MBS-3072, update tests with work type changes to test data.
Revert previous work comment change.
...
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server