Merge lp:~smartboyhw/ubuntu-community-accomplishments/bug-1080346-new into lp:ubuntu-community-accomplishments

Proposed by Howard Chan
Status: Merged
Merged at revision: 233
Proposed branch: lp:~smartboyhw/ubuntu-community-accomplishments/bug-1080346-new
Merge into: lp:ubuntu-community-accomplishments
Diff against target: 76 lines (+10/-8)
7 files modified
Changelog (+4/-2)
accomplishments/ubuntu-community/en/general/ubuntu-youth.accomplishment (+1/-1)
accomplishments/ubuntu-community/en/governance/forum-council-member.accomplishment (+1/-1)
accomplishments/ubuntu-community/en/governance/ubuntu-beginners-team-council-member.accomplishment (+1/-1)
accomplishments/ubuntu-community/en/infrastructure/forum-staff-member.accomplishment (+1/-1)
accomplishments/ubuntu-community/en/infrastructure/ubuntu-forums-ubuntu-member.accomplishment (+1/-1)
accomplishments/ubuntu-community/en/support/ubuntu-beginners-team-member.accomplishment (+1/-1)
To merge this branch: bzr merge lp:~smartboyhw/ubuntu-community-accomplishments/bug-1080346-new
Reviewer Review Type Date Requested Status
Matt Fischer Approve
Review via email: mp+135103@code.launchpad.net

Description of the change

Finally fixed Bug 1080346.

From IRC discussions between mfischer and s.fox it seems s.fox likes using IRC nick as author. So I now used it...

Also fixed José Antonio Rey's youth accomplishment typo to avoid duplicates.

To post a comment you must log in.
Revision history for this message
Matt Fischer (mfisch) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Changelog'
--- Changelog 2012-11-17 20:00:01 +0000
+++ Changelog 2012-11-20 10:31:22 +0000
@@ -19,7 +19,9 @@
19Next Version Target: 0.419Next Version Target: 0.4
2020
21 [Howard Chan]21 [Howard Chan]
22 New accomplishment: Testcase Admins22 * New accomplishment: Testcase Admins
23 New accomplishment: First Bug Fixed23 * New accomplishment: First Bug Fixed
24 * Changed all accomplishments with name="Sliver Fox" to "s.fox" to avoid duplicates (LP: #1080346)
25
2426
25-------------------------------------------------------------------------27-------------------------------------------------------------------------
2628
=== modified file 'accomplishments/ubuntu-community/en/general/ubuntu-youth.accomplishment'
--- accomplishments/ubuntu-community/en/general/ubuntu-youth.accomplishment 2012-11-16 04:47:49 +0000
+++ accomplishments/ubuntu-community/en/general/ubuntu-youth.accomplishment 2012-11-20 10:31:22 +0000
@@ -13,5 +13,5 @@
13 Click the 'Join the Team' button on the page.13 Click the 'Join the Team' button on the page.
14links: https://launchpad.net/~ubuntu-youth14links: https://launchpad.net/~ubuntu-youth
15help = #ubuntu-youth on freenode15help = #ubuntu-youth on freenode
16author = Jose Antonio Rey <joseeantonior@ubuntu.com>16author = José Antonio Rey <joseeantonior@ubuntu.com>
1717
1818
=== modified file 'accomplishments/ubuntu-community/en/governance/forum-council-member.accomplishment'
--- accomplishments/ubuntu-community/en/governance/forum-council-member.accomplishment 2012-05-24 21:28:36 +0000
+++ accomplishments/ubuntu-community/en/governance/forum-council-member.accomplishment 2012-11-20 10:31:22 +0000
@@ -17,4 +17,4 @@
17 https://wiki.ubuntu.com/ForumCouncilAgenda17 https://wiki.ubuntu.com/ForumCouncilAgenda
18 http://www.ubuntu.com/project/about-ubuntu/governance18 http://www.ubuntu.com/project/about-ubuntu/governance
19help = #ubuntuforums on Freenode19help = #ubuntuforums on Freenode
20author = Silver Fox <silver-fox@ubuntu.com>20author = s.fox <silver-fox@ubuntu.com>
2121
=== modified file 'accomplishments/ubuntu-community/en/governance/ubuntu-beginners-team-council-member.accomplishment'
--- accomplishments/ubuntu-community/en/governance/ubuntu-beginners-team-council-member.accomplishment 2012-05-24 21:28:36 +0000
+++ accomplishments/ubuntu-community/en/governance/ubuntu-beginners-team-council-member.accomplishment 2012-11-20 10:31:22 +0000
@@ -19,4 +19,4 @@
19pitfalls = None19pitfalls = None
20help = #ubuntu-beginners-council on Freenode20help = #ubuntu-beginners-council on Freenode
21links = https://wiki.ubuntu.com/BeginnersTeam/Structure#Council21links = https://wiki.ubuntu.com/BeginnersTeam/Structure#Council
22author = Silver Fox <silver-fox@ubuntu.com>22author = s.fox <silver-fox@ubuntu.com>
2323
=== modified file 'accomplishments/ubuntu-community/en/infrastructure/forum-staff-member.accomplishment'
--- accomplishments/ubuntu-community/en/infrastructure/forum-staff-member.accomplishment 2012-06-20 08:10:27 +0000
+++ accomplishments/ubuntu-community/en/infrastructure/forum-staff-member.accomplishment 2012-11-20 10:31:22 +0000
@@ -16,4 +16,4 @@
16 Be active in the support areas of the forum, but also be seen in the Community Cafe16 Be active in the support areas of the forum, but also be seen in the Community Cafe
17pitfalls = Please do not ask to become Forums Staff17pitfalls = Please do not ask to become Forums Staff
18help = #ubuntuforums on Freenode18help = #ubuntuforums on Freenode
19author = Silver Fox <silver-fox@ubuntu.com>19author = s.fox <silver-fox@ubuntu.com>
2020
=== modified file 'accomplishments/ubuntu-community/en/infrastructure/ubuntu-forums-ubuntu-member.accomplishment'
--- accomplishments/ubuntu-community/en/infrastructure/ubuntu-forums-ubuntu-member.accomplishment 2012-05-24 21:28:36 +0000
+++ accomplishments/ubuntu-community/en/infrastructure/ubuntu-forums-ubuntu-member.accomplishment 2012-11-20 10:31:22 +0000
@@ -20,4 +20,4 @@
20 https://wiki.ubuntu.com/ForumCouncilAgenda20 https://wiki.ubuntu.com/ForumCouncilAgenda
21 https://wiki.ubuntu.com/Forums/Membership21 https://wiki.ubuntu.com/Forums/Membership
22help = #ubuntuforums on Freenode22help = #ubuntuforums on Freenode
23author = Silver Fox <silver-fox@ubuntu.com>23author = s.fox <silver-fox@ubuntu.com>
2424
=== modified file 'accomplishments/ubuntu-community/en/support/ubuntu-beginners-team-member.accomplishment'
--- accomplishments/ubuntu-community/en/support/ubuntu-beginners-team-member.accomplishment 2012-05-24 21:28:36 +0000
+++ accomplishments/ubuntu-community/en/support/ubuntu-beginners-team-member.accomplishment 2012-11-20 10:31:22 +0000
@@ -18,4 +18,4 @@
18pitfalls = None18pitfalls = None
19help = #ubuntu-beginners on Freenode19help = #ubuntu-beginners on Freenode
20 #ubuntu-beginners-team on Freenode20 #ubuntu-beginners-team on Freenode
21author = Silver Fox <silver-fox@ubuntu.com>21author = s.fox <silver-fox@ubuntu.com>

Subscribers

People subscribed via source and target branches

to all changes: