Merge lp:~cjwatson/launchpad/2019-update into lp:launchpad
- 2019-update
- Merge into devel
Proposed by
Colin Watson
Status: | Merged |
---|---|
Merged at revision: | 18849 |
Proposed branch: | lp:~cjwatson/launchpad/2019-update |
Merge into: | lp:launchpad |
Diff against target: |
267 lines (+23/-23) 21 files modified
LICENSE (+1/-1) lib/lp/app/stories/basics/copyright.txt (+2/-2) lib/lp/app/templates/base-layout-macros.pt (+1/-1) lib/lp/app/tour/api (+1/-1) lib/lp/app/tour/branch-hosting-tracking (+1/-1) lib/lp/app/tour/bugs (+1/-1) lib/lp/app/tour/community (+1/-1) lib/lp/app/tour/community-support (+1/-1) lib/lp/app/tour/feature-tracking (+1/-1) lib/lp/app/tour/index (+1/-1) lib/lp/app/tour/join-launchpad (+1/-1) lib/lp/app/tour/ppa (+1/-1) lib/lp/app/tour/release-management (+1/-1) lib/lp/app/tour/translation (+1/-1) lib/lp/services/librarianserver/web.py (+2/-2) lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc (+1/-1) lib/lp/testing/tests/test_standard_test_template.py (+1/-1) lib/lp/testing/tests/test_standard_yuixhr_test_template.py (+1/-1) standard_template.py (+1/-1) standard_test_template.html (+1/-1) standard_test_template.js (+1/-1) |
To merge this branch: | bzr merge lp:~cjwatson/launchpad/2019-update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+361395@code.launchpad.net |
Commit message
Update copyright years to 2019.
Description of the change
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'LICENSE' |
2 | --- LICENSE 2018-01-01 17:40:03 +0000 |
3 | +++ LICENSE 2019-01-05 10:45:25 +0000 |
4 | @@ -1,4 +1,4 @@ |
5 | -Launchpad is Copyright 2004-2018 Canonical Ltd. |
6 | +Launchpad is Copyright 2004-2019 Canonical Ltd. |
7 | |
8 | Canonical Ltd ("Canonical") distributes the Launchpad source code |
9 | under the GNU Affero General Public License, version 3 ("AGPLv3"). |
10 | |
11 | === modified file 'lib/lp/app/stories/basics/copyright.txt' |
12 | --- lib/lp/app/stories/basics/copyright.txt 2018-01-01 17:40:03 +0000 |
13 | +++ lib/lp/app/stories/basics/copyright.txt 2019-01-05 10:45:25 +0000 |
14 | @@ -5,11 +5,11 @@ |
15 | >>> browser.open('http://launchpad.dev/') |
16 | >>> browser.getLink('Take the tour').click() |
17 | >>> print extract_text(find_tag_by_id(browser.contents, 'footer-navigation')) |
18 | - Next...© 2004-2018 Canonical Ltd... |
19 | + Next...© 2004-2019 Canonical Ltd... |
20 | |
21 | The main template. |
22 | |
23 | >>> browser.open('http://launchpad.dev') |
24 | >>> print extract_text(find_tag_by_id(browser.contents, 'footer')) |
25 | - © 2004-2018 Canonical Ltd. |
26 | + © 2004-2019 Canonical Ltd. |
27 | ... |
28 | |
29 | === modified file 'lib/lp/app/templates/base-layout-macros.pt' |
30 | --- lib/lp/app/templates/base-layout-macros.pt 2018-05-23 14:35:48 +0000 |
31 | +++ lib/lp/app/templates/base-layout-macros.pt 2019-01-05 10:45:25 +0000 |
32 | @@ -293,7 +293,7 @@ |
33 | </div> |
34 | |
35 | <div class="colophon"> |
36 | - © 2004-2018 |
37 | + © 2004-2019 |
38 | <a href="http://canonical.com/">Canonical Ltd.</a> |
39 | • |
40 | <a tal:attributes="href string:${rooturl}legal">Terms of use</a> |
41 | |
42 | === modified file 'lib/lp/app/tour/api' |
43 | --- lib/lp/app/tour/api 2018-01-01 17:40:03 +0000 |
44 | +++ lib/lp/app/tour/api 2019-01-05 10:45:25 +0000 |
45 | @@ -131,7 +131,7 @@ |
46 | <a href="feature-tracking" accesskey="g" tabindex="5">Next</a> |
47 | </li> |
48 | <li class="copyright"> |
49 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
50 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
51 | </li> |
52 | </ul> |
53 | </div> |
54 | |
55 | === modified file 'lib/lp/app/tour/branch-hosting-tracking' |
56 | --- lib/lp/app/tour/branch-hosting-tracking 2018-01-01 17:40:03 +0000 |
57 | +++ lib/lp/app/tour/branch-hosting-tracking 2019-01-05 10:45:25 +0000 |
58 | @@ -127,7 +127,7 @@ |
59 | <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a> |
60 | </li> |
61 | <li class="copyright"> |
62 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
63 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
64 | </li> |
65 | </ul> |
66 | </div> |
67 | |
68 | === modified file 'lib/lp/app/tour/bugs' |
69 | --- lib/lp/app/tour/bugs 2018-05-18 14:07:28 +0000 |
70 | +++ lib/lp/app/tour/bugs 2019-01-05 10:45:25 +0000 |
71 | @@ -134,7 +134,7 @@ |
72 | <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a> |
73 | </li> |
74 | <li class="copyright"> |
75 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a> |
76 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a> |
77 | </li> |
78 | </ul> |
79 | </div> |
80 | |
81 | === modified file 'lib/lp/app/tour/community' |
82 | --- lib/lp/app/tour/community 2018-01-01 17:40:03 +0000 |
83 | +++ lib/lp/app/tour/community 2019-01-05 10:45:25 +0000 |
84 | @@ -113,7 +113,7 @@ |
85 | <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a> |
86 | </li> |
87 | <li class="copyright"> |
88 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
89 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
90 | </li> |
91 | </ul> |
92 | </div> |
93 | |
94 | === modified file 'lib/lp/app/tour/community-support' |
95 | --- lib/lp/app/tour/community-support 2018-01-01 17:40:03 +0000 |
96 | +++ lib/lp/app/tour/community-support 2019-01-05 10:45:25 +0000 |
97 | @@ -106,7 +106,7 @@ |
98 | <a href="api" tabindex="5" accesskey="g">Next</a> |
99 | </li> |
100 | <li class="copyright"> |
101 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
102 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
103 | </li> |
104 | </ul> |
105 | </div> |
106 | |
107 | === modified file 'lib/lp/app/tour/feature-tracking' |
108 | --- lib/lp/app/tour/feature-tracking 2018-01-01 17:40:03 +0000 |
109 | +++ lib/lp/app/tour/feature-tracking 2019-01-05 10:45:25 +0000 |
110 | @@ -88,7 +88,7 @@ |
111 | <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a> |
112 | </li> |
113 | <li class="copyright"> |
114 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
115 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
116 | </li> |
117 | </ul> |
118 | </div> |
119 | |
120 | === modified file 'lib/lp/app/tour/index' |
121 | --- lib/lp/app/tour/index 2018-05-18 14:07:28 +0000 |
122 | +++ lib/lp/app/tour/index 2019-01-05 10:45:25 +0000 |
123 | @@ -174,7 +174,7 @@ |
124 | <a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a> |
125 | </li> |
126 | <li class="copyright"> |
127 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a> |
128 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a> |
129 | </li> |
130 | </ul> |
131 | </div> |
132 | |
133 | === modified file 'lib/lp/app/tour/join-launchpad' |
134 | --- lib/lp/app/tour/join-launchpad 2018-05-18 14:07:28 +0000 |
135 | +++ lib/lp/app/tour/join-launchpad 2019-01-05 10:45:25 +0000 |
136 | @@ -109,7 +109,7 @@ |
137 | <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a> |
138 | </li> |
139 | <li class="copyright"> |
140 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
141 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
142 | </li> |
143 | </ul> |
144 | </div> |
145 | |
146 | === modified file 'lib/lp/app/tour/ppa' |
147 | --- lib/lp/app/tour/ppa 2018-05-18 14:07:28 +0000 |
148 | +++ lib/lp/app/tour/ppa 2019-01-05 10:45:25 +0000 |
149 | @@ -113,7 +113,7 @@ |
150 | <a href="community-support" accesskey="g" tabindex="5">Next</a> |
151 | </li> |
152 | <li class="copyright"> |
153 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
154 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
155 | </li> |
156 | </ul> |
157 | </div> |
158 | |
159 | === modified file 'lib/lp/app/tour/release-management' |
160 | --- lib/lp/app/tour/release-management 2018-05-18 14:07:28 +0000 |
161 | +++ lib/lp/app/tour/release-management 2019-01-05 10:45:25 +0000 |
162 | @@ -96,7 +96,7 @@ |
163 | <a href="join-launchpad" title="Read about commercial features and free access to Launchpad" accesskey="g" tabindex="5" title="Read about commercial features and free access to Launchpad">Next</a> |
164 | </li> |
165 | <li class="copyright"> |
166 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
167 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
168 | </li> |
169 | </ul> |
170 | </div> |
171 | |
172 | === modified file 'lib/lp/app/tour/translation' |
173 | --- lib/lp/app/tour/translation 2018-01-01 17:40:03 +0000 |
174 | +++ lib/lp/app/tour/translation 2019-01-05 10:45:25 +0000 |
175 | @@ -113,7 +113,7 @@ |
176 | <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a> |
177 | </li> |
178 | <li class="copyright"> |
179 | - © 2004-2018 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
180 | + © 2004-2019 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a> |
181 | </li> |
182 | </ul> |
183 | </div> |
184 | |
185 | === modified file 'lib/lp/services/librarianserver/web.py' |
186 | --- lib/lp/services/librarianserver/web.py 2018-05-09 16:49:58 +0000 |
187 | +++ lib/lp/services/librarianserver/web.py 2019-01-05 10:45:25 +0000 |
188 | @@ -1,4 +1,4 @@ |
189 | -# Copyright 2009-2018 Canonical Ltd. This software is licensed under the |
190 | +# Copyright 2009-2019 Canonical Ltd. This software is licensed under the |
191 | # GNU Affero General Public License version 3 (see the file LICENSE). |
192 | |
193 | __metaclass__ = type |
194 | @@ -48,7 +48,7 @@ |
195 | file repository used by |
196 | <a href="https://launchpad.net/">Launchpad</a>. |
197 | </p> |
198 | - <p><small>Copyright 2004-2018 Canonical Ltd.</small></p> |
199 | + <p><small>Copyright 2004-2019 Canonical Ltd.</small></p> |
200 | <!-- kthxbye. --> |
201 | </body></html> |
202 | """, type='text/html') |
203 | |
204 | === modified file 'lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc' |
205 | --- lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc 2018-05-23 14:35:48 +0000 |
206 | +++ lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc 2019-01-05 10:45:25 +0000 |
207 | @@ -156,7 +156,7 @@ |
208 | </div> |
209 | </div> |
210 | <div class="colophon"> |
211 | - © 2004-2018 |
212 | + © 2004-2019 |
213 | <a href="http://canonical.com/">Canonical Ltd.</a> |
214 | • |
215 | <a href="https://launchpad.net/legal">Terms of use</a> |
216 | |
217 | === modified file 'lib/lp/testing/tests/test_standard_test_template.py' |
218 | --- lib/lp/testing/tests/test_standard_test_template.py 2018-01-01 17:40:03 +0000 |
219 | +++ lib/lp/testing/tests/test_standard_test_template.py 2019-01-05 10:45:25 +0000 |
220 | @@ -1,4 +1,4 @@ |
221 | -# Copyright 2018 Canonical Ltd. This software is licensed under the |
222 | +# Copyright 2019 Canonical Ltd. This software is licensed under the |
223 | # GNU Affero General Public License version 3 (see the file LICENSE). |
224 | |
225 | """XXX: Module docstring goes here.""" |
226 | |
227 | === modified file 'lib/lp/testing/tests/test_standard_yuixhr_test_template.py' |
228 | --- lib/lp/testing/tests/test_standard_yuixhr_test_template.py 2018-01-01 17:40:03 +0000 |
229 | +++ lib/lp/testing/tests/test_standard_yuixhr_test_template.py 2019-01-05 10:45:25 +0000 |
230 | @@ -1,4 +1,4 @@ |
231 | -# Copyright 2018 Canonical Ltd. This software is licensed under the |
232 | +# Copyright 2019 Canonical Ltd. This software is licensed under the |
233 | # GNU Affero General Public License version 3 (see the file LICENSE). |
234 | |
235 | """{Describe your test suite here}. |
236 | |
237 | === modified file 'standard_template.py' |
238 | --- standard_template.py 2018-01-01 17:40:03 +0000 |
239 | +++ standard_template.py 2019-01-05 10:45:25 +0000 |
240 | @@ -1,4 +1,4 @@ |
241 | -# Copyright 2018 Canonical Ltd. This software is licensed under the |
242 | +# Copyright 2019 Canonical Ltd. This software is licensed under the |
243 | # GNU Affero General Public License version 3 (see the file LICENSE). |
244 | |
245 | """XXX: Module docstring goes here.""" |
246 | |
247 | === modified file 'standard_test_template.html' |
248 | --- standard_test_template.html 2018-01-01 17:40:03 +0000 |
249 | +++ standard_test_template.html 2019-01-05 10:45:25 +0000 |
250 | @@ -1,6 +1,6 @@ |
251 | <!DOCTYPE html> |
252 | <!-- |
253 | -Copyright 2018 Canonical Ltd. This software is licensed under the |
254 | +Copyright 2019 Canonical Ltd. This software is licensed under the |
255 | GNU Affero General Public License version 3 (see the file LICENSE). |
256 | --> |
257 | |
258 | |
259 | === modified file 'standard_test_template.js' |
260 | --- standard_test_template.js 2018-01-01 17:40:03 +0000 |
261 | +++ standard_test_template.js 2019-01-05 10:45:25 +0000 |
262 | @@ -1,4 +1,4 @@ |
263 | -/* Copyright 2018 Canonical Ltd. This software is licensed under the |
264 | +/* Copyright 2019 Canonical Ltd. This software is licensed under the |
265 | * GNU Affero General Public License version 3 (see the file LICENSE). */ |
266 | |
267 | YUI.add('lp.${LIBRARY}.test', function (Y) { |