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
1=== modified file 'Changelog'
2--- Changelog 2012-11-17 20:00:01 +0000
3+++ Changelog 2012-11-20 10:31:22 +0000
4@@ -19,7 +19,9 @@
5 Next Version Target: 0.4
6
7 [Howard Chan]
8- New accomplishment: Testcase Admins
9- New accomplishment: First Bug Fixed
10+ * New accomplishment: Testcase Admins
11+ * New accomplishment: First Bug Fixed
12+ * Changed all accomplishments with name="Sliver Fox" to "s.fox" to avoid duplicates (LP: #1080346)
13+
14
15 -------------------------------------------------------------------------
16
17=== modified file 'accomplishments/ubuntu-community/en/general/ubuntu-youth.accomplishment'
18--- accomplishments/ubuntu-community/en/general/ubuntu-youth.accomplishment 2012-11-16 04:47:49 +0000
19+++ accomplishments/ubuntu-community/en/general/ubuntu-youth.accomplishment 2012-11-20 10:31:22 +0000
20@@ -13,5 +13,5 @@
21 Click the 'Join the Team' button on the page.
22 links: https://launchpad.net/~ubuntu-youth
23 help = #ubuntu-youth on freenode
24-author = Jose Antonio Rey <joseeantonior@ubuntu.com>
25+author = José Antonio Rey <joseeantonior@ubuntu.com>
26
27
28=== modified file 'accomplishments/ubuntu-community/en/governance/forum-council-member.accomplishment'
29--- accomplishments/ubuntu-community/en/governance/forum-council-member.accomplishment 2012-05-24 21:28:36 +0000
30+++ accomplishments/ubuntu-community/en/governance/forum-council-member.accomplishment 2012-11-20 10:31:22 +0000
31@@ -17,4 +17,4 @@
32 https://wiki.ubuntu.com/ForumCouncilAgenda
33 http://www.ubuntu.com/project/about-ubuntu/governance
34 help = #ubuntuforums on Freenode
35-author = Silver Fox <silver-fox@ubuntu.com>
36+author = s.fox <silver-fox@ubuntu.com>
37
38=== modified file 'accomplishments/ubuntu-community/en/governance/ubuntu-beginners-team-council-member.accomplishment'
39--- accomplishments/ubuntu-community/en/governance/ubuntu-beginners-team-council-member.accomplishment 2012-05-24 21:28:36 +0000
40+++ accomplishments/ubuntu-community/en/governance/ubuntu-beginners-team-council-member.accomplishment 2012-11-20 10:31:22 +0000
41@@ -19,4 +19,4 @@
42 pitfalls = None
43 help = #ubuntu-beginners-council on Freenode
44 links = https://wiki.ubuntu.com/BeginnersTeam/Structure#Council
45-author = Silver Fox <silver-fox@ubuntu.com>
46+author = s.fox <silver-fox@ubuntu.com>
47
48=== modified file 'accomplishments/ubuntu-community/en/infrastructure/forum-staff-member.accomplishment'
49--- accomplishments/ubuntu-community/en/infrastructure/forum-staff-member.accomplishment 2012-06-20 08:10:27 +0000
50+++ accomplishments/ubuntu-community/en/infrastructure/forum-staff-member.accomplishment 2012-11-20 10:31:22 +0000
51@@ -16,4 +16,4 @@
52 Be active in the support areas of the forum, but also be seen in the Community Cafe
53 pitfalls = Please do not ask to become Forums Staff
54 help = #ubuntuforums on Freenode
55-author = Silver Fox <silver-fox@ubuntu.com>
56+author = s.fox <silver-fox@ubuntu.com>
57
58=== modified file 'accomplishments/ubuntu-community/en/infrastructure/ubuntu-forums-ubuntu-member.accomplishment'
59--- accomplishments/ubuntu-community/en/infrastructure/ubuntu-forums-ubuntu-member.accomplishment 2012-05-24 21:28:36 +0000
60+++ accomplishments/ubuntu-community/en/infrastructure/ubuntu-forums-ubuntu-member.accomplishment 2012-11-20 10:31:22 +0000
61@@ -20,4 +20,4 @@
62 https://wiki.ubuntu.com/ForumCouncilAgenda
63 https://wiki.ubuntu.com/Forums/Membership
64 help = #ubuntuforums on Freenode
65-author = Silver Fox <silver-fox@ubuntu.com>
66+author = s.fox <silver-fox@ubuntu.com>
67
68=== modified file 'accomplishments/ubuntu-community/en/support/ubuntu-beginners-team-member.accomplishment'
69--- accomplishments/ubuntu-community/en/support/ubuntu-beginners-team-member.accomplishment 2012-05-24 21:28:36 +0000
70+++ accomplishments/ubuntu-community/en/support/ubuntu-beginners-team-member.accomplishment 2012-11-20 10:31:22 +0000
71@@ -18,4 +18,4 @@
72 pitfalls = None
73 help = #ubuntu-beginners on Freenode
74 #ubuntu-beginners-team on Freenode
75-author = Silver Fox <silver-fox@ubuntu.com>
76+author = s.fox <silver-fox@ubuntu.com>

Subscribers

People subscribed via source and target branches

to all changes: