linaro-license-protection

Merge lp:~gesha/linaro-license-protection/1246428 into lp:~linaro-automation/linaro-license-protection/trunk

  1. 1246428
  2. Merge into trunk
Proposed by Georgy Redkozubov
Status: Merged
Approved by: Milo Casagrande
Approved revision: 223
Merged at revision: 222
Proposed branch: lp:~gesha/linaro-license-protection/1246428
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 72 lines (+16/-17)
3 files modified
settings.py (+16/-13)
templates/header.html (+0/-2)
templates_releases/header.html (+0/-2)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/1246428
Reviewer Review Type Date Requested Status
Milo Casagrande (community) Approve
Review via email: mp+193522@code.launchpad.net

Description of the change

This branch adds OpenJDK tab on snapshots.l.o and releases.l.o and fixes names for underlying files.

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'settings.py'
--- settings.py 2013-09-26 09:08:37 +0000
+++ settings.py 2013-11-01 00:22:18 +0000
@@ -190,12 +190,13 @@
190)190)
191191
192# Render TEXTILE files settings.192# Render TEXTILE files settings.
193LINUX_FILES = ('README',193LINUX_FILES = ('README.textile',
194 'INSTALL',194 'INSTALL.textile',
195 'HACKING',195 'HACKING.textile',
196 'FIRMWARE',196 'FIRMWARE.textile',
197 'FASTMODELS',197 'FASTMODELS.textile',
198 'RTSM')198 'RTSM.textile',
199 'OPENJDK.textile')
199200
200ANDROID_FILES = ('HOWTO_releasenotes.txt',201ANDROID_FILES = ('HOWTO_releasenotes.txt',
201 'HOWTO_install.txt',202 'HOWTO_install.txt',
@@ -208,19 +209,21 @@
208 'HOWTO_getsourceandbuild.txt': 'Building From Source',209 'HOWTO_getsourceandbuild.txt': 'Building From Source',
209 'HOWTO_flashfirmware.txt': 'Firmware',210 'HOWTO_flashfirmware.txt': 'Firmware',
210 'HOWTO_rtsm.txt': 'RTSM',211 'HOWTO_rtsm.txt': 'RTSM',
211 'README': 'Release Notes',212 'README.textile': 'Release Notes',
212 'INSTALL': 'Binary Image Installation',213 'INSTALL.textile': 'Binary Image Installation',
213 'HACKING': 'Building From Source',214 'HACKING.textile': 'Building From Source',
214 'FIRMWARE': 'Firmware',215 'FIRMWARE.textile': 'Firmware',
215 'FASTMODELS': 'Fast Models',216 'FASTMODELS.textile': 'Fast Models',
216 'RTSM': 'RTSM'}217 'RTSM.textile': 'RTSM',
218 'OPENJDK.textile': 'OpenJDK'}
217219
218TAB_PRIORITY = ['Release Notes',220TAB_PRIORITY = ['Release Notes',
219 'Binary Image Installation',221 'Binary Image Installation',
220 'Building From Source',222 'Building From Source',
221 'Firmware',223 'Firmware',
222 'Fast Models',224 'Fast Models',
223 'RTSM']225 'RTSM',
226 'OpenJDK']
224227
225SUPPORTED_REMOTE_STATIC_FILES = {228SUPPORTED_REMOTE_STATIC_FILES = {
226 "linarofamily.js": "http://www.linaro.org/remote/js/linarofamily.js",229 "linarofamily.js": "http://www.linaro.org/remote/js/linarofamily.js",
227230
=== modified file 'templates/header.html'
--- templates/header.html 2013-10-09 12:35:30 +0000
+++ templates/header.html 2013-11-01 00:22:18 +0000
@@ -1,5 +1,3 @@
1<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2 "http://www.w3.org/TR/html4/loose.dtd">
3<html>1<html>
4<head>2<head>
5 {% if dl != None %}3 {% if dl != None %}
64
=== modified file 'templates_releases/header.html'
--- templates_releases/header.html 2013-10-09 12:35:30 +0000
+++ templates_releases/header.html 2013-11-01 00:22:18 +0000
@@ -1,5 +1,3 @@
1<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
2 "http://www.w3.org/TR/html4/loose.dtd">
3<html>1<html>
4<head>2<head>
5 {% if dl != None %}3 {% if dl != None %}

Subscribers

People subscribed via source and target branches