[mb-commits] branch, beta, updated. Merge branch 'mbs-5265' into beta MBS-5265, unset cover art on release group ...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e848f2cadd1ddb6908e7c6688ff3d806b0e87dc8 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ade18f54a5fca12010837b8652a9a2e2ef758e39 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=4f36845715e03ac703834801e921482824c1f3e5 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=700cc933433afa813664c4309c7ab4d9c0f86e19 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6242ff3f09a0d21cbd5521663563acce513e5b60 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9f2f6ab205b3b0ee82a693e77f81b46dec52055b (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c61b91e8dd4d9fa6b38b63629a0dac93707b8a12 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8db4b158999c01406e8fe4355cc7bca3b86567a1 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0b1c0cacea1da53a90002a702a81e084f8611240 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=01e0776e9ec1d14a5dc5ca70c4ee58a5414f62a5 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=27efab45366a425f149ff21962cfacc4cb0ae6ba (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e8f989549ada11be3537bac70a3d25cd636fa1db (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e345dac5323541daadf3f294918ee40f15039815 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f96681bef1b40cd1e95cd5cf8edbbfe342c8fc47 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7f55dfe6562bf46fbf06fa720b5ac9505c199922 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=620f944082ba5503a74c2391202ec1e04ebb67aa (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3df6b633c17427d30b4dbc9f6d248fc3aa30e1ed (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d6db087979350a59351a2693c814ea0e8626eca4 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=351416cdc79387ca364e54f247bc1d7a9cbc9656 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Constants.pm                |    7 +-
 lib/MusicBrainz/Server/Controller/Release.pm       |   11 +-
 lib/MusicBrainz/Server/Controller/ReleaseGroup.pm  |   56 ++++++-
 lib/MusicBrainz/Server/Data/Artwork.pm             |  194 ++++++++++++++++++++
 lib/MusicBrainz/Server/Data/CoverArtType.pm        |   40 ++++-
 lib/MusicBrainz/Server/Data/Release.pm             |    5 +
 lib/MusicBrainz/Server/Data/ReleaseGroup.pm        |   71 +++++++
 lib/MusicBrainz/Server/Data/Utils.pm               |    3 +-
 lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm |    5 +-
 .../Server/Edit/Release/EditCoverArt.pm            |    9 +-
 .../Server/Edit/Release/RemoveCoverArt.pm          |    8 +-
 .../Server/Edit/Release/ReorderCoverArt.pm         |    1 -
 .../Server/Edit/ReleaseGroup/SetCoverArt.pm        |  150 +++++++++++++++
 lib/MusicBrainz/Server/EditRegistry.pm             |    1 +
 lib/MusicBrainz/Server/Entity/Artwork.pm           |   96 ++++++++++
 lib/MusicBrainz/Server/Entity/ReleaseGroup.pm      |    9 +
 .../SetCoverArt.pm}                                |   19 ++-
 root/edit/details/set_cover_art.tt                 |   49 +++++
 root/release/cover_art.tt                          |    2 +-
 root/release_group/layout.tt                       |   15 ++
 root/release_group/set_cover_art.tt                |   58 ++++++
 root/static/styles/edit.css                        |   33 ++++
 t/lib/t/MusicBrainz/Server/Data/ReleaseGroup.pm    |   67 +++++++
 .../Server/Edit/ReleaseGroup/SetCoverArt.pm        |   79 ++++++++
 t/sql/caa.sql                                      |    2 +
 25 files changed, 961 insertions(+), 29 deletions(-)
 create mode 100644 lib/MusicBrainz/Server/Data/Artwork.pm
 create mode 100644 lib/MusicBrainz/Server/Edit/ReleaseGroup/SetCoverArt.pm
 create mode 100644 lib/MusicBrainz/Server/Entity/Artwork.pm
 copy lib/MusicBrainz/Server/Form/{Release/EditCoverArt.pm => ReleaseGroup/SetCoverArt.pm} (73%)
 create mode 100644 root/edit/details/set_cover_art.tt
 create mode 100644 root/release_group/set_cover_art.tt
 create mode 100644 t/lib/t/MusicBrainz/Server/Edit/ReleaseGroup/SetCoverArt.pm

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 e848f2cadd1ddb6908e7c6688ff3d806b0e87dc8
Merge: 351416c ade18f5
Author: warp <[email protected]>
Date:   Mon Nov 5 11:52:03 2012 +0100

    Merge branch 'mbs-5265' into beta
    
    * mbs-5265:
      MBS-5265, unset cover art on release group when the associated release is deleted.
      MBS-5265, Update release group cover art when merging releases.
      MBS-5265, Don't show "Set Cover Art" form when no cover art can be set for a release group.
      MBS-5265, fix "Use of uninitialized value $offset" warning.
      MBS-5265, fix crash release group cover art related crash on release group page.
      MBS-5265, Call event.preventDefault () at the start of the function.  Do not display the "old cover art" section if there is no old cover art.
      MBS-5265, Use green instead of yellow to show which cover art is currently selected.
      MBS-5265, make Artwork->load_for_release_groups() load front cover art from the earliest associated release if no cover art is set.
      MBS-5265, Add dependancy checks + test in set release group cover art edit.
      MBS-5265, Set release group cover art edit tests.
      MBS-5265, Add "set release group cover art" edit.
      MBS-5265, Add release-group front cover art support table in cover_art_archive schema.
      Use cover_art_archive.index_listing when loading cover art data from the database.  Add edits_pending column to caa/CreateTables.sql.
      MBS-4627, fix date on caa-edits-pending database upgrade script, include said script in upgrade.sh.
      MBS-4627, set cover art edits_pending column in cover art edits.
      MBS-4627, add an Artwork entity, which displays artwork based on database data instead of a webservice call to coverartarchive.org.
    
    Conflicts:
    	lib/MusicBrainz/Server/Controller/Release.pm
    	lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm
    	lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm
    	lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm


-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server