diff --git a/images/logo/AngularShieldLogo.graffle/QuickLook/Preview.pdf b/images/logo/AngularShieldLogo.graffle/QuickLook/Preview.pdf new file mode 100644 index 00000000000..936c017d4c0 Binary files /dev/null and b/images/logo/AngularShieldLogo.graffle/QuickLook/Preview.pdf differ diff --git a/images/logo/AngularShieldLogo.graffle/QuickLook/Thumbnail.tiff b/images/logo/AngularShieldLogo.graffle/QuickLook/Thumbnail.tiff new file mode 100644 index 00000000000..a3e6c6f2a25 Binary files /dev/null and b/images/logo/AngularShieldLogo.graffle/QuickLook/Thumbnail.tiff differ diff --git a/images/logo/AngularShieldLogo.graffle/data.plist b/images/logo/AngularShieldLogo.graffle/data.plist new file mode 100644 index 00000000000..4f202ee3cfc Binary files /dev/null and b/images/logo/AngularShieldLogo.graffle/data.plist differ diff --git a/images/logo/AngularShieldLogo.graffle/image1.png b/images/logo/AngularShieldLogo.graffle/image1.png new file mode 100644 index 00000000000..119e24ad4b9 Binary files /dev/null and b/images/logo/AngularShieldLogo.graffle/image1.png differ diff --git a/images/logo/AngularShieldLogo.graffle/image2.png b/images/logo/AngularShieldLogo.graffle/image2.png new file mode 100644 index 00000000000..cd857577300 Binary files /dev/null and b/images/logo/AngularShieldLogo.graffle/image2.png differ diff --git a/test/ngResource/resourceSpec.js b/test/ngResource/resourceSpec.js index 225f96a165b..5e0ecc48d16 100644 --- a/test/ngResource/resourceSpec.js +++ b/test/ngResource/resourceSpec.js @@ -142,6 +142,12 @@ describe("resource", function() { R.get({a: 'null'}); }); + it('should not encode string "null" to "+" in url params', function() { + var R = $resource('/Path/:a'); + $httpBackend.expect('GET', '/Path/null').respond('{}'); + R.get({a: 'null'}); + }); + it('should allow relative paths in resource url', function () { var R = $resource(':relativePath'); $httpBackend.expect('GET', 'data.json').respond('{}');