Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #187 from KWierso/master

Add SDK 1.14rc1 to dev instance of Builder for testing.
  • Loading branch information...
commit 3d55843c9c7fa93ddec7c2345a593dd90cf144d1 2 parents 74f2ba2 + 8acf5b3
@seanmonstar seanmonstar authored
View
3  .gitmodules
@@ -94,3 +94,6 @@
[submodule "lib/addon-sdk-1.13.2"]
path = lib/addon-sdk-1.13.2
url = git://github.com/mozilla/addon-sdk.git
+[submodule "lib/addon-sdk-1.14rc1"]
+ path = lib/addon-sdk-1.14rc1
+ url = git://github.com/mozilla/addon-sdk.git
View
2  apps/jetpack/models.py
@@ -793,7 +793,7 @@ def set_version(self, version_name, current=True):
@staticmethod
def validate_extra_json(extra_json):
allowed_keys = ('contributors', 'homepage', 'icon', 'icon64', 'id',
- 'preferences', 'license')
+ 'preferences', 'license', 'permissions')
for key in extra_json.keys():
if key not in allowed_keys:
raise KeyNotAllowed(allowed_keys)
1  lib/addon-sdk-1.14rc1
@@ -0,0 +1 @@
+Subproject commit 78a193e577555d2915206a235dbd6c6f65ed2782
View
4 settings.py
@@ -132,8 +132,8 @@
# The lowest approved SDK available for add-ons
DISABLED_SDKS = ('1.4', '1.4.1', '1.4.1-w-1', '1.4.2', '1.13', '1.13.1')
-LOWEST_APPROVED_SDK = "1.13.2"
-TEST_SDK = 'addon-sdk-1.13.2'
+LOWEST_APPROVED_SDK = "1.14rc1"
+TEST_SDK = 'addon-sdk-1.14rc1'
TEST_AMO_USERNAME = None
TEST_AMO_PASSWORD = None
AUTH_DATABASE = None
Please sign in to comment.
Something went wrong with that request. Please try again.