[mb-commits] branch, beta, updated. Merge remote-tracking branch 'navap/other-127-sponsor-page' into beta Merge r...
MusicBrainz Git Server <[email protected]> Fri, 04 Jan 2013 09:51:41 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1Tr3wD-0006BE-GP@wiley> |
The branch, beta has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1eed616a6544aa5619e6e6898aef81e05431e05e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b5b0de65e4411f225f8b024c8b397225b0d98926 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=be055c7b673e64112bfffcbbea42cbd6d258875c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fdc74041259c4b46554602fcf3169ffeb2845134 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=97cb543180162f88d7a23398234e29e9333d43f4 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6ac896262488e7b0779285b08bbee86c9bd53b55 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6ca86a626e40c4383f403be958229f1c7cf8ab94 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f90b05924c033ca78b4ab4275d86fe3535908e0f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fe98b275a291bf61b415742dabf30b00cb62c5d0 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=dbe71bbf53d1d81e370c2d02cdffd7caf3491c46 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=bb63b865c20f30bd2810bd2217818341328fbcbe (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=395e0cf22afc3ec56fe9caa5561fc41bc5387a3b (commit)
Summary of changes:
root/edit/details/reorder_mediums.tt | 17 ++++++++++++-----
root/layout.tt | 2 +-
root/layout/menu.tt | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
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 1eed616a6544aa5619e6e6898aef81e05431e05e
Merge: b5b0de6 be055c7
Author: Oliver Charles <[email protected]>
Date: Fri Jan 4 09:51:26 2013 +0000
Merge remote-tracking branch 'navap/other-127-sponsor-page' into beta
* navap/other-127-sponsor-page:
OTHER-127: Point sponsor link to MetaBrainz
commit b5b0de65e4411f225f8b024c8b397225b0d98926
Merge: 97cb543 395e0cf
Author: Oliver Charles <[email protected]>
Date: Fri Jan 4 09:50:47 2013 +0000
Merge branch 'beta' of ssh://git.musicbrainz.org:10015/musicbrainz-server into beta
* 'beta' of ssh://git.musicbrainz.org:10015/musicbrainz-server:
Update translations from transifex.
Update .pot file.
commit be055c7b673e64112bfffcbbea42cbd6d258875c
Merge: fdc7404 75a272c
Author: Pavan Chander <[email protected]>
Date: Thu Jan 3 11:27:28 2013 -0500
Merge remote branch 'metabrainz/beta' into other-127-sponsor-page
* metabrainz/beta:
Update CDStub::Browse test for the new year.
MBS-5288, use ForceArray when calling XMLin instead of normalizing the result later on.
MBS-5288, normalize pages xml response in Data::WikiDocIndex::get_wiki_versions.
MBS-5577: Relationship Editor displays "vocal vocals"
Add release-country predicate to edit search
MBS-3856: Also clean releases where barcode has been removed (fixup 9737724).
MBS-3856: Fix ./admin/RemoveBarcodeCoverArtUrls.pl (fixup 9737724).
MBS-5663: validDate should handle leap years
MBS-3856: Add ./admin/RemoveBarcodeCoverArtUrls.pl.
MBS-3856: Revert MBS-1052 "Amazon should lookup cover art by barcode too"
commit fdc74041259c4b46554602fcf3169ffeb2845134
Merge: dbe71bb d45b07d
Author: Pavan Chander <[email protected]>
Date: Thu Jan 3 11:22:40 2013 -0500
Merge branch 'master' into other-127-sponsor-page
* master: (37 commits)
MBS-4115, support .png in contrib/ssssss.psgi.
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.
...
commit 97cb543180162f88d7a23398234e29e9333d43f4
Merge: 75a272c 6ac8962
Author: Oliver Charles <[email protected]>
Date: Thu Jan 3 12:18:54 2013 +0000
Merge remote-tracking branch 'freso/MBS-5716+MBS-5717' into beta
* freso/MBS-5716+MBS-5717:
Combine separate l() strings together in reorder_mediums.tt.
MBS-5717: Fix misplaced parenthesis.
MBS-5716: Add space between new and old in Reorder Medium edits.
MBS-5717: Only include ": {title}" when there is one + i18n.
commit 6ac896262488e7b0779285b08bbee86c9bd53b55
Author: Frederik "Freso" S. Olesen <[email protected]>
Date: Tue Jan 1 15:32:11 2013 +0100
Combine separate l() strings together in reorder_mediums.tt.
diff --git a/root/edit/details/reorder_mediums.tt b/root/edit/details/reorder_mediums.tt
index 275dc22..a681020 100644
--- a/root/edit/details/reorder_mediums.tt
+++ b/root/edit/details/reorder_mediums.tt
@@ -19,15 +19,18 @@
[%- END -%]
</th>
<td>
- [%- IF medium_edit.title -%]
- [%- l('Disc <span class="new">{new}</span>: {title}', new => medium_edit.new, title => medium_edit.title) -%]
+ [%- IF medium_edit.title && medium_edit.old == 'new' -%]
+ [%- l('Disc <span class="new">{new}</span>: {title} (new disc)',
+ new => medium_edit.new, title => medium_edit.title) -%]
+ [%- ELSIF medium_edit.title -%]
+ [%- l('Disc <span class="new">{new}</span>: {title} (moved from position <span class="old">{old}</span>)',
+ new => medium_edit.new, title => medium_edit.title, , old => medium_edit.old) -%]
+ [%- ELSIF medium_edit.old == 'new' -%]
+ [%- l('Disc <span class="new">{new}</span> (new disc)',
+ new => medium_edit.new) -%]
[%- ELSE -%]
- [%- l('Disc <span class="new">{new}</span>', new => medium_edit.new) -%]
- [%- END -%]
- [%- IF medium_edit.old == "new" -%]
- [%- ' ' _ l('(new disc)') -%]
- [%- ELSE -%]
- [%- ' ' _ l('(moved from position <span class="old">{old}</span>)', old => medium_edit.old) -%]
+ [%- l('Disc <span class="new">{new}</span> (moved from position <span class="old">{old}</span>)',
+ new => medium_edit.new, old => medium_edit.old) -%]
[%- END -%]
</td>
</tr>
commit 6ca86a626e40c4383f403be958229f1c7cf8ab94
Author: Frederik "Freso" S. Olesen <[email protected]>
Date: Fri Dec 28 13:32:17 2012 +0000
MBS-5717: Fix misplaced parenthesis.
diff --git a/root/edit/details/reorder_mediums.tt b/root/edit/details/reorder_mediums.tt
index d8d51c8..275dc22 100644
--- a/root/edit/details/reorder_mediums.tt
+++ b/root/edit/details/reorder_mediums.tt
@@ -20,9 +20,9 @@
</th>
<td>
[%- IF medium_edit.title -%]
- [%- l('Disc <span class="new">{new}</span>: {title}'), new = medium_edit.new, title = medium_edit.title -%]
+ [%- l('Disc <span class="new">{new}</span>: {title}', new => medium_edit.new, title => medium_edit.title) -%]
[%- ELSE -%]
- [%- l('Disc <span class="new">{new}</span>'), new = medium_edit.new -%]
+ [%- l('Disc <span class="new">{new}</span>', new => medium_edit.new) -%]
[%- END -%]
[%- IF medium_edit.old == "new" -%]
[%- ' ' _ l('(new disc)') -%]
@@ -34,4 +34,4 @@
[%- END -%]
[% END %]
-</table>
\ No newline at end of file
+</table>
commit f90b05924c033ca78b4ab4275d86fe3535908e0f
Author: Frederik "Freso" S. Olesen <[email protected]>
Date: Fri Dec 28 12:50:27 2012 +0000
MBS-5716: Add space between new and old in Reorder Medium edits.
diff --git a/root/edit/details/reorder_mediums.tt b/root/edit/details/reorder_mediums.tt
index c83d382..d8d51c8 100644
--- a/root/edit/details/reorder_mediums.tt
+++ b/root/edit/details/reorder_mediums.tt
@@ -25,9 +25,9 @@
[%- l('Disc <span class="new">{new}</span>'), new = medium_edit.new -%]
[%- END -%]
[%- IF medium_edit.old == "new" -%]
- [%- l('(new disc)') -%]
+ [%- ' ' _ l('(new disc)') -%]
[%- ELSE -%]
- [%- l('(moved from position <span class="old">{old}</span>)', old => medium_edit.old) -%]
+ [%- ' ' _ l('(moved from position <span class="old">{old}</span>)', old => medium_edit.old) -%]
[%- END -%]
</td>
</tr>
commit fe98b275a291bf61b415742dabf30b00cb62c5d0
Author: Frederik "Freso" S. Olesen <[email protected]>
Date: Fri Dec 28 12:46:44 2012 +0000
MBS-5717: Only include ": {title}" when there is one + i18n.
diff --git a/root/edit/details/reorder_mediums.tt b/root/edit/details/reorder_mediums.tt
index bed3503..c83d382 100644
--- a/root/edit/details/reorder_mediums.tt
+++ b/root/edit/details/reorder_mediums.tt
@@ -19,7 +19,11 @@
[%- END -%]
</th>
<td>
- Disc <span class="new">[% medium_edit.new %]</span>: [% medium_edit.title %]
+ [%- IF medium_edit.title -%]
+ [%- l('Disc <span class="new">{new}</span>: {title}'), new = medium_edit.new, title = medium_edit.title -%]
+ [%- ELSE -%]
+ [%- l('Disc <span class="new">{new}</span>'), new = medium_edit.new -%]
+ [%- END -%]
[%- IF medium_edit.old == "new" -%]
[%- l('(new disc)') -%]
[%- ELSE -%]
commit dbe71bbf53d1d81e370c2d02cdffd7caf3491c46
Merge: bb63b86 f862b74
Author: Pavan Chander <[email protected]>
Date: Mon Dec 10 23:30:05 2012 -0500
Merge branch 'master' into other-127-sponsor-page
* master: (89 commits)
Commiting local changes to ShowDBDefs and default DBDefs from astro
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.
...
commit bb63b865c20f30bd2810bd2217818341328fbcbe
Author: Pavan Chander <[email protected]>
Date: Thu Nov 15 00:08:32 2012 -0500
OTHER-127: Point sponsor link to MetaBrainz
diff --git a/root/layout.tt b/root/layout.tt
index 13e5b93..235d78f 100644
--- a/root/layout.tt
+++ b/root/layout.tt
@@ -154,7 +154,7 @@
{ host => 'http://digitalwest.net/',
url1 => 'http://www.google.com/',
url2 => 'http://osuosl.org/',
- more => doc_link('About/Sponsors'),
+ more => 'http://metabrainz.org/doc/Sponsors',
caa => 'http://coverartarchive.org/' }) %]
</p>
</div>
diff --git a/root/layout/menu.tt b/root/layout/menu.tt
index e9b0218..f41ae64 100644
--- a/root/layout/menu.tt
+++ b/root/layout/menu.tt
@@ -104,7 +104,7 @@
<a href="[% doc_link('About') %]">[% l('About') %]</a>
<ul>
<li>
- <a href="[% doc_link('About/Sponsors') %]">[% l('Sponsors') %]</a>
+ <a href="http://metabrainz.org/doc/Sponsors">[% l('Sponsors') %]</a>
</li>
<li>
<a href="[% doc_link('About/Team') %]">[% l('Team') %]</a>
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server