[mb-commits] branch, warp, created. Merge branch 'mbs-4627' into warp MBS-4627, small fixes based on code review ...

The branch, warp has been created
        at  30a9289925abcd5a5537fd8835ebd0fb4d1e4026 (commit)

- Log -----------------------------------------------------------------
commit 30a9289925abcd5a5537fd8835ebd0fb4d1e4026
Merge: 408a378 72cf637
Author: warp <[email protected]>
Date:   Tue Nov 6 17:17:00 2012 +0100

    Merge branch 'mbs-4627' into warp
    
    * mbs-4627:
      MBS-4627, small fixes based on code review feedback.


commit 408a378d2778ea7a8c36eb3c5d672c35cd9b5afb
Merge: 869c96e 2e5ed19
Author: warp <[email protected]>
Date:   Tue Nov 6 17:16:43 2012 +0100

    Merge branch 'mbs-5265' into warp
    
    * 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


commit 2e5ed194c63df68e9761b63f5ef64e63fe61a33b
Merge: ade18f5 2af78f2
Author: warp <[email protected]>
Date:   Tue Nov 6 17:14:58 2012 +0100

    Merge branch 'master' into mbs-5265
    
    * master:
      Bump DB_SCHEMA_SEQUENCE from 15 to 16.
      Update translations from transifex.
      Update root/static/scripts/common/MB/Control/SelectAll.js
      Revert "Merge branch 'i18n-nop-context' into beta"
      Revert "Don't create {artist,label}_idx_uniq_name_comment, since they break with the dump we've been using for testing."
      MBS-5422: ocharles' suggestions
      HTTPS: redirect to https sans-www when requested thus
      i18n: add documentation
      i18n: add contexts to autoeditor election statuses
      i18n: allow translating using N_l, N_ln, and N_lp everywhere
      MBS-5422: show expiration time for autoeditor elections
      Remove existing ways to add/remove ISWCs
      Unbreak ISWC editing due to FormHandler update
      Allow adding/removing ISWCs on work edit form


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


hooks/post-receive
-- 
mb_server