* 'caa' of ssh://localhost:10015/musicbrainz-server: MBS-4619, display appropriate fallback message when a cover art image is not available yet. Conflicts: root/components/common-macros.tt
… is not available yet.
…ssary for tests
* master: (213 commits) More fixes for alias merging MBS-2553: Show link to all relationships from sidebar (external links) MBS-4160: add comments for clarification Change wikidoc timeout to 5 seconds. Change alias merge strategy to be more robust Use what Ollie suggested in the duplicate artists report Fix Artist::Show test now that annotations are shown in their entirity Move some of the fetches outside the loops (r1870) MBS-4590: Update wikidoc links Change warning from Controller to template Add message in DBDefs about editable user permissions. MBS-4038: Allow users to set permissions on development servers. Change warning from Controller to template Add message in DBDefs about editable user permissions. MBS-4038: Allow users to set permissions on development servers. MBS-4545: Explain analytics config option Fix pending edits highlighting in the duplicate artists report Use link_entity() in the collaboration artists report Use link_entity() in release group reports Use link_entity() for URLs in release reports ... Conflicts: lib/DBDefs.pm.default lib/MusicBrainz/Server/Data/Edit.pm lib/MusicBrainz/Server/Data/Vote.pm lib/MusicBrainz/Server/EditQueue.pm lib/MusicBrainz/Server/Types.pm root/layout.tt root/report/index.tt root/static/styles/layout.css t/lib/t/MusicBrainz/Server/Data/Edit.pm
…here are no types This is consistent with the display of the "Comment:" section
…t the user specified
When uploading artwork in between existing artwork, we need to create a gap in the sequence to insert into. By using a normal trigger, the creation of the gap will immediately be collapsed, so we defer this trigger to the end of the transaction.
The image ordering code seems to be extremely brittle, so I have made some database modifications to force ordering to be gapless. Furthermore, there seemed to be a bug in the add cover art form which assumed that the starting position was always 1, regardless of the amount of existing images. This has now been changed to use count(images) + 1 as the initial position, that is - the end of the list of images.
* origin/mbs-4160-soundcloud-link: MBS-4160: add comments for clarification MBS-4160: SoundCloud relationship under the External links section
I've appended a link to 'all relationships' to the bottom of the 'external links' sidebar section. This section is now always visible except for recordings and works that have no "supported" URLs.
* nikki/reports2: Use what Ollie suggested in the duplicate artists report Move some of the fetches outside the loops (r1870) Fix pending edits highlighting in the duplicate artists report Use link_entity() in the collaboration artists report Use link_entity() in release group reports Use link_entity() for URLs in release reports Fix a postgresql warning Superfluous data tracks report should be sorted desc not asc More fixes for report descriptions Use link_entity() in release reports Fix description of unlikely language/script combinations report Use link_entity() in some of the artist reports Use link_entity() in the recording reports Use link_entity() in the ISRCs report so that recordings with pending edits are highlighted (part of MBS-2814) and disambiguation comments are shown. Exclude stuff marked Single AND UK from the SeparateDiscs report (MBS-4063) Sort report for creative commons download relationships (MBS-4125) Improve sorting of the "Releases with superfluous data tracks" report (MBS-3684) ISRCs with multiple recordings: Do something about the DEF05 ISRCs (MBS-4493)