fix(input): ensure that hidden input values are correct after history.back

Due to the nature of some browser's PageCache/BFCache, returning to an Angular
app sometimes causes `input[hidden]` elements to retain the last value
that was stored before the page was navigated away from previously.

This is particularly problematic if the input has an interpolated value.
E.g. `<input type="hidden" value="{{ 1 + 2 }}">` since when the browser
returns, instead of the original interpolation template, the HTML contains
the previous value `<input type="hidden" value="3">`.

This commit instructs the browser not to attempt to reinstate the previous
value when navigating back in history by setting `autocomplete="off"` on
the hidden input element element.

.gitattributes

@@ -1,5 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# JS files must always use LF for tools to work
-*.js eol=lf

.jscs.json.todo

@@ -1,15 +0,0 @@
-// This is an incomplete TODO list of checks we want to start enforcing
-//
-// The goal is to enable these checks one by one by moving them to .jscs.json along with commits
-// that correct the existing code base issues and make the new check pass.
-
-{
-  "validateParameterSeparator": ", ", // Re-assert this rule when JSCS allows multiple spaces
-  "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
-  "disallowImplicitTypeConversion": ["string"],
-  "disallowMultipleLineBreaks": true,
-  "validateJSDoc": {
-    "checkParamNames": true,
-    "requireParamTypes": true
-  }
-}

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 sudo: false
 node_js:
-  - '0.10'
+  - '4.2'
 
 cache:
   directories:
@@ -15,28 +15,26 @@ branches:
 
 env:
   matrix:
+    - JOB=ci-checks
     - JOB=unit BROWSER_PROVIDER=saucelabs
     - JOB=docs-e2e BROWSER_PROVIDER=saucelabs
     - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
     - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
-    - JOB=unit BROWSER_PROVIDER=browserstack
-    - JOB=docs-e2e BROWSER_PROVIDER=browserstack
-    - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=browserstack
-    - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=browserstack
   global:
+    - CXX=g++-4.8  # node 4 likes the G++ v4.8 compiler
     - SAUCE_USERNAME=angular-ci
     - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
-    - BROWSER_STACK_USERNAME=VojtaJina
-    - BROWSER_STACK_ACCESS_KEY=QCQJ1ZpWXpBkSwEdD8ev
     - LOGS_DIR=/tmp/angular-build/logs
     - BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready
 
-matrix:
-  allow_failures:
-    - env: "JOB=unit BROWSER_PROVIDER=browserstack"
-    - env: "JOB=docs-e2e BROWSER_PROVIDER=browserstack"
-    - env: "JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=browserstack"
-    - env: "JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=browserstack"
+# node 4 likes the G++ v4.8 compiler
+# see https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
 
 install:
   # Check the size of caches
@@ -46,21 +44,18 @@ install:
   - npm config set spin false
   # Log HTTP requests
   - npm config set loglevel http
-  - npm install -g npm@2.5
-  # Instal npm dependecies and ensure that npm cache is not stale
-  - scripts/npm/install-dependencies.sh
+  #- npm install -g npm@2.5
+  # Install npm dependencies and ensure that npm cache is not stale
+  - npm install
 
 before_script:
-  - mkdir -p $LOGS_DIR
-  - ./scripts/travis/start_browser_provider.sh
-  - npm install -g grunt-cli
-  - grunt package
-  - ./scripts/travis/wait_for_browser_provider.sh
+  - ./scripts/travis/before_build.sh
 
 script:
   - ./scripts/travis/build.sh
 
 after_script:
+  - ./scripts/travis/tear_down_browser_provider.sh
   - ./scripts/travis/print_logs.sh
 
 notifications:

CHANGELOG.md

@@ -1,3 +1,216 @@
+<a name="1.3.20"></a>
+# 1.3.20 shallow-translucence (2015-09-29)
+
+
+## Bug Fixes
+
+- **$parse:** do not convert to string computed properties multiple times
+  ([d434f3db](https://github.com/angular/angular.js/commit/d434f3db53d6209eb140b904e83bbde401686c16))
+
+
+## Breaking Changes
+
+
+<a name="1.3.19"></a>
+# 1.3.19 glutinous-shriek (2015-09-15)
+
+## Bug Fixes
+
+- **$http:** propagate status -1 for timed out requests
+  ([f13055a0](https://github.com/angular/angular.js/commit/f13055a0a53a39b160448713a5617edee6042801),
+   [#4491](https://github.com/angular/angular.js/issues/4491), [#8756](https://github.com/angular/angular.js/issues/8756))
+- **$location:** don't crash if navigating outside the app base
+  ([623ce1ad](https://github.com/angular/angular.js/commit/623ce1ad2cf68024719c5cae5d682d00195df30c),
+   [#11667](https://github.com/angular/angular.js/issues/11667))
+- **$parse:** throw error when accessing a restricted property indirectly
+  ([ec98c94c](https://github.com/angular/angular.js/commit/ec98c94ccbfc97b655447956738d5f6ff98b2f33),
+   [#12833](https://github.com/angular/angular.js/issues/12833))
+- **ngModel:** validate pattern against the viewValue
+  ([274e9353](https://github.com/angular/angular.js/commit/274e93537ed4e95aefeacea48909eb334894f0ac),
+   [#12344](https://github.com/angular/angular.js/issues/12344))
+
+
+## Features
+
+- **ngAnimate:** introduce `$animate.flush` for unit testing
+  ([f98e0384](https://github.com/angular/angular.js/commit/f98e038418f7367b2373adcf4887f64a8e8bdcb0))
+
+
+## Possible Breaking Changes
+
+- **ngModel:** due to [274e9353](https://github.com/angular/angular.js/commit/274e93537ed4e95aefeacea48909eb334894f0ac),
+
+
+The `ngPattern` and `pattern` directives will validate the regex
+against the `viewValue` of `ngModel`, i.e. the value of the model
+before the $parsers are applied. Previously, the modelValue
+(the result of the $parsers) was validated.
+
+This fixes issues where `input[date]` and `input[number]` cannot
+be validated because the viewValue string is parsed into
+`Date` and `Number` respectively (starting with Angular 1.3).
+It also brings the directives in line with HTML5 constraint
+validation, which validates against the input value.
+
+This change is unlikely to cause applications to fail, because even
+in Angular 1.2, the value that was validated by pattern could have
+been manipulated by the $parsers, as all validation was done
+inside this pipeline.
+
+If you rely on the pattern being validated against the modelValue,
+you must create your own validator directive that overwrites
+the built-in pattern validator:
+
+```
+.directive('patternModelOverwrite', function patternModelOverwriteDirective() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    priority: 1,
+    compile: function() {
+      var regexp, patternExp;
+
+      return {
+        pre: function(scope, elm, attr, ctrl) {
+          if (!ctrl) return;
+
+          attr.$observe('pattern', function(regex) {
+            /**
+             * The built-in directive will call our overwritten validator
+             * (see below). We just need to update the regex.
+             * The preLink fn guaranetees our observer is called first.
+             */
+            if (isString(regex) && regex.length > 0) {
+              regex = new RegExp('^' + regex + '$');
+            }
+
+            if (regex && !regex.test) {
+              //The built-in validator will throw at this point
+              return;
+            }
+
+            regexp = regex || undefined;
+          });
+
+        },
+        post: function(scope, elm, attr, ctrl) {
+          if (!ctrl) return;
+
+          regexp, patternExp = attr.ngPattern || attr.pattern;
+
+          //The postLink fn guarantees we overwrite the built-in pattern validator
+          ctrl.$validators.pattern = function(value) {
+            return ctrl.$isEmpty(value) ||
+              isUndefined(regexp) ||
+              regexp.test(value);
+          };
+        }
+      };
+    }
+  };
+});
+```
+
+
+
+
+<a name="1.3.18"></a>
+# 1.3.18 collective-penmanship (2015-08-18)
+
+
+## Bug Fixes
+
+- **$animate:**
+  - clear class animations cache if animation is not started
+  ([2c03a357](https://github.com/angular/angular.js/commit/2c03a3574336ed814d020cf7ba36cee5b87e65b5),
+   [#12604](https://github.com/angular/angular.js/issues/12604), [#12603](https://github.com/angular/angular.js/issues/12603))
+  - do not throw errors if element is removed before animation starts
+  ([6b72598b](https://github.com/angular/angular.js/commit/6b72598b87022e1dd96bddc4451e007ef0601579),
+   [#10205](https://github.com/angular/angular.js/issues/10205))
+- **ngModel:** correct minErr usage for correct doc creation
+  ([64a142b5](https://github.com/angular/angular.js/commit/64a142b58ed0a0e3896d82f3f9ce35373548d0ff),
+   [#12386](https://github.com/angular/angular.js/issues/12386), [#12416](https://github.com/angular/angular.js/issues/12416))
+
+
+
+<a name="1.3.17"></a>
+# 1.3.17 tsktskskly-euouae (2015-07-06)
+
+
+## Bug Fixes
+
+- **$browser:** prevent infinite digest if changing hash when there is no hashPrefix
+  ([61a3fb67](https://github.com/angular/angular.js/commit/61a3fb676a186e22564fb0181c17647b35ca4e5e),
+   [#10423](https://github.com/angular/angular.js/issues/10423), [#12145](https://github.com/angular/angular.js/issues/12145))
+- **$location:**
+  - allow navigating outside the original base URL
+  ([0bb57d53](https://github.com/angular/angular.js/commit/0bb57d538f25a1b6f20025d87a451c39671b59aa),
+   [#11302](https://github.com/angular/angular.js/issues/11302), [#4776](https://github.com/angular/angular.js/issues/4776))
+  - do not get caught in infinite digest in IE9
+  ([f486ebe8](https://github.com/angular/angular.js/commit/f486ebe80b6d7854d3eb9029f14d94299cf493cb),
+   [#11439](https://github.com/angular/angular.js/issues/11439), [#11675](https://github.com/angular/angular.js/issues/11675), [#11935](https://github.com/angular/angular.js/issues/11935), [#12083](https://github.com/angular/angular.js/issues/12083))
+- **linky:** allow case insensitive scheme detection
+  ([6b28aef1](https://github.com/angular/angular.js/commit/6b28aef1c537bfb2da21820d6ca154344efe266e),
+   [#12073](https://github.com/angular/angular.js/issues/12073), [#12074](https://github.com/angular/angular.js/issues/12074))
+
+
+
+<a name="1.3.16"></a>
+# 1.3.16 cookie-oatmealification (2015-06-05)
+
+
+## Bug Fixes
+
+- **$compile:** throw error on invalid directive name
+  ([634e4671](https://github.com/angular/angular.js/commit/634e467172efa696eb32ef8942ffbedeecbd030e),
+   [#11281](https://github.com/angular/angular.js/issues/11281), [#11109](https://github.com/angular/angular.js/issues/11109))
+- **$cookies:** update $cookies to prevent duplicate cookie writes and play nice with external code
+  ([706a93ab](https://github.com/angular/angular.js/commit/706a93ab6960e3474698ccf9a8048b3c32e567c6),
+   [#11490](https://github.com/angular/angular.js/issues/11490), [#11515](https://github.com/angular/angular.js/issues/11515))
+- **$http:** throw error if `success` and `error` methods do not receive a function
+  ([731e1f65](https://github.com/angular/angular.js/commit/731e1f6534ab7fd1e053b8d7a25c902fcd934fea),
+   [#11330](https://github.com/angular/angular.js/issues/11330), [#11333](https://github.com/angular/angular.js/issues/11333))
+- **core:** ensure that multiple requests to requestAnimationFrame are buffered
+  ([0adc0364](https://github.com/angular/angular.js/commit/0adc0364265b06c567ccc8e90a7f09cc46f235b2),
+   [#11791](https://github.com/angular/angular.js/issues/11791))
+- **filterFilter:** fix matching against `null`/`undefined`
+  ([9dd0fe35](https://github.com/angular/angular.js/commit/9dd0fe35d1027e59b84b2396abee00d8683f3b50),
+   [#11573](https://github.com/angular/angular.js/issues/11573), [#11617](https://github.com/angular/angular.js/issues/11617))
+- **jqLite:**
+  - check for "length" in obj in isArrayLike to prevent iOS8 JIT bug from surfacing
+  ([647f3f55](https://github.com/angular/angular.js/commit/647f3f55eb7100a255272f7277f0f962de234a32),
+   [#11508](https://github.com/angular/angular.js/issues/11508))
+  - attr should ignore comment, text and attribute nodes
+  ([181e5ebc](https://github.com/angular/angular.js/commit/181e5ebc3fce5312feacaeace4fcad0d32f4d73c))
+- **ngAnimate:**
+  - ensure that minified repaint code isn't removed
+  ([d5c99ea4](https://github.com/angular/angular.js/commit/d5c99ea42b834343fd0362cfc572f47e7536ccfb),
+   [#9936](https://github.com/angular/angular.js/issues/9936))
+- **ngAria:** handle elements with role="checkbox/menuitemcheckbox"
+  ([1c282af5](https://github.com/angular/angular.js/commit/1c282af5abc205d4aac37c05c5cb725d71747134),
+   [#11317](https://github.com/angular/angular.js/issues/11317), [#11321](https://github.com/angular/angular.js/issues/11321))
+- **ngModel:** allow setting model to NaN when asyncValidator is present
+  ([b64519fe](https://github.com/angular/angular.js/commit/b64519fea7f1a5ec75e32c4b71b012b827314153),
+   [#11315](https://github.com/angular/angular.js/issues/11315), [#11411](https://github.com/angular/angular.js/issues/11411))
+- **ngTouch:**
+  - check undefined tagName for SVG event target
+  ([7560a8d2](https://github.com/angular/angular.js/commit/7560a8d2d65955ddb60ede9d586502f4e3cbd062))
+  - register touches properly when jQuery is used
+  ([40441f6d](https://github.com/angular/angular.js/commit/40441f6dfc5ebd5cdc679c269c4639238f5351eb),
+   [#4001](https://github.com/angular/angular.js/issues/4001), [#8584](https://github.com/angular/angular.js/issues/8584), [#10797](https://github.com/angular/angular.js/issues/10797), [#11488](https://github.com/angular/angular.js/issues/11488))
+- **select:** prevent unknown option being added to select when bound to null property
+  ([9e3f82bb](https://github.com/angular/angular.js/commit/9e3f82bbaf83cad7bb3121db756099b0880562e6),
+   [#11872](https://github.com/angular/angular.js/issues/11872), [#11875](https://github.com/angular/angular.js/issues/11875))
+
+
+## Features
+
+- **travis:** run unit tests on iOS 8
+  ([1f650871](https://github.com/angular/angular.js/commit/1f650871266b88b3dab4a894a839a82ac9a06b69),
+   [#11479](https://github.com/angular/angular.js/issues/11479))
+
+
+
 <a name="1.4.0"></a>
 # 1.4.0 jaracimrman-existence (2015-05-26)
 
@@ -233,220 +446,6 @@ To get the desired behaviour you need to iterate using the object form of the `n
 
 
 
-
-<a name="v1.4.0-rc.1"></a>
-# v1.4.0-rc.1 sartorial-chronography (2015-04-24)
-
-
-## Bug Fixes
-
-- **$animate:**
-  - ensure that from styles are applied for class-based animations
-  ([8f819d2c](https://github.com/angular/angular.js/commit/8f819d2cb5c8025b25534529a6e897dc8805885b))
-  - make sure the JS animation lookup is an object lookup
-  ([103a39ca](https://github.com/angular/angular.js/commit/103a39ca8dad0300bead15c358aad846510b2229),
-   [#11619](https://github.com/angular/angular.js/issues/11619))
-- **$animateCss:** ensure that rAF waiting loop doesn't ignore pending items during a flush
-  ([90e424b2](https://github.com/angular/angular.js/commit/90e424b206239e261024e8ef7fcac762236cd8b7))
-- **$http:** stop coercing falsy HTTP request bodies to null / empty body
-  ([e04a887c](https://github.com/angular/angular.js/commit/e04a887c9b506de18516600310fe6e529d9d2ca3),
-   [#11552](https://github.com/angular/angular.js/issues/11552), [#11593](https://github.com/angular/angular.js/issues/11593))
-- **ngAnimate:**
-  - close parent animations only when there are classes to resolve
-  ([1459be17](https://github.com/angular/angular.js/commit/1459be170dabfca40501dcf219dfced5ba513169))
-  - ensure ngClass-based classes are always resolved for CSS-enabled animations
-  ([89f081e4](https://github.com/angular/angular.js/commit/89f081e452e9a75c2d3bf86bfef8b7f9bd1f2b0e))
-  - do not abort animation if only `ng-anchor-in` is used
-  ([3333a5c3](https://github.com/angular/angular.js/commit/3333a5c380f830cba8efec5825cb6648f930f206))
-  - ensure that a filtered-out leave animation always runs its DOM operation
-  ([6dd64ab5](https://github.com/angular/angular.js/commit/6dd64ab5f34fa19db8f90e6eabc810843089ba14),
-   [#11555](https://github.com/angular/angular.js/issues/11555))
-  - ensure that animations work when the app is bootstrapped on the document node
-  ([bee14ed1](https://github.com/angular/angular.js/commit/bee14ed1e7b77ea7dc62326611380da36dec297e),
-   [#11574](https://github.com/angular/angular.js/issues/11574))
-  - ensure SVG classes are properly removed
-  ([fa0bbded](https://github.com/angular/angular.js/commit/fa0bbded1ea040fbfdb1a4339e4a374fe9717a82))
-- **ngAria:** change accessibility keypress event to use event.which if it is provided
-  ([249f9b81](https://github.com/angular/angular.js/commit/249f9b81cbad5c57cf978a47842744aadd85cdb4),
-   [#11340](https://github.com/angular/angular.js/issues/11340))
-- **ngMessageFormat:**
-  - ensure bindings are valid for Protractor
-  ([992114f7](https://github.com/angular/angular.js/commit/992114f7a7f5f39778753e0c49458f14b6290ffc),
-   [#11644](https://github.com/angular/angular.js/issues/11644), [#11649](https://github.com/angular/angular.js/issues/11649))
-  - minified symbol and nested required expression
-  ([8a45064f](https://github.com/angular/angular.js/commit/8a45064f2bdec13ba3de5b0a0785df76188ab172),
-   [#11414](https://github.com/angular/angular.js/issues/11414), [#11592](https://github.com/angular/angular.js/issues/11592))
-- **select:** allow empty option to be added dynamically by ng-repeat
-  ([abf59c28](https://github.com/angular/angular.js/commit/abf59c285c3ff6af20dbf4236eba5204ae735abb),
-   [#11470](https://github.com/angular/angular.js/issues/11470), [#11512](https://github.com/angular/angular.js/issues/11512))
-
-
-## Features
-
-- **$animate:** provide support for animations on elements outside of $rootElement
-  ([e41faaa2](https://github.com/angular/angular.js/commit/e41faaa2a155a42bcc66952497a6f33866878508))
-
-
-
-
-<a name="v1.4.0-rc.0"></a>
-# v1.4.0-rc.0 smooth-unwinding (2015-04-10)
-
-
-## Bug Fixes
-
-- **$compile:**
-  - throw error on invalid directive name
-  ([170ff9a3](https://github.com/angular/angular.js/commit/170ff9a37dea8772dda7c89e84176ac1a8992878),
-   [#11281](https://github.com/angular/angular.js/issues/11281), [#11109](https://github.com/angular/angular.js/issues/11109))
-  - update data() when controller returns custom value
-  ([9900610e](https://github.com/angular/angular.js/commit/9900610eea4ece87b063f2aa9d82c75c369927df),
-   [#11147](https://github.com/angular/angular.js/issues/11147), [#11326](https://github.com/angular/angular.js/issues/11326))
-- **$http:** throw error if `success` and `error` methods do not receive a function
-  ([1af563d4](https://github.com/angular/angular.js/commit/1af563d43e74cb7be53e815b66fd91dd93986ed6),
-   [#11330](https://github.com/angular/angular.js/issues/11330), [#11333](https://github.com/angular/angular.js/issues/11333))
-- **$parse:** fix parse errors on older Android WebViews which choke with reserved keywords
-  ([10ae33b2](https://github.com/angular/angular.js/commit/10ae33b2d88b04df76f519edc50a47fa30f83e96),
-   [#11455](https://github.com/angular/angular.js/issues/11455))
-- **$rootScope:** allow destroying a root scope
-  ([f8c8cf69](https://github.com/angular/angular.js/commit/f8c8cf698aa23640249d79fd405605694478e4f7),
-   [#11241](https://github.com/angular/angular.js/issues/11241), [#10895](https://github.com/angular/angular.js/issues/10895))
-- **cookieReader:** safely access $document so it can be mocked
-  ([a057e089](https://github.com/angular/angular.js/commit/a057e0896a7fe2fdaba50b2515555b86e4f4be27),
-   [#11373](https://github.com/angular/angular.js/issues/11373), [#11388](https://github.com/angular/angular.js/issues/11388))
-- **filterFilter:** fix matching against `null`/`undefined`
-  ([b5002ab6](https://github.com/angular/angular.js/commit/b5002ab62ad6e13f4339e20106e1fdece14912a2),
-   [#11432](https://github.com/angular/angular.js/issues/11432), [#11445](https://github.com/angular/angular.js/issues/11445))
-- **ngAnimate:** ensure that minified repaint code isn't removed
-  ([c55a4944](https://github.com/angular/angular.js/commit/c55a494433e619aad0c7ef9fddadc0b3fdf53915),
-   [#9936](https://github.com/angular/angular.js/issues/9936))
-- **ngAria:** handle elements with role="checkbox/menuitemcheckbox"
-  ([44337f63](https://github.com/angular/angular.js/commit/44337f63fa94116795e83e3a764a6ba6782809c7),
-   [#11317](https://github.com/angular/angular.js/issues/11317), [#11321](https://github.com/angular/angular.js/issues/11321))
-- **ngModel:** allow setting model to NaN when asyncValidator is present
-  ([948120ec](https://github.com/angular/angular.js/commit/948120ecdbc4dd07880c0107564c50c7675b8a93),
-   [#11315](https://github.com/angular/angular.js/issues/11315), [#11411](https://github.com/angular/angular.js/issues/11411))
-- **ngTouch:** register touches properly when jQuery is used
-  ([06a9f0a9](https://github.com/angular/angular.js/commit/06a9f0a95f0e72fa2e9879fe8a49e9bf69986a5f),
-   [#4001](https://github.com/angular/angular.js/issues/4001), [#8584](https://github.com/angular/angular.js/issues/8584), [#10797](https://github.com/angular/angular.js/issues/10797), [#11488](https://github.com/angular/angular.js/issues/11488))
-- **select:** don't call $render twice if $viewValue ref changes
-  ([7e5c447f](https://github.com/angular/angular.js/commit/7e5c447fa9ad7d81cc818d6e79392c3e4a6b23a0),
-   [#11329](https://github.com/angular/angular.js/issues/11329), [#11412](https://github.com/angular/angular.js/issues/11412))
-
-
-## Features
-
-- **$anchorScroll:** allow scrolling to a specified element
-  ([731c8b5e](https://github.com/angular/angular.js/commit/731c8b5e2d01a44aa91f967f1a6acbadb8005a8b),
-   [#4568](https://github.com/angular/angular.js/issues/4568), [#9596](https://github.com/angular/angular.js/issues/9596))
-- **$animate:** complete refactor of internal animation code
-  ([c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef))
-- **$http:** support custom params serializers
-  ([6c8464ad](https://github.com/angular/angular.js/commit/6c8464ad14dd308349f632245c1a064c9aae242a),
-   [#3740](https://github.com/angular/angular.js/issues/3740), [#7429](https://github.com/angular/angular.js/issues/7429), [#9224](https://github.com/angular/angular.js/issues/9224), [#11461](https://github.com/angular/angular.js/issues/11461))
-- **$interpolate:** extend interpolation with MessageFormat like syntax
-  ([1e58488a](https://github.com/angular/angular.js/commit/1e58488ad65abf7031bab5813523bb9d86dbd28c),
-   [#11152](https://github.com/angular/angular.js/issues/11152))
-- **angular.Module:** add `decorator` method
-  ([e57138d7](https://github.com/angular/angular.js/commit/e57138d7eff1210f99238c475fff57530bf0ab19),
-   [#11305](https://github.com/angular/angular.js/issues/11305), [#11300](https://github.com/angular/angular.js/issues/11300))
-- **ngClass:** add support for conditional map within an array.
-  ([4588e627](https://github.com/angular/angular.js/commit/4588e627bb7238b2113241919b948d0e5166c76d),
-   [#4807](https://github.com/angular/angular.js/issues/4807))
-- **travis:** run unit tests on iOS 8
-  ([2cdb2016](https://github.com/angular/angular.js/commit/2cdb2016b9d89abfb5ab988b67d5f26f3bf21908),
-   [#11479](https://github.com/angular/angular.js/issues/11479))
-
-
-## Performance Improvements
-
-- **$rootScope:** remove history event handler when app is torn down
-  ([d996305b](https://github.com/angular/angular.js/commit/d996305b4470f80fbb1cbddf54b7d10ffbb6ab47),
-   [#9897](https://github.com/angular/angular.js/issues/9897), [#9905](https://github.com/angular/angular.js/issues/9905))
-- **benchmark:** add ngmodel benchmarks to largetable-bp
-  ([b8dbdb0c](https://github.com/angular/angular.js/commit/b8dbdb0c5e2cd176c6d94d60f781cfc02e646592),
-   [#11082](https://github.com/angular/angular.js/issues/11082))
-- **ngOptions:** only perform deep equality check on ngModel if using track by
-  ([171b9f7f](https://github.com/angular/angular.js/commit/171b9f7f2339ef9047b8526b2c3f36bb58d14feb),
-   [#11448](https://github.com/angular/angular.js/issues/11448), [#11447](https://github.com/angular/angular.js/issues/11447))
-
-
-## Breaking Changes
-
-- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-  JavaSript and CSS animations can no longer be run in
-parallel. With earlier versions of ngAnimate, both CSS and JS animations
-would be run together when multiple animations were detected. This
-feature has now been removed, however, the same effect, with even more
-possibilities, can be achieved by injecting `$animateCss` into a
-JavaScript-defined animation and creating custom CSS-based animations
-from there. Read the ngAnimate docs for more info.
-
-- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-  The function params for `$animate.enabled()` when an
-element is used are now flipped. This fix allows the function to act as
-a getter when a single element param is provided.
-
-```js
-// < 1.4
-$animate.enabled(false, element);
-
-// 1.4+
-$animate.enabled(element, false);
-```
-
-- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-  In addition to disabling the children of the element,
-`$animate.enabled(element, false)` will now also disable animations on
-the element itself.
-
-- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-  Animation-related callbacks are now fired on
-`$animate.on` instead of directly being on the element.
-
-```js
-// < 1.4
-element.on('$animate:before', function(e, data) {
-  if (data.event === 'enter') { ... }
-});
-element.off('$animate:before', fn);
-
-// 1.4+
-$animate.on(element, 'enter', function(data) {
-  //...
-});
-$animate.off(element, 'enter', fn);
-```
-
-- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-  There is no need to call `$scope.$apply` or
-`$scope.$digest` inside of a animation promise callback anymore
-since the promise is resolved within a digest automatically (but a
-digest is not run unless the promise is chained).
-
-```js
-// < 1.4
-$animate.enter(element).then(function() {
-  $scope.$apply(function() {
-    $scope.explode = true;
-  });
-});
-
-// 1.4+
-$animate.enter(element).then(function() {
-  $scope.explode = true;
-});
-```
-
-- **$animate:** due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-  When an enter, leave or move animation is triggered then it
-will always end any pending or active parent class based animations
-(animations triggered via ngClass) in order to ensure that any CSS
-styles are resolved in time.
-
-
-
-
 <a name="1.4.0-beta.6"></a>
 # 1.4.0-beta.6 cookie-liberation (2015-03-17)
 
@@ -612,7 +611,6 @@ mechanism.
    [#10864](https://github.com/angular/angular.js/issues/10864))
 
 
-
 <a name="1.4.0-beta.5"></a>
 # 1.4.0-beta.5 karmic-stabilization (2015-02-24)
 
@@ -698,35 +696,6 @@ end of the container containing the ngMessages directive).
 </div>
 ```
 
-- **$http:** due to [5da1256](https://github.com/angular/angular.js/commit/5da1256fc2812d5b28fb0af0de81256054856369),
-
-`transformRequest` functions can no longer modify request headers.
-
-Before this commit `transformRequest` could modify request headers, ex.:
-
-```javascript
-function requestTransform(data, headers) {
-    headers = angular.extend(headers(), {
-      'X-MY_HEADER': 'abcd'
-    });
-  }
-  return angular.toJson(data);
-}
-```
-
-This behavior was unintended and undocumented, so the change should affect very few applications. If one
-needs to dynamically add / remove headers it should be done in a header function, for example:
-
-```javascript
-$http.get(url, {
-  headers: {
-    'X-MY_HEADER': function(config) {
-      return 'abcd'; //you've got access to a request config object to specify header value dynamically
-    }
-  }
-})
-```
-
 <a name="1.3.14"></a>
 # 1.3.14 instantaneous-browserification (2015-02-24)
 
@@ -801,8 +770,6 @@ $http.get(url, {
 
 
 
-
-
 <a name="1.4.0-beta.3"></a>
 # 1.4.0-beta.3 substance-mimicry (2015-02-02)
 

CONTRIBUTING.md

@@ -199,9 +199,14 @@ format that includes a **type**, a **scope** and a **subject**:
 <footer>
 ```
 
+The **header** is mandatory and the **scope** of the header is optional.
+
 Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
 to read on github as well as in various git tools.
 
+### Revert
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
+
 ### Type
 Must be one of the following:
 
@@ -235,6 +240,7 @@ The body should include the motivation for the change and contrast this with pre
 The footer should contain any information about **Breaking Changes** and is also the place to
 reference GitHub issues that this commit **Closes**.
 
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
 
 A detailed explanation can be found in this [document][commit-message-format].
 

Gruntfile.js

@@ -126,9 +126,6 @@ module.exports = function(grunt) {
       ngLocale: {
         files: { src: 'src/ngLocale/**/*.js' },
       },
-      ngMessageFormat: {
-        files: { src: 'src/ngMessageFormat/**/*.js' },
-      },
       ngMessages: {
         files: { src: 'src/ngMessages/**/*.js' },
       },
@@ -158,7 +155,7 @@ module.exports = function(grunt) {
     jscs: {
       src: ['src/**/*.js', 'test/**/*.js'],
       options: {
-        config: ".jscs.json"
+        config: '.jscsrc'
       }
     },
 
@@ -203,10 +200,6 @@ module.exports = function(grunt) {
         dest: 'build/angular-resource.js',
         src: util.wrap(files['angularModules']['ngResource'], 'module')
       },
-      messageformat: {
-        dest: 'build/angular-message-format.js',
-        src: util.wrap(files['angularModules']['ngMessageFormat'], 'module')
-      },
       messages: {
         dest: 'build/angular-messages.js',
         src: util.wrap(files['angularModules']['ngMessages'], 'module')
@@ -227,9 +220,9 @@ module.exports = function(grunt) {
         dest: 'build/angular-aria.js',
         src: util.wrap(files['angularModules']['ngAria'], 'module')
       },
-      "promises-aplus-adapter": {
+      'promises-aplus-adapter': {
         dest:'tmp/promises-aplus-adapter++.js',
-        src:['src/ng/q.js','lib/promises-aplus/promises-aplus-test-adapter.js']
+        src:['src/ng/q.js', 'lib/promises-aplus/promises-aplus-test-adapter.js']
       }
     },
 
@@ -239,7 +232,6 @@ module.exports = function(grunt) {
       animate: 'build/angular-animate.js',
       cookies: 'build/angular-cookies.js',
       loader: 'build/angular-loader.js',
-      messageformat: 'build/angular-message-format.js',
       messages: 'build/angular-messages.js',
       touch: 'build/angular-touch.js',
       resource: 'build/angular-resource.js',
@@ -249,7 +241,7 @@ module.exports = function(grunt) {
     },
 
 
-    "ddescribe-iit": {
+    'ddescribe-iit': {
       files: [
         'src/**/*.js',
         'test/**/*.js',
@@ -270,7 +262,7 @@ module.exports = function(grunt) {
       }
     },
 
-    "merge-conflict": {
+    'merge-conflict': {
       files: [
         'src/**/*',
         'test/**/*',
@@ -300,11 +292,11 @@ module.exports = function(grunt) {
     },
 
     shell: {
-      "npm-install": {
-        command: path.normalize('scripts/npm/install-dependencies.sh')
+      'npm-install': {
+        command: 'node scripts/npm/check-node-modules.js'
       },
 
-      "promises-aplus-tests": {
+      'promises-aplus-tests': {
         options: {
           stdout: false,
           stderr: true,
@@ -335,8 +327,10 @@ module.exports = function(grunt) {
     grunt.task.run('shell:npm-install');
   }
 
+
+
   //alias tasks
-  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor']);
+  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package', 'test:unit', 'test:promises-aplus', 'tests:docs', 'test:protractor']);
   grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
   grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
   grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['build', 'tests:modules']);
@@ -346,11 +340,11 @@ module.exports = function(grunt) {
   grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']);
   grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor:jenkins']);
   grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor']);
-  grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']);
+  grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter', 'shell:promises-aplus-tests']);
 
-  grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
+  grunt.registerTask('minify', ['bower', 'clean', 'build', 'minall']);
   grunt.registerTask('webserver', ['connect:devserver']);
-  grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
+  grunt.registerTask('package', ['bower', 'validate-angular-files', 'clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
   grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint', 'jscs']);
   grunt.registerTask('default', ['package']);
 };

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.closure.md

@@ -1,8 +1,8 @@
 Using AngularJS with the Closure Compiler
 =========================================
 
-The Closure Compiler project contains externs definitions for AngularJS
-JavaScript in its `contrib/externs` directory.
+The Closure Compiler project contains definitions for the AngularJS JavaScript
+in its `contrib/externs` directory.
 
 The definitions contain externs for use with the Closure compiler (aka
 JSCompiler). Passing these files to the --externs parameter of a compiler

README.md

@@ -10,7 +10,7 @@ the browser how to do dependency injection and inversion of control.
 
 Oh yeah and it helps with server-side communication, taming async callbacks with promises and 
 deferreds. It also makes client-side navigation and deeplinking with hashbang urls or HTML5 pushState a
-piece of cake. The best of all: it makes development fun!
+piece of cake. Best of all?? It makes development fun!
 
 * Web site: http://angularjs.org
 * Tutorial: http://docs.angularjs.org/tutorial

angularFiles.js

@@ -32,6 +32,7 @@ var angularFiles = {
     'src/ng/q.js',
     'src/ng/raf.js',
     'src/ng/rootScope.js',
+    'src/ng/rootElement.js',
     'src/ng/sanitizeUri.js',
     'src/ng/sce.js',
     'src/ng/sniffer.js',
@@ -40,7 +41,6 @@ var angularFiles = {
     'src/ng/timeout.js',
     'src/ng/urlUtils.js',
     'src/ng/window.js',
-    'src/ng/cookieReader.js',
 
     'src/ng/filter.js',
     'src/ng/filter/filter.js',
@@ -66,7 +66,6 @@ var angularFiles = {
     'src/ng/directive/ngList.js',
     'src/ng/directive/ngModel.js',
     'src/ng/directive/ngNonBindable.js',
-    'src/ng/directive/ngOptions.js',
     'src/ng/directive/ngPluralize.js',
     'src/ng/directive/ngRepeat.js',
     'src/ng/directive/ngShowHide.js',
@@ -80,36 +79,17 @@ var angularFiles = {
   ],
 
   'angularLoader': [
-    'stringify.js',
+    'src/stringify.js',
     'src/minErr.js',
     'src/loader.js'
   ],
 
   'angularModules': {
     'ngAnimate': [
-      'src/ngAnimate/shared.js',
-      'src/ngAnimate/rafScheduler.js',
-      'src/ngAnimate/animateChildrenDirective.js',
-      'src/ngAnimate/animateCss.js',
-      'src/ngAnimate/animateCssDriver.js',
-      'src/ngAnimate/animateJs.js',
-      'src/ngAnimate/animateJsDriver.js',
-      'src/ngAnimate/animateQueue.js',
-      'src/ngAnimate/animateRunner.js',
-      'src/ngAnimate/animation.js',
-      'src/ngAnimate/module.js'
+      'src/ngAnimate/animate.js'
     ],
     'ngCookies': [
-      'src/ngCookies/cookies.js',
-      'src/ngCookies/cookieStore.js',
-      'src/ngCookies/cookieWriter.js'
-    ],
-    'ngMessageFormat': [
-      'src/ngMessageFormat/messageFormatCommon.js',
-      'src/ngMessageFormat/messageFormatSelector.js',
-      'src/ngMessageFormat/messageFormatInterpolationParts.js',
-      'src/ngMessageFormat/messageFormatParser.js',
-      'src/ngMessageFormat/messageFormatService.js'
+      'src/ngCookies/cookies.js'
     ],
     'ngMessages': [
       'src/ngMessages/messages.js'
@@ -182,7 +162,7 @@ var angularFiles = {
     'src/publishExternalApis.js',
     '@angularSrcModules',
     '@angularScenario',
-    '@angularTest'
+    '@angularTest',
   ],
 
   'karmaExclude': [
@@ -201,7 +181,6 @@ var angularFiles = {
     '@angularSrcModules',
     'src/ngScenario/browserTrigger.js',
     'test/helpers/*.js',
-    'test/ngMessageFormat/*.js',
     'test/ngMock/*.js',
     'test/ngCookies/*.js',
     'test/ngRoute/**/*.js',
@@ -218,7 +197,7 @@ var angularFiles = {
     'src/publishExternalApis.js',
     '@angularSrcModules',
     '@angularScenario',
-    '@angularTest'
+    '@angularTest',
   ],
 
   'karmaJqueryExclude': [
@@ -230,7 +209,6 @@ var angularFiles = {
 
 angularFiles['angularSrcModules'] = [].concat(
   angularFiles['angularModules']['ngAnimate'],
-  angularFiles['angularModules']['ngMessageFormat'],
   angularFiles['angularModules']['ngMessages'],
   angularFiles['angularModules']['ngCookies'],
   angularFiles['angularModules']['ngResource'],

benchmarks/largetable-bp/main.html

@@ -14,14 +14,11 @@
       <div>ngBind: <input type="radio" ng-model="benchmarkType" value="ngBind"></div>
       <div>ngBindOnce: <input type="radio" ng-model="benchmarkType" value="ngBindOnce"></div>
       <div>interpolation: <input type="radio" ng-model="benchmarkType" value="interpolation"></div>
-      <div>interpolation + bind-once: <input type="radio" ng-model="benchmarkType" value="bindOnceInterpolation"></div>
       <div>attribute interpolation: <input type="radio" ng-model="benchmarkType" value="interpolationAttr"></div>
       <div>ngBind + fnInvocation: <input type="radio" ng-model="benchmarkType" value="ngBindFn"></div>
       <div>interpolation + fnInvocation: <input type="radio" ng-model="benchmarkType" value="interpolationFn"></div>
       <div>ngBind + filter: <input type="radio" ng-model="benchmarkType" value="ngBindFilter"></div>
       <div>interpolation + filter: <input type="radio" ng-model="benchmarkType" value="interpolationFilter"></div>
-      <div>ngModel (const name): <input type="radio" ng-model="benchmarkType" value="ngModelConstName"></div>
-      <div>ngModel (interp name): <input type="radio" ng-model="benchmarkType" value="ngModelInterpName"></div>
 
       <ng-switch on="benchmarkType">
         <baseline-binding-table ng-switch-when="baselineBinding">
@@ -38,7 +35,7 @@
         </div>
         <div ng-switch-when="ngBindOnce">
           <h2>baseline binding once</h2>
-          <div ng-repeat="row in ::data">
+          <div ng-repeat="row in data">
             <span ng-repeat="column in ::row">
               <span ng-bind="::column.i"></span>:<span ng-bind="::column.j"></span>|
             </span>
@@ -50,12 +47,6 @@
             <span ng-repeat="column in row">{{column.i}}:{{column.j}}|</span>
           </div>
         </div>
-        <div ng-switch-when="bindOnceInterpolation">
-          <h2>baseline one-time interpolation</h2>
-          <div ng-repeat="row in ::data">
-            <span ng-repeat="column in ::row">{{::column.i}}:{{::column.j}}|</span>
-          </div>
-        </div>
         <div ng-switch-when="interpolationAttr">
           <h2>attribute interpolation</h2>
           <div ng-repeat="row in data">
@@ -86,20 +77,6 @@
             <span ng-repeat="column in row">{{column.i | noop}}:{{column.j | noop}}|</span>
           </div>
         </div>
-        <div ng-switch-when="ngModelConstName">
-          <h2>ngModel (const name)</h2>
-          <div ng-repeat="row in data">
-            <input type="text" ng-model="row.i" name="constName" />
-            <input type="text" ng-model="row.j" />
-          </div>
-        </div>
-        <div ng-switch-when="ngModelInterpName">
-          <h2>ngModel (interp name)</h2>
-          <div ng-repeat="(rowIdx, row) in data">
-            <input type="text" ng-model="row.i" name="input-{{rowIdx}}" />
-            <input type="text" ng-model="row.j" name="input2-{{rowIdx}}" />
-          </div>
-        </div>
       </ng-switch>
     </div>
   </div>

benchmarks/ng-options-bp/app.js

@@ -1,95 +0,0 @@
-"use strict";
-
-/* globals angular, benchmarkSteps */
-
-var app = angular.module('ngOptionsBenchmark', []);
-
-app.config(function($compileProvider) {
-  if ($compileProvider.debugInfoEnabled) {
-    $compileProvider.debugInfoEnabled(false);
-  }
-});
-
-
-
-app.controller('DataController', function($scope, $element) {
-  $scope.items = [];
-  $scope.count = 10000;
-
-  function changeOptions() {
-    $scope.items = [];
-    for (var i = 0; i < $scope.count; ++i) {
-      $scope.items.push({
-        id: i,
-        label: 'item-' + i,
-        group: 'group-' + i % 100
-      });
-    }
-  }
-
-  var selectElement = $element.find('select');
-  console.log(selectElement);
-
-
-  benchmarkSteps.push({
-    name: 'add-options',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.count = 10000;
-        changeOptions();
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-model-1',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.x = $scope.items[1000];
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-model-2',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.x = $scope.items[10];
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'remove-options',
-    fn: function() {
-      $scope.count = 100;
-      changeOptions();
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'add-options',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.count = 10000;
-        changeOptions();
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-view-1',
-    fn: function() {
-      selectElement.val('2000');
-      selectElement.triggerHandler('change');
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-view-2',
-    fn: function() {
-      selectElement.val('1000');
-      selectElement.triggerHandler('change');
-    }
-  });
-});

benchmarks/ng-options-bp/bp.conf.js

@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [    {
-      id: 'angular',
-      src: '/build/angular.js'
-    },
-    {
-      src: 'app.js',
-    }]
-  });
-};

benchmarks/ng-options-bp/main.html

@@ -1,10 +0,0 @@
-<div ng-app="ngOptionsBenchmark" ng-cloak>
-  <div ng-controller="DataController">
-    <div class="container-fluid">
-      <p>
-        Tests the execution of ng-options for rendering during model and option updates.
-      </p>
-      <select ng-model="x" ng-options="a as a.label group by a.group for a in items track by a.id"></select>
-    </div>
-  </div>
-</div>

compare-master-to-stable.js

@@ -103,10 +103,10 @@ then(function (tags) {
     sort(semver.rcompare);
 }).
 then(function (tags) {
-  var major = tags[0].split('.')[0];
+  var major = tags[0].split('.')[0] + '.x';
   return tags.
     filter(function (ver) {
-      return semver(ver).major == major;
+      return semver.satisfies(ver, major);
     });
 }).
 then(function (tags) {

css/angular.css

@@ -9,11 +9,3 @@
 ng\:form {
   display: block;
 }
-
-.ng-animate-shim {
-  visibility:hidden;
-}
-
-.ng-anchor {
-  position:absolute;
-}

docs/app/assets/css/docs.css

@@ -701,7 +701,3 @@ ul.events > li {
     padding-bottom:0px;
   }
 }
-
-iframe[name="example-anchoringExample"] {
-  height:400px;
-}

docs/app/src/versions.js

@@ -21,13 +21,11 @@ angular.module('versions', [])
   };
 
   $scope.jumpToDocsVersion = function(version) {
-    var currentPagePath = $location.path().replace(/\/$/, ''),
-        url = '';
-    if (version.isOldDocsUrl) {
-      url = version.docsUrl;
-    }else{
-      url = version.docsUrl + currentPagePath;
-    }
-    $window.location = url;
+    var currentPagePath = $location.path().replace(/\/$/, '');
+
+    // TODO: We need to do some munging of the path for different versions of the API...
+
+
+    $window.location = version.docsUrl + currentPagePath;
   };
 }]);

docs/config/index.js

@@ -10,14 +10,14 @@ var Package = require('dgeni').Package;
 module.exports = new Package('angularjs', [
   require('dgeni-packages/ngdoc'),
   require('dgeni-packages/nunjucks'),
-  require('dgeni-packages/examples')
+  require('dgeni-packages/examples'),
+  require('dgeni-packages/git')
 ])
 
 
 .factory(require('./services/errorNamespaceMap'))
 .factory(require('./services/getMinerrInfo'))
 .factory(require('./services/getVersion'))
-.factory(require('./services/gitData'))
 
 .factory(require('./services/deployments/debug'))
 .factory(require('./services/deployments/default'))
@@ -26,7 +26,6 @@ module.exports = new Package('angularjs', [
 
 .factory(require('./inline-tag-defs/type'))
 
-
 .processor(require('./processors/error-docs'))
 .processor(require('./processors/index-page'))
 .processor(require('./processors/keywords'))

docs/config/services/gitData.js

@@ -1,16 +0,0 @@
-"use strict";
-
-var versionInfo = require('../../../lib/versions/version-info');
-
-/**
- * @dgService gitData
- * @description
- * Information from the local git repository
- */
-module.exports = function gitData() {
-  return {
-    version: versionInfo.currentVersion,
-    versions: versionInfo.previousVersions,
-    info: versionInfo.gitRepoInfo
-  };
-};

docs/config/templates/indexPage.template.html

@@ -3,7 +3,7 @@
 <head>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="Description"
         content="AngularJS is what HTML would have been, had it been designed for building web-apps.
                  Declarative templates with data-binding, MVC, dependency injection and great
@@ -220,7 +220,7 @@
         <p class="pull-right"><a back-to-top>Back to top</a></p>
 
         <p>
-          Super-powered by Google  ©2010-2015
+          Super-powered by Google  ©2010-2014
           ( <a id="version"
                ng-href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md#{{versionNumber}}"
                ng-bind-template="v{{version}}">

docs/config/templates/lib/macros.html

@@ -1,60 +0,0 @@
-{% macro typeList(types) -%}
-{% for typeName in types %}<a href="" class="{$ typeName | typeClass $}">{$ typeName | escape $}</a>{% endfor %}
-{%- endmacro -%}
-
-{%- macro paramTable(params) %}
-<table class="variables-matrix input-arguments">
-  <thead>
-    <tr>
-      <th>Param</th>
-      <th>Type</th>
-      <th>Details</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for param in params %}
-    <tr>
-      <td>
-        {$ param.name $}
-        {% if param.alias %}| {$ param.alias $}{% endif %}
-        {% if param.optional %}<div><em>(optional)</em></div>{% endif %}
-      </td>
-      <td>
-        {$ typeList(param.typeList) $}
-      </td>
-      <td>
-        {$ param.description | marked $}
-        {% if param.defaultValue %}<p><em>(default: {$ param.defaultValue $})</em></p>{% endif %}
-      </td>
-    </tr>
-    {% endfor %}
-  </tbody>
-</table>
-{% endmacro -%}
-
-
-{%- macro directiveParam(name, type, join, sep) %}
-  {%- if type.optional %}[{% endif -%}
-  {$ name | dashCase $}{$ join $}{$ type.name $}{$ sep $}
-  {%- if type.optional %}]{% endif -%}
-{% endmacro -%}
-
-{%- macro functionSyntax(fn) %}
-  {%- set sep = joiner(', ') -%}
-  {% marked -%}
-    `{$ fn.name $}({%- for param in fn.params %}{$ sep() $}
-    {%- if param.type.optional %}[{% endif -%}
-    {$ param.name $}
-    {%- if param.type.optional %}]{% endif -%}
-    {% endfor %});`
-  {%- endmarked %}
-{% endmacro -%}
-
-{%- macro typeInfo(fn) -%}
-<table class="variables-matrix return-arguments">
-  <tr>
-    <td>{$ typeList(fn.typeList) $}</td>
-    <td>{$ fn.description | marked $}</td>
-  </tr>
-</table>
-{%- endmacro -%}

docs/content/api/index.ngdoc

@@ -140,7 +140,7 @@ or JavaScript callbacks.
       {@link ngAnimate#service Services / Factories}
     </td>
     <td>
-      Use {@link ng.$animate $animate} to trigger animation operations within your directive code.
+      Use {@link ngAnimate.$animate $animate} to trigger animation operations within your directive code.
     </td>
   </tr>
   <tr>

docs/content/error/$compile/baddir.ngdoc

@@ -1,8 +0,0 @@
-@ngdoc error
-@name $compile:baddir
-@fullName Invalid Directive Name
-@description
-
-This error occurs when the name of a directive is not valid.
-
-Directives must start with a lowercase character and must not contain leading or trailing whitespaces.

docs/content/error/$compile/noctrl.ngdoc

@@ -1,12 +0,0 @@
-@ngdoc error
-@name $compile:noctrl
-@fullName Controller is required.
-@description
-
-When using the `bindToController` feature of AngularJS, a directive is required
-to have a Controller. A controller may be specified by adding a "controller"
-property to the directive definition object. Its value should be either a
-string, or an invokable object (a function, or an array whose last element is a
-function).
-
-For more information, see the {@link guide/directive directives guide}.

docs/content/error/$compile/noident.ngdoc

@@ -1,71 +0,0 @@
-@ngdoc error
-@name $compile:noident
-@fullName Controller identifier is required.
-@description
-
-When using the `bindToController` feature of AngularJS, a directive is required
-to have a Controller identifier, which is initialized in scope with the value of
-the controller instance. This can be supplied using the "controllerAs" property
-of the directive object, or alternatively by adding " as IDENTIFIER" to the controller
-name.
-
-For example, the following directives are valid:
-
-```js
-// OKAY, because controller is a string with an identifier component.
-directive("okay", function() {
-  return {
-    bindToController: true,
-    controller: "myCtrl as $ctrl"
-    scope: {
-      text: "@text"
-    }
-  };
-});
-
-
-// OKAY, because the directive uses the controllerAs property to override
-// the controller identifier.
-directive("okay2", function() {
-  return {
-    bindToController: true,
-    controllerAs: "$ctrl",
-    controller: function() {
-
-    },
-    scope: {
-      text: "@text"
-    }
-  };
-});
-```
-
-While the following are invalid:
-
-```js
-// BAD, because the controller property is a string with no identifier.
-directive("bad", function() {
-  return {
-    bindToController: true,
-    controller: "noIdentCtrl",
-    scope: {
-      text: "@text"
-    }
-  };
-});
-
-
-// BAD because the controller is not a string (therefore has no identifier),
-// and there is no controllerAs property.
-directive("bad2", function() {
-  return {
-    bindToController: true,
-    controller: function noControllerAs() {
-
-    },
-    scope: {
-      text: "@text"
-    }
-  };
-});
-```

docs/content/error/$compile/nonassign.ngdoc

@@ -36,25 +36,9 @@ Following are invalid uses of this directive:
 ```
 
 
-To resolve this error, do one of the following options:
-
-- use path expressions with scope properties that are two-way data-bound like so:
-
+To resolve this error, always use path expressions with scope properties that are two-way data-bound:
 ```
 <my-directive bind="some.property">
 <my-directive bind="some[3]['property']">
 ```
 
-- Make the binding optional
-
-```
-myModule.directive('myDirective', function factory() {
-  return {
-    ...
-    scope: {
-      localValue: '=?bind' // <-- the '?' makes it optional
-    }
-    ...
-  }
-});
-```

docs/content/error/$controller/ctrlfmt.ngdoc

@@ -11,7 +11,7 @@ Supported formats:
 1. `__name__`
 2. `__name__ as __identifier__`
 
-N'either `__name__` or `__identifier__` may contain spaces.
+Neither `__name__` or `__identifier__` may contain spaces.
 
 Example of incorrect usage that leads to this error:
 ```html

docs/content/error/$injector/unpr.ngdoc

@@ -69,15 +69,3 @@ angular.module('myModule', [])
 ```
 
 Use the `$controller` service if you want to instantiate controllers yourself.
-
-Attempting to inject a scope object into anything that's not a controller or a directive,
-for example a service, will also throw an `Unknown provider: $scopeProvider <- $scope` error.
-This might happen if one mistakenly registers a controller as a service, ex.:
-
-```
-angular.module('myModule', [])
-  .service('MyController', ['$scope', function($scope) {
-    // This controller throws an unknown provider error because
-    // a scope object cannot be injected into a service.
-  }]);
-```

docs/content/error/$interpolate/badexpr.ngdoc

@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:badexpr
-@fullName Expecting end operator
-@description
-
-The Angular expression is missing the corresponding closing operator.

docs/content/error/$interpolate/dupvalue.ngdoc

@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:dupvalue
-@fullName Duplicate choice in plural/select
-@description
-
-You have repeated a match selection for your plural or select MessageFormat
-extension in your interpolation expression.  The different choices have to be unique.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/logicbug.ngdoc

@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:logicbug
-@fullName Bug in ngMessageFormat module
-@description
-
-You've just hit a bug in the ngMessageFormat module provided by angular-message-format.min.js.
-Please file a github issue for this and provide the interpolation text that caused you to hit this
-bug mentioning the exact version of AngularJS used and we will fix it!
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/nochgmustache.ngdoc

@@ -1,17 +0,0 @@
-@ngdoc error
-@name $interpolate:nochgmustache
-@fullName Redefinition of start/endSymbol incompatible with MessageFormat extensions
-@description
-
-You have redefined `$interpolate.startSymbol`/`$interpolate.endSymbol` and also
-loaded the `ngMessageFormat` module (provided by angular-message-format.min.js)
-while creating your injector.
-
-`ngMessageFormat` currently does not support redefinition of the
-startSymbol/endSymbol used by `$interpolate`.  If this is affecting you, please
-file an issue and mention @chirayuk on it.  This is intended to be fixed in a
-future commit and the github issue will help gauge urgency.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/reqarg.ngdoc

@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:reqarg
-@fullName Missing required argument for MessageFormat
-@description
-
-You must specify the MessageFormat function that you're using right after the
-comma following the Angular expression.  Currently, the supported functions are
-"plural" and "select" (for gender selections.)
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/reqcomma.ngdoc

@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:reqcomma
-@fullName Missing comma following MessageFormat plural/select keyword
-@description
-
-The MessageFormat syntax requires a comma following the "plural" or "select"
-extension keyword in the extended interpolation syntax.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/reqendbrace.ngdoc

@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:reqendbrace
-@fullName Unterminated message for plural/select value
-@description
-
-The plural or select message for a value or keyword choice has no matching end
-brace to mark the end of the message.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/reqendinterp.ngdoc

@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:reqendinterp
-@fullName Unterminated interpolation
-@description
-
-The interpolation text does not have an ending `endSymbol` ("}}" by default) and is unterminated.

docs/content/error/$interpolate/reqopenbrace.ngdoc

@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:reqopenbrace
-@fullName An opening brace was expected but not found
-@description
-
-The plural or select extension keyword or values (such as "other", "male",
-"female", "=0", "one", "many", etc.) MUST be followed by a message enclosed in
-braces.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/reqother.ngdoc

@@ -1,13 +0,0 @@
-@ngdoc error
-@name $interpolate:reqother
-@fullName Required choice "other" for select/plural in MessageFormat
-@description
-
-Your interpolation expression with a MessageFormat extension for either
-"plural" or "select" (typically used for gender selection) does not contain a
-message for the choice "other".  Using either select or plural MessageFormat
-extensions require that you provide a message for the selection "other".
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/unknarg.ngdoc

@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:unknarg
-@fullName Unrecognized MessageFormat extension
-@description
-
-The MessageFormat extensions provided by `ngMessageFormat` are currently
-limited to "plural" and "select".  The extension that you have used is either
-unsupported or invalid.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

docs/content/error/$interpolate/unsafe.ngdoc

@@ -1,10 +0,0 @@
-@ngdoc error
-@name $interpolate:unsafe
-@fullName MessageFormat extensions not allowed in secure context
-@description
-
-You have attempted to use a MessageFormat extension in your interpolation expression that is marked as a secure context.  For security purposes, this is not supported.
-
-Read more about secure contexts at {@link ng.$sce Strict Contextual Escaping
-(SCE)} and about the MessageFormat extensions at {@link
-guide/i18n#MessageFormat Angular i18n MessageFormat}.

docs/content/error/$interpolate/untermstr.ngdoc

@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:untermstr
-@fullName Unterminated string literal
-@description
-
-The string literal was not terminated in your Angular expression.

docs/content/error/$interpolate/wantstring.ngdoc

@@ -1,8 +0,0 @@
-@ngdoc error
-@name $interpolate:wantstring
-@fullName Expected the beginning of a string
-@description
-
-We expected to see the beginning of a string (either a single quote or a double
-quote character) in the expression but it was not found.  The expression is
-invalid.  If this is incorrect, please file an issue on github.

docs/content/error/$location/nobase.ngdoc

@@ -35,7 +35,7 @@ URL of the subcontext:
 
 ```html
 <head>
-  <base href="/subapp/">
+  <base href="/subapp">
   ...
 </head>
 ```

docs/content/error/filter/notarray.ngdoc

@@ -1,51 +0,0 @@
-@ngdoc error
-@name filter:notarray
-@fullName Not an array
-@description
-
-This error occurs when {@link ng.filter filter} is not used with an array:
-```html
-<input ng-model="search">
-<div ng-repeat="(key, value) in myObj | filter:search">
-  {{ key }} : {{ value }}
-</div>
-```
-
-Filter must be used with an array so a subset of items can be returned.
-The array can be initialized asynchronously and therefore null or undefined won't throw this error.
-
-To filter an object by the value of its properties you can create your own custom filter:
-```js
-angular.module('customFilter',[])
-  .filter('custom', function() {
-    return function(input, search) {
-      if (!input) return input;
-      if (!search) return input;
-      var expected = ('' + search).toLowerCase();
-      var result = {};
-      angular.forEach(input, function(value, key) {
-        var actual = ('' + value).toLowerCase();
-        if (actual.indexOf(expected) !== -1) {
-          result[key] = value;
-        }
-      });
-      return result;
-    }
-  });
-```
-That can be used as:
-```html
-<input ng-model="search">
-<div ng-repeat="(key, value) in myObj | custom:search">
-  {{ key }} : {{ value }}
-</div>
-```
-
-You could as well convert the object to an array using a filter such as
-[toArrayFilter](https://github.com/petebacondarwin/angular-toArrayFilter):
-```html
-<input ng-model="search">
-<div ng-repeat="item in myObj | toArray:false | filter:search">
-  {{ item }}
-</div>
-```

docs/content/error/ngModel/nopromise.ngdoc

@@ -0,0 +1,28 @@
+@ngdoc error
+@name ngModel:nopromise
+@fullName No promise
+@description
+
+The return value of an async validator, must always be a promise. If you want to return a
+non-promise value, you can convert it to a promise using {@link ng.$q#resolve `$q.resolve()`} or
+{@link ng.$q#reject `$q.reject()`}.
+
+Example:
+
+```
+.directive('asyncValidator', function($q) {
+  return {
+    require: 'ngModel',
+    link: function(scope, elem, attrs, ngModel) {
+      ngModel.$asyncValidators.myAsyncValidation = function(modelValue, viewValue) {
+        if (/* I don't need to hit the backend API */) {
+          return $q.resolve();     // to mark as valid or
+          // return $q.reject();   // to mark as invalid
+        } else {
+          // ...send a request to the backend and return a promise
+        }
+      };
+    }
+  };
+})
+```

docs/content/error/ngOptions/trkslct.ngdoc

@@ -1,33 +0,0 @@
-@ngdoc error
-@name ngOptions:trkslct
-@fullName Comprehension expression cannot contain both `select as` and `track by` expressions.
-@description
-
-NOTE: This error was introduced in 1.3.0-rc.5, and was removed for 1.3.0-rc.6 in order to
-not break existing apps.
-
-This error occurs when 'ngOptions' is passed a comprehension expression that contains both a
-`select as` expression and a `track by` expression. These two expressions are fundamentally
-incompatible.
-
- * Example of bad expression: `<select ng-options="item.subItem as item.label for item in values track by item.id" ng-model="selected">`
-   `values: [{id: 1, label: 'aLabel', subItem: {name: 'aSubItem'}}, {id: 2, label: 'bLabel', subItem: {name: 'bSubItem'}}]`,
-   `$scope.selected = {name: 'aSubItem'};`
- * track by is always applied to `value`, with purpose to preserve the selection,
-   (to `item` in this case)
- * To calculate whether an item is selected, `ngOptions` does the following:
-   1. apply `track by` to the values in the array:
-      In the example: [1,2]
-   2. apply `track by` to the already selected value in `ngModel`:
-      In the example: this is not possible, as `track by` refers to `item.id`, but the selected
-      value from `ngModel` is `{name: aSubItem}`.
-
-Here's an example of how to make this example work by using `track by` without `select as`:
-
-```
-<select ng-model="selected" ng-options="item.label for item in values track by item.id">
-```
-
-Note: This would store the whole `item` as the model to `scope.selected` instead of `item.subItem`.
-
-For more information on valid expression syntax, see 'ngOptions' in {@link ng.directive:select select} directive docs.

docs/content/guide/$location.ngdoc

@@ -165,7 +165,7 @@ encoded.
 
 `$location` service has two configuration modes which control the format of the URL in the browser
 address bar: **Hashbang mode** (the default) and the **HTML5 mode** which is based on using the
-[HTML5 History API](https://html.spec.whatwg.org/multipage/browsers.html#the-history-interface). Applications use the same API in
+HTML5 [History API](http://www.w3.org/TR/html5/introduction.html#history-0). Applications use the same API in
 both modes and the `$location` service will work with appropriate URL segments and browser APIs to
 facilitate the browser URL change and history management.
 

docs/content/guide/accessibility.ngdoc

@@ -43,7 +43,7 @@ Currently, ngAria interfaces with the following directives:
 
 Most of ngAria's heavy lifting happens in the {@link ngModel ngModel}
 directive.  For elements using ngModel, special attention is paid by ngAria if that element also
-has a role or type of `checkbox`, `radio`, `range` or `textbox`.
+has a a role or type of `checkbox`, `radio`, `range` or `textbox`.
 
 For those elements using ngModel, ngAria will dynamically bind and update the following ARIA
 attributes (if they have not been explicitly specified by the developer):

docs/content/guide/animations.ngdoc

@@ -253,7 +253,7 @@ The table below explains in detail which animation events are triggered
 | {@link ng.directive:ngClass#animations ngClass or {{class}}}    | add and remove                           |
 | {@link ng.directive:ngShow#animations ngShow & ngHide}                              | add and remove (the ng-hide class value) |
 
-For a full breakdown of the steps involved during each animation event, refer to the {@link ng.$animate API docs}.
+For a full breakdown of the steps involved during each animation event, refer to the {@link ngAnimate.$animate API docs}.
 
 ## How do I use animations in my own directives?
 
@@ -276,6 +276,6 @@ myModule.directive('my-directive', ['$animate', function($animate) {
 
 ## More about animations
 
-For a full breakdown of each method available on `$animate`, see the {@link ng.$animate API documentation}.
+For a full breakdown of each method available on `$animate`, see the {@link ngAnimate.$animate API documentation}.
 
 To see a complete demo, see the {@link tutorial/step_12 animation step within the AngularJS phonecat tutorial}.

docs/content/guide/concepts.ngdoc

@@ -55,11 +55,11 @@ Try out the Live Preview above, and then let's walk through the example and desc
 <img class="pull-right" style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-databinding1.png">
 
 This looks like normal HTML, with some new markup. In Angular, a file like this is called a
-<a name="template">{@link templates template}</a>. When Angular starts your application, it parses and
-processes this new markup from the template using the <a name="compiler">{@link compiler compiler}</a>.
-The loaded, transformed and rendered DOM is then called the <a name="view">view</a>.
+<a name="template">"{@link templates template}"</a>. When Angular starts your application, it parses and
+processes this new markup from the template using the so-called <a name="compiler">"{@link compiler compiler}"</a>.
+The loaded, transformed and rendered DOM is then called the <a name="view">"view"</a>.
 
-The first kind of new markup are the <a name="directive">{@link directive directives}</a>.
+The first kind of new markup are the so-called <a name="directive">"{@link directive directives}"</a>.
 They apply special behavior to attributes or elements in the HTML. In the example above we use the
 {@link ng.directive:ngApp `ng-app`} attribute, which is linked to a directive that automatically
 initializes our application. Angular also defines a directive for the {@link ng.directive:input `input`}
@@ -75,16 +75,16 @@ stores/updates the value of the input field into/from a variable.
 
 The second kind of new markup are the double curly braces `{{ expression | filter }}`:
 When the compiler encounters this markup, it will replace it with the evaluated value of the markup.
-An <a name="expression">{@link expression expression}</a> in a template is a JavaScript-like code snippet that allows
+An <a name="expression">"{@link expression expression}"</a> in a template is a JavaScript-like code snippet that allows
 to read and write variables. Note that those variables are not global variables.
 Just like variables in a JavaScript function live in a scope,
-Angular provides a <a name="scope">{@link scope scope}</a> for the variables accessible to expressions.
-The values that are stored in variables on the scope are referred to as the <a name="model">model</a>
+Angular provides a <a name="scope">"{@link scope scope}"</a> for the variables accessible to expressions.
+The values that are stored in variables on the scope are referred to as the <a name="model">"model"</a>
 in the rest of the documentation.
 Applied to the example above, the markup directs Angular to "take the data we got from the input widgets
 and multiply them together".
 
-The example above also contains a <a name="filter">{@link guide/filter filter}</a>.
+The example above also contains a <a name="filter">"{@link guide/filter filter}"</a>.
 A filter formats the value of an expression for display to the user.
 In the example above, the filter {@link ng.filter:currency `currency`} formats a number
 into an output that looks like money.
@@ -92,7 +92,7 @@ into an output that looks like money.
 The important thing in the example is that Angular provides _live_ bindings:
 Whenever the input values change, the value of the expressions are automatically
 recalculated and the DOM is updated with their values.
-The concept behind this is <a name="databinding">{@link databinding two-way data binding}</a>.
+The concept behind this is <a name="databinding">"{@link databinding two-way data binding}"</a>.
 
 
 ## Adding UI logic: Controllers
@@ -150,7 +150,7 @@ different currencies and also pay the invoice.
 
 What changed?
 
-First, there is a new JavaScript file that contains a <a name="controller">{@link controller controller}</a>.
+First, there is a new JavaScript file that contains a so-called <a name="controller">"{@link controller controller}"</a>.
 More exactly, the file contains a constructor function that creates the actual controller instance.
 The purpose of controllers is to expose variables and functionality to expressions and directives.
 
@@ -255,15 +255,15 @@ We moved the `convertCurrency` function and the definition of the existing curre
 into the new file `finance2.js`. But how does the controller
 get a hold of the now separated function?
 
-This is where <a name="di">{@link di Dependency Injection}</a> comes into play.
+This is where <a name="di">"{@link di Dependency Injection}"</a> comes into play.
 Dependency Injection (DI) is a software design pattern that
 deals with how objects and functions get created and how they get a hold of their dependencies.
 Everything within Angular (directives, filters, controllers,
 services, ...) is created and wired using dependency injection. Within Angular,
-the DI container is called the <a name="injector">{@link di injector}</a>.
+the DI container is called the <a name="injector">"{@link di injector}"</a>.
 
 To use DI, there needs to be a place where all the things that should work together are registered.
-In Angular, this is the purpose of the <a name="module">{@link module modules}</a>.
+In Angular, this is the purpose of the so-called <a name="module">"{@link module modules}"</a>.
 When Angular starts, it will use the configuration of the module with the name defined by the `ng-app` directive,
 including the configuration of all modules that this module depends on.
 

docs/content/guide/controller.ngdoc

@@ -5,13 +5,16 @@
 
 # Understanding Controllers
 
-In Angular, a Controller is a JavaScript **constructor function** that is used to augment the
+In Angular, a Controller is defined by a JavaScript **constructor function** that is used to augment the
 {@link scope Angular Scope}.
 
 When a Controller is attached to the DOM via the {@link ng.directive:ngController ng-controller}
 directive, Angular will instantiate a new Controller object, using the specified Controller's
-**constructor function**. A new **child scope** will be available as an injectable parameter to the
-Controller's constructor function as `$scope`.
+**constructor function**. A new **child scope** will be created and made available as an injectable
+parameter to the Controller's constructor function as `$scope`.
+
+If the controller has been attached using the `controller as` syntax then the controller instance will
+be assigned to a property on the new scope.
 
 Use controllers to:
 
@@ -30,12 +33,12 @@ Do not use controllers to:
 services} instead.
 - Manage the life-cycle of other components (for example, to create service instances).
 
-## Setting up the initial state of a `$scope` object
+# Setting up the initial state of a `$scope` object
 
 Typically, when you create an application you need to set up the initial state for the Angular
 `$scope`. You set up the initial state of a scope by attaching properties to the `$scope` object.
 The properties contain the **view model** (the model that will be presented by the view).  All the
-`$scope` properties will be available to the {@link templates template} at the point in the DOM where the Controller
+`$scope` properties will be available to the template at the point in the DOM where the Controller
 is registered.
 
 The following example demonstrates creating a `GreetingController`, which attaches a `greeting`
@@ -69,13 +72,13 @@ now be data-bound to the template:
 ```
 
 
-## Adding Behavior to a Scope Object
+# Adding Behavior to a Scope Object
 
 In order to react to events or execute computation in the view we must provide behavior to the
 scope. We add behavior to the scope by attaching methods to the `$scope` object.  These methods are
 then available to be called from the template/view.
 
-The following example uses a Controller to add a method, which doubles a number, to the scope:
+The following example uses a Controller to add a method to the scope, which doubles a number:
 
 ```js
 var myApp = angular.module('myApp',[]);
@@ -99,14 +102,14 @@ objects (or primitives) assigned to the scope become model properties. Any metho
 the scope are available in the template/view, and can be invoked via angular expressions
 and `ng` event handler directives (e.g. {@link ng.directive:ngClick ngClick}).
 
-## Using Controllers Correctly
+# Using Controllers Correctly
 
 In general, a Controller shouldn't try to do too much. It should contain only the business logic
 needed for a single view.
 
 The most common way to keep Controllers slim is by encapsulating work that doesn't belong to
 controllers into services and then using these services in Controllers via dependency injection.
-This is discussed in the {@link di Dependency Injection} {@link services
+This is discussed in the {@link di Dependency Injection}  and  {@link services
 Services} sections of this guide.
 
 
@@ -125,7 +128,7 @@ following components:
 - A model consisting of a string named `spice`
 - A Controller with two functions that set the value of `spice`
 
-The message in our template contains a binding to the `spice` model which, by default, is set to the
+The message in our template contains a binding to the `spice` model, which by default is set to the
 string "very". Depending on which button is clicked, the `spice` model is set to `chili` or
 `jalapeño`, and the message is automatically updated by data-binding.
 
@@ -162,7 +165,7 @@ scope is augmented (managed) by the `SpicyController` Controller.
 starts with capital letter and ends with "Controller".
 - Assigning a property to `$scope` creates or updates the model.
 - Controller methods can be created through direct assignment to scope (see the `chiliSpicy` method)
-- The Controller methods and properties are available in the template (for the `<div>` element and
+- The Controller methods and properties are available in the template (for both the `<div>` element and
 its children).
 
 ## Spicy Arguments Example
@@ -259,7 +262,7 @@ Inheritance works with methods in the same way as it does with properties. So in
 examples, all of the properties could be replaced with methods that return string values.
 
 
-# Testing Controllers
+## Testing Controllers
 
 Although there are many ways to test a Controller, one of the best conventions, shown below,
 involves injecting the {@link ng.$rootScope $rootScope} and {@link ng.$controller $controller}:
@@ -302,7 +305,7 @@ describe('myController function', function() {
 ```
 
 
-If you need to test a nested Controller you need to create the same scope hierarchy
+If you need to test a nested Controller you  must create the same scope hierarchy
 in your test that exists in the DOM:
 
 ```js

docs/content/guide/databinding.ngdoc

@@ -3,8 +3,6 @@
 @sortOrder 210
 @description
 
-# Data Binding
-
 Data-binding in Angular apps is the automatic synchronization of data between the model and view
 components.  The way that Angular implements data-binding lets you treat the model as the
 single-source-of-truth in your application.  The view is a projection of the model at all times.

docs/content/guide/di.ngdoc

@@ -163,8 +163,8 @@ someModule.controller('MyController', function($scope, greeter) {
 });
 ```
 
-Given a function the injector can infer the names of the services to inject by examining the
-function declaration and extracting the parameter names. In the above example `$scope`, and
+Given a function, the injector can infer the names of the services to inject by examining the
+function declaration and extracting the parameter names. In the above example, `$scope` and
 `greeter` are two services which need to be injected into the function.
 
 One advantage of this approach is that there's no array of names to keep in sync with the
@@ -293,7 +293,7 @@ Create a new injector that can provide components defined in our `myModule` modu
 `greeter` service from the injector. (This is usually done automatically by angular bootstrap).
 
 ```js
-var injector = angular.injector(['myModule', 'ng']);
+var injector = angular.injector(['ng', 'myModule']);
 var greeter = injector.get('greeter');
 ```
 

docs/content/guide/directive.ngdoc

@@ -51,7 +51,7 @@ In the following example, we say that the `<input>` element **matches** the `ngM
 The following also **matches** `ngModel`:
 
 ```html
-<input data-ng:model="foo">
+<input data-ng-model="foo">
 ```
 
 ### Normalization

docs/content/guide/expression.ngdoc

@@ -28,13 +28,13 @@ Angular expressions are like JavaScript expressions with the following differenc
 
   * **No Control Flow Statements:** You cannot use the following in an Angular expression:
     conditionals, loops, or exceptions.
-	
+
   * **No Function Declarations:** You cannot declare functions in an Angular expression,
     even inside `ng-init` directive.
-	
-  * **No RegExp Creation With Literal Notation:** You cannot create regular expressions 
+
+  * **No RegExp Creation With Literal Notation:** You cannot create regular expressions
     in an Angular expression.
-	
+
   * **No Comma And Void Operators:** You cannot use `,` or `void` in an Angular expression.
 
   * **Filters:** You can use {@link guide/filter filters} within expressions to format data before
@@ -70,7 +70,7 @@ You can try evaluating different expressions here:
       <ul>
        <li ng-repeat="expr in exprs track by $index">
          [ <a href="" ng-click="removeExp($index)">X</a> ]
-         <tt>{{expr}}</tt> => <span ng-bind="$parent.$eval(expr)"></span>
+         <code>{{expr}}</code> => <span ng-bind="$parent.$eval(expr)"></span>
         </li>
       </ul>
     </div>
@@ -175,7 +175,7 @@ expression, delegate to a JavaScript method instead.
 ## No function declarations or RegExp creation with literal notation
 
 You can't declare functions or create regular expressions from within AngularJS expressions. This is
-to avoid complex model transformation logic inside templates. Such logic is better placed in a 
+to avoid complex model transformation logic inside templates. Such logic is better placed in a
 controller or in a dedicated filter where it can be tested properly.
 
 ## `$event`
@@ -297,16 +297,20 @@ then the expression is not fulfilled and will remain watched.
   2. If V is not undefined, mark the result of the expression as stable and schedule a task
      to deregister the watch for this expression when we exit the digest loop
   3. Process the digest loop as normal
-  4. When digest loop is done and all the values have settled, process the queue of watch
-     deregistration tasks. For each watch to be deregistered, check if it still evaluates
-     to a value that is not `undefined`. If that's the case, deregister the watch. Otherwise,
+  4. When digest loop is done and all the values have settled process the queue of watch
+     deregistration tasks. For each watch to be deregistered check if it still evaluates
+     to value that is not `undefined`. If that's the case, deregister the watch. Otherwise
      keep dirty-checking the watch in the future digest loops by following the same
      algorithm starting from step 1
 
+#### Special case for object literals
+
+Unlike simple values, object-literals are watched until every key is defined.
+See http://www.bennadel.com/blog/2760-one-time-data-bindings-for-object-literal-expressions-in-angularjs-1-3.htm
 
 ### How to benefit from one-time binding
 
-If the expression will not change once set, it is a candidate for one-time binding. 
+If the expression will not change once set, it is a candidate for one-time binding.
 Here are three example cases.
 
 When interpolating text or attributes:
@@ -340,5 +344,4 @@ When using a directive that takes an expression:
 <ul>
   <li ng-repeat="item in ::items">{{item.name}};</li>
 </ul>
-```
-
+```

docs/content/guide/forms.ngdoc

@@ -3,8 +3,6 @@
 @sortOrder 290
 @description
 
-# Forms
-
 Controls (`input`, `select`, `textarea`) are ways for a user to enter data.
 A Form is a collection of controls for the purpose of grouping related controls together.
 
@@ -16,7 +14,7 @@ be circumvented and thus can not be trusted. Server-side validation is still nec
 secure application.
 
 
-## Simple form
+# Simple form
 The key directive in understanding two-way data-binding is {@link ng.directive:ngModel ngModel}.
 The `ngModel` directive provides the two-way data-binding by synchronizing the model to the view,
 as well as view to the model. In addition it provides an {@link ngModel.NgModelController API}
@@ -64,7 +62,7 @@ For example: inputs of type `email` must have a value in the form of `user@domai
 
 
 
-## Using CSS classes
+# Using CSS classes
 
 To allow styling of form as well as controls, `ngModel`  adds these CSS classes:
 
@@ -95,6 +93,8 @@ and failing to satisfy its validity.
         <input type="button" ng-click="reset()" value="Reset" />
         <input type="submit" ng-click="update(user)" value="Save" />
       </form>
+      <pre>form = {{user | json}}</pre>
+      <pre>master = {{master | json}}</pre>
     </div>
 
     <style type="text/css">
@@ -128,7 +128,7 @@ and failing to satisfy its validity.
 
 
 
-## Binding to form and control state
+# Binding to form and control state
 
 A form is an instance of {@link form.FormController FormController}.
 The form instance can optionally be published into the scope using the `name` attribute.
@@ -183,6 +183,8 @@ didn't interact with a control
         <input type="button" ng-click="reset(form)" value="Reset" />
         <input type="submit" ng-click="update(user)" value="Save" />
       </form>
+      <pre>form = {{user | json}}</pre>
+      <pre>master = {{master | json}}</pre>
     </div>
   </file>
 
@@ -210,7 +212,7 @@ didn't interact with a control
 
 
 
-## Custom model update triggers
+# Custom model update triggers
 
 By default, any change to the content will trigger a model update and form validation. You can
 override this behavior using the {@link ng.directive:ngModelOptions ngModelOptions} directive to
@@ -251,7 +253,7 @@ will update the model only when the control loses focus (blur event).
 
 
 
-## Non-immediate (debounced) model updates
+# Non-immediate (debounced) model updates
 
 You can delay the model update/validation by using the `debounce` key with the
 {@link ng.directive:ngModelOptions ngModelOptions} directive. This delay will also apply to
@@ -292,7 +294,7 @@ after last change.
   </file>
 </example>
 
-## Custom Validation
+# Custom Validation
 
 Angular provides basic implementation for most common HTML5 {@link ng.directive:input input}
 types: ({@link input[text] text}, {@link input[number] number}, {@link input[url] url},
@@ -409,7 +411,7 @@ In the following example we create two directives:
   </file>
 </example>
 
-## Modifying built-in validators
+# Modifying built-in validators
 
 Since Angular itself uses `$validators`, you can easily replace or remove built-in validators,
 should you find it necessary. The following example shows you how to overwrite the email validator
@@ -454,7 +456,7 @@ Note that you can alternatively use `ng-pattern` to further restrict the validat
 </example>
 
 
-## Implementing custom form controls (using `ngModel`)
+# Implementing custom form controls (using `ngModel`)
 Angular implements all of the basic HTML form controls ({@link ng.directive:input input},
 {@link ng.directive:select select}, {@link ng.directive:textarea textarea}),
 which should be sufficient for most cases. However, if you need more flexibility,

docs/content/guide/i18n.ngdoc

@@ -18,10 +18,8 @@ application means providing translations and localized formats for the abstracte
 Angular supports i18n/l10n for {@link ng.filter:date date}, {@link ng.filter:number number} and
 {@link ng.filter:currency currency} filters.
 
-Localizable pluralization is supported via the {@link ng.directive:ngPluralize `ngPluralize`
-directive}.  Additionally, you can use {@link guide/i18n#messageformat-extensions MessageFormat extensions} to
-`$interpolate` for localizable pluralization and gender support in all interpolations via the
-`ngMessageFormat` module.
+Additionally, Angular supports localizable pluralization support through the {@link
+ng.directive:ngPluralize `ngPluralize` directive}.
 
 All localizable Angular components depend on locale-specific rule sets managed by the {@link
 ng.$locale `$locale` service}.
@@ -139,242 +137,3 @@ The Angular datetime filter uses the time zone settings of the browser. The same
 application will show different time information depending on the time zone settings of the
 computer that the application is running on. Neither JavaScript nor Angular currently supports
 displaying the date with a timezone specified by the developer.
-
-
-<a name="MessageFormat"></a>
-## MessageFormat extensions
-
-You can write localizable plural and gender based messages in Angular interpolation expressions and
-`$interpolate` calls.
-
-This syntax extension is provided by way of the `ngMessageFormat` module that your application can
-depend upon (shipped separately as `angular-message-format.min.js` and `angular-message-format.js`.)
-A current limitation of the `ngMessageFormat` module, is that it does not support redefining the
-`$interpolate` start and end symbols. Only the default `{{` and `}}` are allowed.
-
-The syntax extension is based on a subset of the ICU MessageFormat syntax that covers plurals and
-gender selections.  Please refer to the links in the “Further Reading” section at the bottom of this
-section.
-
-You may find it helpful to play with our [Plnkr Example](http://plnkr.co/edit/QBVRQ70dvKZDWmHW9RyR?p=preview)
-as you read the examples below.
-
-### Plural Syntax
-
-The syntax for plural based message selection looks like the following:
-
-```text
-{{NUMERIC_EXPRESSION, plural,
-    =0 {MESSAGE_WHEN_VALUE_IS_0}
-    =1 {MESSAGE_WHEN_VALUE_IS_1}
-    =2 {MESSAGE_WHEN_VALUE_IS_2}
-    =3 {MESSAGE_WHEN_VALUE_IS_3}
-    ...
-    zero {MESSAGE_WHEN_PLURAL_CATEGORY_IS_ZERO}
-    one {MESSAGE_WHEN_PLURAL_CATEGORY_IS_ONE}
-    two {MESSAGE_WHEN_PLURAL_CATEGORY_IS_TWO}
-    few {MESSAGE_WHEN_PLURAL_CATEGORY_IS_FEW}
-    many {MESSAGE_WHEN_PLURAL_CATEGORY_IS_MANY}
-    other {MESSAGE_WHEN_THERE_IS_NO_MATCH}
-}}
-```
-
-Please note that whitespace (including newline) is generally insignificant except as part of the
-actual message text that occurs in curly braces.  Whitespace is generally used to aid readability.
-
-Here, `NUMERIC_EXPRESSION` is an expression that evaluates to a numeric value based on which the
-displayed message should change based on pluralization rules.
-
-Following the Angular expression, you would denote the plural extension syntax by the `, plural,`
-syntax element.  The spaces there are optional.
-
-This is followed by a list of selection keyword and corresponding message pairs.  The "other"
-keyword and corresponding message are **required** but you may have as few or as many of the other
-categories as you need.
-
-#### Selection Keywords
-
-The selection keywords can be either exact matches or language dependent [plural
-categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html).
-
-Exact matches are written as the equal sign followed by the exact value. `=0`, `=1`, `=2` and
-`=123` are all examples of exact matches.  Note that there should be no space between the equal sign
-and the numeric value.
-
-Plural category matches are single words corresponding to the [plural
-categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html) of
-the CLDR plural category spec.  These categories vary by locale.  The "en" (English) locale, for
-example, defines just "one" and "other" while the "ga" (Irish) locale defines "one", "two", "few",
-"many" and "other".  Typically, you would just write the categories for your language.  During
-translation, the translators will add or remove more categories depending on the target locale.
-
-Exact matches always win over keyword matches.  Therefore, if you define both `=0` and `zero`, when
-the value of the expression is zero, the `=0` message is the one that will be selected.  (The
-duplicate keyword categories are helpful when used with the optional `offset` syntax described
-later.)
-
-
-#### Messages
-
-Messages immediately follow a selection keyword and are optionally preceded by whitespace.  They are
-written in single curly braces (`{}`).  They may contain Angular interpolation syntax inside them.
-In addition, the `#` symbol is a placeholder for the actual numeric value of the expression.
-
-### Simple plural example
-
-```text
-{{numMessages, plural,
-      =0 {You have no new messages}
-      =1 {You have one new message}
-   other {You have # new messages}
-}}
-```
-
-Because these messages can themselves contain Angular expressions, you could also write this as
-follows:
-
-```text
-{{numMessages, plural,
-      =0 {You have no new messages}
-      =1 {You have one new message}
-   other {You have {{numMessages}} new messages}
-}}
-```
-
-
-### Plural syntax with optional `offset`
-
-The plural syntax supports an optional `offset` syntax that is used in matching.  It's simpler to
-explain this with an example.
-
-```text
-{{recipients.length, plural, offset:1
-    =0    {You gave no gifts}
-    =1    {You gave {{recipients[0].name}} a gift}
-    one   {You gave {{recipients[0].name}} and one other person a gift}
-    other {You gave {{recipients[0].name}} and # other people a gift}
-}}
-```
-
-When an `offset` is specified, the matching works as follows.  First, the exact value of the Angular
-expression is matched against the exact matches (i.e. `=N` selectors) to find a match.  If there is
-one, that message is used.  If there was no match, then the offset value is subtracted from the
-value of the expression and locale specific pluralization rules are applied to this new value to
-obtain its plural category (such as “one”, “few”, “many”, etc.) and a match is attempted against the
-keyword selectors and the matching message is used.  If there was no match, then the “other”
-category (required) is used.  The value of the `#` character inside a message is the value of
-original expression reduced by the offset value that was specified.
-
-### Escaping / Quoting
-
-You will need to escape curly braces or the `#` character inside message texts if you want them to
-be treated literally with no special meaning.  You may quote/escape any character in your message
-text by preceding it with a `\` (backslash) character.  The backslash character removes any special
-meaning to the character that immediately follows it.  Therefore, you can escape or quote the
-backslash itself by preceding it with another backslash character.
-
-
-### Gender (aka select) Syntax
-
-The gender support is provided by the more generic "select" syntax that is more akin to a switch
-statement.  It is general enough to support use for gender based messages.
-
-The syntax for gender based message selection looks like the following:
-
-```text
-{{EXPRESSION, select,
-    male {MESSAGE_WHEN_EXPRESSION_IS_MALE}
-    female {MESSAGE_WHEN_EXPRESSION_IS_FEMALE}
-    ...
-    other {MESSAGE_WHEN_THERE_IS_NO_GENDER_MATCH}
-}}
-```
-
-Please note that whitespace (including newline) is generally insignificant except as part of the
-actual message text that occurs in curly braces.  Whitespace is generally used to aid readability.
-
-Here, `EXPRESSION` is an Angular expression that evaluates to the gender of the person that
-is used to select the message that should be displayed.
-
-The Angular expression is followed by `, select,` where the spaces are optional.
-
-This is followed by a list of selection keyword and corresponding message pairs.  The "other"
-keyword and corresponding message are **required** but you may have as few or as many of the other
-gender values as you need (i.e. it isn't restricted to male/female.)  Note however, that the
-matching is **case-sensitive**.
-
-#### Selection Keywords
-
-Selection keywords are simple words like "male" and "female".  The keyword, "other", and it's
-corresponding message are required while others are optional.  It is used when the Angular
-expression does not match (case-insensitively) any of the other keywords specified.
-
-#### Messages
-
-Messages immediately follow a selection keyword and are optionally preceded by whitespace.  They are
-written in single curly braces (`{}`).  They may contain Angular interpolation syntax inside them.
-
-### Simple gender example
-
-```text
-{{friendGender, select,
-       male {Invite him}
-     female {Invite her}
-      other {Invite them}
-}}
-```
-
-### Nesting
-
-As mentioned in the syntax for plural and select, the embedded messages can contain Angular
-interpolation syntax.  Since you can use MessageFormat extensions in Angular interpolation, this
-allows you to nest plural and gender expressions in any order.
-
-Please note that if these are intended to reach a translator and be translated, it is recommended
-that the messages appear as a whole and not be split up.
-
-### More complex example that demonstrates nesting
-
-This is taken from the [plunker example](http://plnkr.co/edit/QBVRQ70dvKZDWmHW9RyR?p=preview) linked to earlier.
-
-```text
-{{recipients.length, plural, offset:1
-    =0 {You ({{sender.name}}) gave no gifts}
-    =1 { {{ recipients[0].gender, select,
-              male {You ({{sender.name}}) gave him ({{recipients[0].name}}) a gift.}
-              female {You ({{sender.name}}) gave her ({{recipients[0].name}}) a gift.}
-              other {You ({{sender.name}}) gave them ({{recipients[0].name}}) a gift.}
-          }}
-       }
-    one { {{ recipients[0].gender, select,
-              male {You ({{sender.name}}) gave him ({{recipients[0].name}}) and one other person a gift.}
-              female {You ({{sender.name}}) gave her ({{recipients[0].name}}) and one other person a gift.}
-              other {You ({{sender.name}}) gave them ({{recipients[0].name}}) and one other person a gift.}
-          }}
-       }
-    other {You ({{sender.name}}) gave {{recipients.length}} people gifts. }
-}}
-```
-
-### Differences from the ICU MessageFormat syntax
-
-This section is useful to you if you're already familiar with the ICU MessageFormat syntax.
-
-This syntax extension, while based on MessageFormat, has been designed to be backwards compatible
-with existing AngularJS interpolation expressions.  The key rule is simply this: **All
-interpolations are done inside double curlies.** The top level comma operator after an expression
-inside the double curlies causes MessageFormat extensions to be recognized.  Such a top level comma
-is otherwise illegal in an Angular expression and is used by MessageFormat to specify the function
-(such as plural/select) and it's related syntax.
-
-To understand the extension, take a look at the ICU MessageFormat syntax as specified by the ICU
-documentation.  Anywhere in that MessageFormat that you have regular message text and you want to
-substitute an expression, just put it in double curlies instead of single curlies that MessageFormat
-dictates.  This has a huge advantage.  **You are no longer limited to simple identifiers for
-substitutions**.  Because you are using double curlies, you can stick in any arbitrary interpolation
-syntax there, including nesting more MessageFormat expressions!
-
-### Further Reading
-For more details, please refer to our [design doc](https://docs.google.com/a/google.com/document/d/1pbtW2yvtmFBikfRrJd8VAsabiFkKezmYZ_PbgdjQOVU/edit).
-You can read more about the ICU MessageFormat syntax at
-[Formatting Messages | ICU User Guide](http://userguide.icu-project.org/formatparse/messages#TOC-MessageFormat).

docs/content/guide/index.ngdoc

@@ -53,7 +53,7 @@ In Angular applications, you move the job of filling page templates with data fr
 
 ## Specific Topics
 
-* **Login: **[Google example](https://developers.google.com/+/photohunt/python), [AngularJS Faceb0ok library](https://github.com/pc035860/angular-easyfb), [Facebook example](http://blog.brunoscopelliti.com/facebook-authentication-in-your-angularjs-web-app), [authentication strategy](http://blog.brunoscopelliti.com/deal-with-users-authentication-in-an-angularjs-web-app), [unix-style authorization](http://frederiknakstad.com/authentication-in-single-page-applications-with-angular-js/)
+* **Login: **[Google example](https://developers.google.com/+/photohunt/python), [AngularJS Facebook library](https://github.com/pc035860/angular-easyfb), [Facebook example](http://blog.brunoscopelliti.com/facebook-authentication-in-your-angularjs-web-app), [authentication strategy](http://blog.brunoscopelliti.com/deal-with-users-authentication-in-an-angularjs-web-app), [unix-style authorization](http://frederiknakstad.com/authentication-in-single-page-applications-with-angular-js/)
 * **Mobile:** [Angular on Mobile Guide](http://www.ng-newsletter.com/posts/angular-on-mobile.html), [PhoneGap](http://devgirl.org/2013/06/10/quick-start-guide-phonegap-and-angularjs/)
 * **Other Languages:** [CoffeeScript](http://www.coffeescriptlove.com/2013/08/angularjs-and-coffeescript-tutorials.html), [Dart](https://github.com/angular/angular.dart.tutorial/wiki)
 * **Realtime: **[Socket.io](http://www.creativebloq.com/javascript/angularjs-collaboration-board-socketio-2132885), [OmniBinder](https://github.com/jeffbcross/omnibinder)

docs/content/guide/migration.ngdoc

@@ -13,303 +13,6 @@ which drives many of these changes.
 * Several new features, especially animations, would not be possible without a few changes.
 * Finally, some outstanding bugs were best fixed by changing an existing API.
 
-# Migrating from 1.3 to 1.4
-
-Angular 1.4 fixes major animation issues and introduces a new API for `ngCookies`. Further, there
-are changes to `ngMessages`, `$compile`, `ngRepeat`, `ngOptions `and some fixes to core filters:
-`limitTo` and `filter`.
-
-The reason for the ngAnimate refactor was to fix timing issues and to expose new APIs to allow
-for developers to construct more versatile animations.  We now have access to `$animateCss`
-and the many timing-oriented bugs were fixed which results in smoother animations.
-If animation is something of interest, then please read over the breaking changes below for animations when
-`ngAnimate` is used.
-
-`ngMessages` has been upgraded to allow for dynamic message resolution. This handy feature allows for developers
-to render error messages with ngMessages that are listed with a directive such as ngRepeat. A great usecase for this
-involves pulling error message data from a server and then displaying that data via the mechanics of ngMessages. Be
-sure to read the breaking change involved with `ngMessagesInclude` to upgrade your template code.
-
-Other changes, such as the ordering of elements with ngRepeat and ngOptions, may also affect the behavior of your
-application. And be sure to also read up on the changes to `$cookies`. The migration jump from 1.3 to 1.4 should be
-relatively straightforward otherwise.
-
-
-
-
-## Animation (`ngAnimate`)
-
-Animations in 1.4 have been refactored internally, but the API has stayed much the same. There are, however,
-some breaking changes that need to be addressed when upgrading to 1.4.
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-JavaSript and CSS animations can no longer be run in
-parallel. With earlier versions of ngAnimate, both CSS and JS animations
-would be run together when multiple animations were detected. This
-feature has been removed, however, the same effect, with even more
-possibilities, can be achieved by injecting `$animateCss` into a
-JavaScript-defined animation and creating custom CSS-based animations
-from there.
-
-By using `$animateCss` inside of a JavaScript animation in Angular 1.4, we can trigger custom CSS-based animations
-directly from our JavaScript code.
-
-```js
-ngModule.animation('.slide-animation', ['$animateCss', function($animateCss) {
-  return {
-    enter: function(element, doneFn) {
-      // this will trigger a `.ng-enter` and `.ng-enter-active` CSS animation
-      var animation = $animateCss(element, {
-        event: 'enter'
-        // any other CSS-related properties
-        //   addClass: 'some-class',
-        //   removeClass: 'some-other-class',
-        //   from: {},
-        //   to: {}
-      });
-
-      // make sure to read the ngAnimate docs to understand how this works
-      animation.start().done(doneFn);
-    }
-  }
-}]);
-```
-
-{@link ngAnimate.$animateCss Click here to learn how to use $animateCss in your animation code}
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-animation-related callbacks are now fired on `$animate.on` instead of directly being on the element.
-
-```js
-// < 1.4
-element.on('$animate:before', function(e, data) {
-  if (data.event === 'enter') { ... }
-});
-element.off('$animate:before', fn);
-
-// 1.4+
-$animate.on(element, 'enter', function(data) {
-  //...
-});
-$animate.off(element, 'enter', fn);
-```
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-the function params for `$animate.enabled()` when an element is used are now flipped. This fix allows
-the function to act as a getter when a single element param is provided.
-
-```js
-// < 1.4
-$animate.enabled(false, element);
-
-// 1.4+
-$animate.enabled(element, false);
-```
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-in addition to disabling the children of the element, `$animate.enabled(element, false)` will now also
-disable animations on the element itself.
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-there is no need to call `$scope.$apply` or `$scope.$digest` inside of a animation promise callback anymore
-since the promise is resolved within a digest automatically. (Not to worry, any extra digests will not be
-run unless the promise is used.)
-
-```js
-// < 1.4
-$animate.enter(element).then(function() {
-  $scope.$apply(function() {
-    $scope.explode = true;
-  });
-});
-
-// 1.4+
-$animate.enter(element).then(function() {
-  $scope.explode = true;
-});
-```
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-when an enter, leave or move animation is triggered then it will always end any pending or active parent
-class based animations (animations triggered via ngClass) in order to ensure that any CSS styles are resolved in time.
-
-
-
-
-## Forms (`ngMessages`, `ngOptions`)
-
-### ngMessages
-The ngMessages module has also been subject to an internal refactor to allow it to be more flexible
-and compatible with dynamic message data. The `ngMessage` directive now supports a new attribute
-called `ng-message-exp` which will evaluate an expression and will keep track of that expression
-as it changes in order to re-evaluate the listed messages.
-
-[Click here to learn more about dynamic ng-messages](https://docs.angularjs.org/api/ngMessages#dynamic-messaging)
-
-There is only one breaking change. Please consider the following when including remote
-message templates via `ng-messages-include`:
-
-Due to [c9a4421f](https://github.com/angular/angular.js/commit/c9a4421fc3c97448527eadef1f42eb2f487ec2e0),
-the `ngMessagesInclude` attribute has now been removed and cannot be used in the same element containing
-the `ngMessages` directive. Instead, `ngMessagesInclude` is to be used on its own element inline with
-other inline messages situated as children within the `ngMessages` container directive.
-
-```html
-<!-- AngularJS 1.3.x -->
-<div ng-messages="model.$error" ng-messages-include="remote.html">
-  <div ng-message="required">Your message is required</div>
-</div>
-
-<!-- AngularJS 1.4.x -->
-<div ng-messages="model.$error">
-  <div ng-message="required">Your message is required</div>
-  <div ng-messages-include="remote.html"></div>
-</div>
-```
-
-Depending on where the `ngMessagesInclude` directive is placed it will be prioritized inline with the other messages
-before and after it.
-
-### ngOptions
-
-The `ngOptions` directive has also been refactored and as a result some long-standing bugs
-have been fixed. The breaking changes are comparatively minor and should not affect most applications.
-
-Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
-when `ngOptions` renders the option values within the DOM, the resulting HTML code is different.
-Normally this should not affect your application at all, however, if your code relies on inspecting
-the value property of `<option>` elements (that `ngOptions` generates) then be sure to [read the details]
-(https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef).
-
-Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
-when iterating over an object's properties using the `(key, value) in obj` syntax
-the order of the elements used to be sorted alphabetically. This was an artificial
-attempt to create a deterministic ordering since browsers don't guarantee the order.
-But in practice this is not what people want and so this change iterates over properties
-in the order they are returned by Object.keys(obj), which is almost always the order
-in which the properties were defined.
-
-
-## Templating (`ngRepeat`, `$compile`)
-
-### ngRepeat
-
-Due to [c260e738](https://github.com/angular/angular.js/commit/c260e7386391877625eda086480de73e8a0ba921),
-previously, the order of items when using ngRepeat to iterate over object properties was guaranteed to be consistent
-by sorting the keys into alphabetic order.
-
-Now, the order of the items is browser dependent based on the order returned
-from iterating over the object using the `for key in obj` syntax.
-
-It seems that browsers generally follow the strategy of providing
-keys in the order in which they were defined, although there are exceptions
-when keys are deleted and reinstated. See
-https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_issues
-
-The best approach is to convert Objects into Arrays by a filter such as
-https://github.com/petebacondarwin/angular-toArrayFilter
-or some other mechanism, and then sort them manually in the order you need.
-
-
-### $compile
-
-Due to [6a38dbfd](https://github.com/angular/angular.js/commit/6a38dbfd3c34c8f9efff503d17eb3cbeb666d422),
-previously, '&' expressions would always set up a function in the isolate scope. Now, if the binding
-is marked as optional and the attribute is not specified, no function will be added to the isolate scope.
-
-
-
-## Cookies (`ngCookies`)
-
-Due to [38fbe3ee](https://github.com/angular/angular.js/commit/38fbe3ee8370fc449b82d80df07b5c2ed2cd5fbe),
-`$cookies` will no longer expose properties that represent the current browser cookie
-values. `$cookies` no longer polls the browser for changes to the cookies and ***no longer copies
-cookie values onto the `$cookies` object***.
-
-This was changed because the polling is expensive and caused issues with the `$cookies` properties
-not synchronizing correctly with the actual browser cookie values (The reason the polling
-was originally added was to allow communication between different tabs,
-but there are better ways to do this today, for example `localStorage`.)
-
-The new API on `$cookies` is as follows:
-
- * `get`
- * `put`
- * `getObject`
- * `putObject`
- * `getAll`
- * `remove`
-
-You must explictly use the methods above in order to access cookie data. This also means that
-you can no longer watch the properties on `$cookies` to detect changes
-that occur on the browsers cookies.
-
-This feature is generally only needed if a 3rd party library was programmatically
-changing the cookies at runtime. If you rely on this then you must either write code that
-can react to the 3rd party library making the changes to cookies or implement your own polling
-mechanism.
-
-**DEPRECATION NOTICE**
-
-`$cookieStore` is now deprecated as all the useful logic
-has been moved to `$cookies`, to which `$cookieStore` now simply
-delegates calls.
-
-
-
-
-## Server Requests (`$http`)
-
-Due to [5da1256](https://github.com/angular/angular.js/commit/5da1256fc2812d5b28fb0af0de81256054856369),
-`transformRequest` functions can no longer modify request headers.
-
-Before this commit `transformRequest` could modify request headers, ex.:
-
-```javascript
-function requestTransform(data, headers) {
-    headers = angular.extend(headers(), {
-      'X-MY_HEADER': 'abcd'
-    });
-  }
-  return angular.toJson(data);
-}
-```
-
-This behavior was unintended and undocumented, so the change should affect very few applications. If one
-needs to dynamically add / remove headers it should be done in a header function, for example:
-
-```javascript
-$http.get(url, {
-  headers: {
-    'X-MY_HEADER': function(config) {
-      return 'abcd'; //you've got access to a request config object to specify header value dynamically
-    }
-  }
-})
-```
-
-
-
-
-## Filters (`filter`, `limitTo`)
-
-### `filter` filter
-Due to [cea8e751](https://github.com/angular/angular.js/commit/cea8e75144e6910b806b63a6ec2a6d118316fddd),
-the `filter` filter will throw an error when used with a non-array. Beforehand it would silently
-return an empty array.
-
-If necessary, this can be worked around by converting an object to an array,
-using a filter such as https://github.com/petebacondarwin/angular-toArrayFilter.
-
-### `limitTo` filter
-Due to [a3c3bf33](https://github.com/angular/angular.js/commit/a3c3bf3332e5685dc319c46faef882cb6ac246e1),
-the limitTo filter has changed behavior when the provided limit value is invalid.
-Now, instead of returning empty object/array, it returns unchanged input.
-
-
-
-
-
 # Migrating from 1.2 to 1.3
 
 ## Controllers

docs/content/guide/module.ngdoc

@@ -76,7 +76,7 @@ that you break your application to multiple modules like this:
     initialization code.
 
 We've also
-[written a document](http://blog.angularjs.org/2014/02/an-angularjs-style-guide-and-best.html)
+[written a document](http://angularjs.blogspot.com/2014/02/an-angularjs-style-guide-and-best.html)
 on how we organize large apps at Google.
 
 The above is a suggestion. Tailor it to your needs.
@@ -197,14 +197,14 @@ Then Angular applies configuration blocks in the same order they were registered
 ## Run Blocks
 
 Run blocks are the closest thing in Angular to the main method. A run block is the code which
-needs to run to kickstart the application. It is executed after all of the services have been
+needs to run to kickstart the application. It is executed after all of the service have been
 configured and the injector has been created. Run blocks typically contain code which is hard
 to unit-test, and for this reason should be declared in isolated modules, so that they can be
 ignored in the unit-tests.
 
 ## Dependencies
 
-Modules can list other modules as their dependencies. Depending on a module implies that the required
+Modules can list other modules as their dependencies. Depending on a module implies that required
 module needs to be loaded before the requiring module is loaded. In other words the configuration
 blocks of the required modules execute before the configuration blocks of the requiring module.
 The same is true for the run blocks. Each module can only be loaded once, even if multiple other

docs/content/guide/scope.ngdoc

@@ -5,7 +5,7 @@
 
 # What are Scopes?
 
-{@link ng.$rootScope.Scope scope} is an object that refers to the application
+{@link ng.$rootScope.Scope Scope} is an object that refers to the application
 model. It is an execution context for {@link expression expressions}. Scopes are
 arranged in hierarchical structure which mimic the DOM structure of the application. Scopes can
 watch {@link guide/expression expressions} and propagate events.

docs/content/guide/services.ngdoc

@@ -82,7 +82,7 @@ on the service.
 ### Registering Services
 
 Services are registered to modules via the {@link angular.Module Module API}.
-Typically you use the {@link angular.Module#factory Module factory} API to register a service:
+Typically you use the {@link angular.module Module#factory} API to register a service:
 
 ```js
 var myModule = angular.module('myModule', []);
@@ -181,7 +181,7 @@ of a real browser alert.
 
 ```js
 var mock, notify;
-beforeEach(module('myServiceModule'));
+
 beforeEach(function() {
   mock = {alert: jasmine.createSpy()};
 

docs/content/misc/faq.ngdoc

@@ -20,42 +20,6 @@ AngularJS is 100% JavaScript, 100% client-side and compatible with both desktop
 So it's definitely not a plugin or some other native browser extension.
 
 
-### What is the AngularJS versioning strategy?
-
-In Angular 1 we do not allow intentional breaking changes to appear in versions where only the "patch"
-number changes. For example between 1.3.12 and 1.3.13 there can be no breaking changes. We do allow
-breaking changes happen between "minor" number changes. For example between 1.3.15 and 1.4.0 there
-will be a number of breaking changes. We also allow breaking changes between beta releases of Angular.
-For example between 1.4.0-beta.4 and 1.4.0-beta.5 there may be breaking changes. We try hard to minimize
-these kinds of change only to those where there is a strong use case such as a strongly requested feature
-improvement, a considerable simplification of the code or a measurable performance improvement.
-
-When adding new code to branches of Angular, have a very stringent commit policy:
-
-- Every commit must contain tests and documentation updates alongside the code changes and that all the
-tests must pass;
-- Commit messages must be written in a specific manner that allows us to parse them and extract the changes
-for release notes.
-
-The Angular code base has a very large set of unit tests (over 4000) and end to end tests, which are pretty
-comprehensive. This means that a breaking change will require one or more tests to be changed to allow the
-tests to pass. So when a commit includes tests that are being removed or modified, this is a flag that the
-code might include a breaking change. When reviewing the commit we can then decide whether there really is
-a breaking change and if it is appropriate for the branch to which it is being merged. If so, then we
-require that the commit message contains an appropriate breaking change message.
-
-Additionally, when a commit lands in our master repository it is synced to Google where we test it against
-over 2000 applications using the test suites of these applications. This allows us to catch regressions
-quickly before a release. We've had a pretty good experience with this setup. Only bugs that affect features
-not used at Google or without sufficient test coverage, have a chance of making it through.
-
-Lastly, when we are making a release we generate updates to the changelog directly from the commits. This
-generated update contains a highlighted section that contains all the breaking changes that have been
-extracted from the commits. We can quickly see in the new changelog exactly what commits contain breaking
-changes and so can application developers when they are deciding whether to update to a new version of
-Angular.
-
-
 ### Is AngularJS a templating system?
 
 At the highest level, Angular does look like just another templating system. But there is one
@@ -69,7 +33,7 @@ templating systems.
 ### Do I need to worry about security holes in AngularJS?
 
 Like any other technology, AngularJS is not impervious to attack. Angular does, however, provide
-built-in protection from basic security holes, including cross-site scripting and HTML injection
+built-in protection from basic security holes including cross-site scripting and HTML injection
 attacks. AngularJS does round-trip escaping on all strings for you and even offers XSRF protection
 for server-side communication.
 
@@ -88,7 +52,7 @@ Yes. See instructions in {@link downloading}.
 
 We run our extensive test suite against the following browsers: Safari, Chrome, Firefox, Opera 15,
 IE9 and mobile browsers (Android, Chrome Mobile, iOS Safari). See {@link guide/ie Internet
-Explorer Compatibility} for more details on supporting legacy IE browsers.
+Explorer Compatibility} for more details in supporting legacy IE browsers.
 
 
 ### What's Angular's performance like?
@@ -97,8 +61,8 @@ The startup time heavily depends on your network connection, state of the cache,
 available hardware, but typically we measure bootstrap time in tens or hundreds of milliseconds.
 
 The runtime performance will vary depending on the number and complexity of bindings on the page
-as well as the speed of your backend (for apps that fetch data from the backend). For an
-illustration, we typically build snappy apps with hundreds or thousands of active bindings.
+as well as the speed of your backend (for apps that fetch data from the backend). Just for an
+illustration we typically build snappy apps with hundreds or thousands of active bindings.
 
 
 ### How big is the angular.js file that I need to include?
@@ -124,7 +88,7 @@ but we don't guarantee that.
 
 ### What is testability like in Angular?
 
-Very testable and designed this way from the ground up. It has an integrated dependency injection
+Very testable and designed this way from ground up. It has an integrated dependency injection
 framework, provides mocks for many heavy dependencies (server-side communication). See
 {@link ngMock} for details.
 
@@ -225,7 +189,7 @@ Then whenever a value on a scope changes, all `$watch`es observing that element
 
 Sometimes, usually when you're writing a custom directive, you will have to define your own `$watch` on a scope value to make the directive react to changes.
 
-On the flip side, sometimes you change a scope value in some code, but the app doesn't react to it.
+On the flip side, sometimes you change a scope value in some code but the app doesn't react to it.
 Angular checks for scope variable changes after pieces of your code have finished running; for example, when `ng-click` calls a function on your scope, Angular will check for changes and react.
 However, some code is outside of Angular and you'll have to call `scope.$apply()` yourself to trigger the update.
 This is most commonly seen in event handlers in custom directives.

docs/content/tutorial/step_07.ngdoc

@@ -11,7 +11,7 @@ multiple views by adding routing, using an Angular module called 'ngRoute'.
 
 * When you now navigate to `app/index.html`, you are redirected to `app/index.html/#/phones`
   and the phone list appears in the browser.
-* When you click on a phone link, the url changes to that specific phone and the stub of a
+* When you click on a phone link the url changes to one specific to that phone and the stub of a
   phone detail page is displayed.
 
 <div doc-tutorial-reset="7"></div>
@@ -313,7 +313,7 @@ to various URLs and verify that the correct view was rendered.
    it('should redirect index.html to index.html#/phones', function() {
     browser.get('app/index.html');
     browser.getLocationAbsUrl().then(function(url) {
-        expect(url.split('#')[1]).toBe('/phones');
+        expect(url).toEqual('/phones');
       });
   });
 

docs/content/tutorial/step_12.ngdoc

@@ -225,7 +225,7 @@ inserted into and removed from the list:
   * The `ng-leave` class is applied when they're removed from the list.
 
 The phone listing items are added and removed depending on the data passed to the `ng-repeat` attribute.
-For example, if the filter data changes, the items will be animated in and out of the repeat list.
+For example, if the filter data changes the items will be animated in and out of the repeat list.
 
 Something important to note is that when an animation occurs, two sets of CSS classes
 are added to the element:
@@ -233,7 +233,7 @@ are added to the element:
   1. a "starting" class that represents the style at the beginning of the animation
   2. an "active" class that represents the style at the end of the animation
 
-The name of the starting class is the name of the event that is fired (like `enter`, `move` or `leave`) prefixed with
+The name of the starting class is the name of event that is fired (like `enter`, `move` or `leave`) prefixed with
 `ng-`. So an `enter` event will result in a class called `ng-enter`.
 
 The active class name is the same as the starting class's but with an `-active` suffix.

gdocs.js

@@ -173,7 +173,7 @@ function request(method, url, options, response) {
         res.on('error', function (e) { console.log(e); });
         break;
       case 401:
-        console.log('Eror: Login credentials expired! Please login.');
+        console.log('Error: Login credentials expired! Please login.');
         break;
       default:
         data = [];

i18n/spec/closureI18nExtractorSpec.js

@@ -184,8 +184,6 @@ describe("extractDateTimeSymbols", function() {
                       'nov.', 'déc.'],
                   DAY: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
                   SHORTDAY: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
-                  FIRSTDAYOFWEEK: 6,
-                  WEEKENDRANGE: [5, 6],
                   AMPMS: ['AM', 'PM'],
                   ERAS: ['av. J.-C.', 'ap. J.-C.'],
                   ERANAMES: ['avant Jésus-Christ', 'après Jésus-Christ'],

i18n/src/converter.js

@@ -42,8 +42,6 @@ function convertDatetimeData(dataObj) {
   datetimeFormats.DAY = dataObj.WEEKDAYS;
   datetimeFormats.SHORTDAY = dataObj.SHORTWEEKDAYS;
   datetimeFormats.AMPMS = dataObj.AMPMS;
-  datetimeFormats.FIRSTDAYOFWEEK = dataObj.FIRSTDAYOFWEEK;
-  datetimeFormats.WEEKENDRANGE = dataObj.WEEKENDRANGE;
   datetimeFormats.ERAS = dataObj.ERAS;
   datetimeFormats.ERANAMES = dataObj.ERANAMES;
 

lib/browserstack/teardown_tunnel.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+
+echo "Shutting down Browserstack tunnel"
+echo "TODO: implement me"
+exit 1

lib/grunt/utils.js

@@ -116,7 +116,7 @@ module.exports = {
         .replace(/\\/g, '\\\\')
         .replace(/'/g, "\\'")
         .replace(/\r?\n/g, '\\n');
-      js = "!window.angular.$$csp() && window.angular.element(document).find('head').prepend('<style type=\"text/css\">" + css + "</style>');";
+      js = "!window.angular.$$csp() && window.angular.element(document.head).prepend('<style type=\"text/css\">" + css + "</style>');";
       state.js.push(js);
 
       return state;
@@ -185,16 +185,14 @@ module.exports = {
     var mapFileName = mapFile.match(/[^\/]+$/)[0];
     var errorFileName = file.replace(/\.js$/, '-errors.json');
     var versionNumber = grunt.config('NG_VERSION').full;
-    var compilationLevel = (file === 'build/angular-message-format.js') ?
-        'ADVANCED_OPTIMIZATIONS' : 'SIMPLE_OPTIMIZATIONS';
     shell.exec(
         'java ' +
             this.java32flags() + ' ' +
-            this.memoryRequirement() + ' ' +
+            '-Xmx2g ' +
             '-cp bower_components/closure-compiler/compiler.jar' + classPathSep +
             'bower_components/ng-closure-runner/ngcompiler.jar ' +
             'org.angularjs.closurerunner.NgClosureRunner ' +
-            '--compilation_level ' + compilationLevel + ' ' +
+            '--compilation_level SIMPLE_OPTIMIZATIONS ' +
             '--language_in ECMASCRIPT5_STRICT ' +
             '--minerr_pass ' +
             '--minerr_errors ' + errorFileName + ' ' +
@@ -217,10 +215,6 @@ module.exports = {
     }.bind(this));
   },
 
-  memoryRequirement: function() {
-    return (process.platform === 'win32') ? '' : '-Xmx2g';
-  },
-
 
   //returns the 32-bit mode force flags for java compiler if supported, this makes the build much faster
   java32flags: function(){

lib/grunt/validate-angular-files.js

@@ -0,0 +1,58 @@
+'use strict';
+
+var path = require('path');
+var fs = require('fs');
+var glob = require("glob");
+var _ = require('lodash');
+var files = require('../../angularFiles').files;
+
+module.exports = function(grunt) {
+
+  grunt.registerTask('validate-angular-files', function() {
+    var combinedFiles = _.clone(files.angularModules);
+    combinedFiles.ng = files.angularSrc;
+    combinedFiles.angularLoader = files.angularLoader;
+
+    var errorsDetected = false;
+    var directories = [];
+    var detectedFiles = {};
+
+    for (var section in combinedFiles) {
+      var sectionFiles = combinedFiles[section];
+
+      if (section != 'angularLoader') {
+        directories.push('src/' + section);
+      }
+
+      grunt.log.debug('Validating ' + sectionFiles.length + ' files from the "' + section + '" module.');
+
+      sectionFiles.forEach(function(file) {
+        detectedFiles[file] = true;
+
+        if (!fs.existsSync(file)) {
+          grunt.log.error(file + ' does not exist in the local file structure.');
+          errorsDetected = true;
+        }
+      });
+    }
+
+    directories.forEach(function(directory) {
+      glob.sync(directory + '/**/*').forEach(function(filePath) {
+        if (!fs.lstatSync(filePath).isDirectory()) {
+          var fileName = path.basename(filePath);
+          var isHiddenFile = fileName[0] == '.';
+          if (!isHiddenFile && !detectedFiles[filePath]) {
+            grunt.log.error(filePath + ' exists in the local file structure but isn\'t used by any module.');
+            errorsDetected = true;
+          }
+        }
+      });
+    });
+
+    if (errorsDetected) {
+      throw new Error('Not all files were properly detected in the local file structure.');
+    } else {
+      grunt.log.ok('All files were detected successfully!');
+    }
+  });
+};

lib/saucelabs/teardown_tunnel.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+
+echo "Shutting down Sauce Connect tunnel"
+
+killall sc
+
+while [[ -n `ps -ef | grep "sauce-connect-" | grep -v "grep"` ]]; do
+  printf "."
+  sleep .5
+done
+
+echo ""
+echo "Sauce Connect tunnel has been shut down"

lib/versions/version-info.js

@@ -16,9 +16,9 @@ var currentPackage, previousVersions, cdnVersion, gitRepoInfo;
 var getPackage = function() {
   // Search up the folder hierarchy for the first package.json
   var packageFolder = path.resolve('.');
-  while (!fs.existsSync(path.join(packageFolder, 'package.json'))) {
+  while ( !fs.existsSync(path.join(packageFolder, 'package.json')) ) {
     var parent = path.dirname(packageFolder);
-    if (parent === packageFolder) { break; }
+    if ( parent === packageFolder) { break; }
     packageFolder = parent;
   }
   return JSON.parse(fs.readFileSync(path.join(packageFolder,'package.json'), 'UTF-8'));
@@ -48,11 +48,11 @@ var getGitRepoInfo = function() {
  * @return {String}         The codename if found, otherwise null/undefined
  */
 var getCodeName = function(tagName) {
-  var gitCatOutput = shell.exec('git cat-file -p ' + tagName, {silent:true}).output;
+  var gitCatOutput = shell.exec('git cat-file -p '+ tagName, {silent:true}).output;
   var tagMessage = gitCatOutput.match(/^.*codename.*$/mg)[0];
   var codeName = tagMessage && tagMessage.match(/codename\((.*)\)/)[1];
   if (!codeName) {
-    throw new Error("Could not extract release code name. The message of tag " + tagName +
+    throw new Error("Could not extract release code name. The message of tag "+tagName+
       " must match '*codename(some release name)*'");
   }
   return codeName;
@@ -65,7 +65,7 @@ var getCodeName = function(tagName) {
  */
 function getBuild() {
   var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).output.replace('\n', '');
-  return 'sha.' + hash;
+  return 'sha.'+hash;
 }
 
 
@@ -76,14 +76,14 @@ function getBuild() {
 var getTaggedVersion = function() {
   var gitTagResult = shell.exec('git describe --exact-match', {silent:true});
 
-  if (gitTagResult.code === 0) {
+  if ( gitTagResult.code === 0 ) {
     var tag = gitTagResult.output.trim();
     var version = semver.parse(tag);
 
-    if (version && semver.satisfies(version, currentPackage.branchVersion)) {
+    if ( version && semver.satisfies(version, currentPackage.branchVersion)) {
       version.codeName = getCodeName(tag);
       version.full = version.version;
-      version.branch = 'v' + currentPackage.branchPattern.replace('*', 'x');
+      version.branch = 'v' + currentPackage.branchVersion.replace('*', 'x');
       return version;
     }
   }
@@ -102,7 +102,7 @@ var getPreviousVersions =  function() {
   var repo_url = currentPackage.repository.url;
   var tagResults = shell.exec('git ls-remote --tags ' + repo_url,
                               {silent: true});
-  if (tagResults.code === 0) {
+  if ( tagResults.code === 0 ) {
     return _(tagResults.output.match(/v[0-9].*[0-9]$/mg))
       .map(function(tag) {
         var version = semver.parse(tag);
@@ -110,16 +110,10 @@ var getPreviousVersions =  function() {
       })
       .filter()
       .map(function(version) {
-        // angular.js didn't follow semantic version until 1.20rc1
-        if ((version.major === 1 && version.minor === 0 && version.prerelease.length > 0) || (version.major === 1 && version.minor === 2 && version.prerelease[0] === 'rc1')) {
-          version.version = [version.major, version.minor, version.patch].join('.') + version.prerelease.join('');
-          version.raw = 'v' + version.version;
-        }
         version.docsUrl = 'http://code.angularjs.org/' + version.version + '/docs';
         // Versions before 1.0.2 had a different docs folder name
-        if (version.major < 1 || (version.major === 1 && version.minor === 0 && version.patch < 2)) {
+        if ( version.major < 1 || (version.major === 1 && version.minor === 0 && version.dot < 2 ) ) {
           version.docsUrl += '-' + version.version;
-          version.isOldDocsUrl = true;
         }
         return version;
       })
@@ -140,10 +134,10 @@ var getCdnVersion = function() {
       if (!cdnVersion) {
         // Note: need to use shell.exec and curl here
         // as version-infos returns its result synchronously...
-        var cdnResult = shell.exec('curl http://ajax.googleapis.com/ajax/libs/angularjs/' + version + '/angular.min.js ' +
+        var cdnResult = shell.exec('curl http://ajax.googleapis.com/ajax/libs/angularjs/'+version+'/angular.min.js '+
                   '--head --write-out "%{http_code}" -o /dev/null -silent',
                                     {silent: true});
-        if (cdnResult.code === 0) {
+        if ( cdnResult.code === 0 ) {
           var statusCode = cdnResult.output.trim();
           if (statusCode === '200') {
             cdnVersion = version;
@@ -165,9 +159,9 @@ var getSnapshotVersion = function() {
     })
     .last();
 
-  if (!version) {
+  if ( !version ) {
     // a snapshot version before the first tag on the branch
-    version = semver(currentPackage.branchPattern.replace('*','0-beta.1'));
+    version = semver(currentPackage.branchVersion.replace('*','0-beta.1'));
   }
 
   // We need to clone to ensure that we are not modifying another version

npm-shrinkwrap.clean.json

@@ -207,7 +207,7 @@
           "dependencies": {
             "traceur": {
               "version": "0.0.33",
-              "resolved": "git://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
+              "resolved": "git+https://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
               "dependencies": {
                 "commander": {
                   "version": "2.7.1",
@@ -2385,10 +2385,10 @@
       }
     },
     "dgeni-packages": {
-      "version": "0.10.13",
+      "version": "0.10.17",
       "dependencies": {
         "catharsis": {
-          "version": "0.8.6",
+          "version": "0.8.7",
           "dependencies": {
             "underscore-contrib": {
               "version": "0.3.0",
@@ -2404,10 +2404,10 @@
           "version": "2.3.0",
           "dependencies": {
             "camel-case": {
-              "version": "1.1.1"
+              "version": "1.1.2"
             },
             "constant-case": {
-              "version": "1.1.0"
+              "version": "1.1.1"
             },
             "dot-case": {
               "version": "1.1.1"
@@ -2428,7 +2428,7 @@
               "version": "1.1.1"
             },
             "pascal-case": {
-              "version": "1.1.0"
+              "version": "1.1.1"
             },
             "path-case": {
               "version": "1.1.1"
@@ -2440,10 +2440,10 @@
               "version": "1.1.1"
             },
             "swap-case": {
-              "version": "1.1.0"
+              "version": "1.1.1"
             },
             "title-case": {
-              "version": "1.1.0"
+              "version": "1.1.1"
             },
             "upper-case": {
               "version": "1.1.2"
@@ -2468,7 +2468,7 @@
           }
         },
         "htmlparser2": {
-          "version": "3.8.2",
+          "version": "3.8.3",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0"
@@ -2518,21 +2518,21 @@
           "version": "0.3.0",
           "dependencies": {
             "lru-cache": {
-              "version": "2.5.0"
+              "version": "2.6.4"
             },
             "sigmund": {
-              "version": "1.0.0"
+              "version": "1.0.1"
             }
           }
         },
         "nunjucks": {
-          "version": "1.2.0",
+          "version": "1.3.4",
           "dependencies": {
             "optimist": {
               "version": "0.6.1",
               "dependencies": {
                 "wordwrap": {
-                  "version": "0.0.2"
+                  "version": "0.0.3"
                 },
                 "minimist": {
                   "version": "0.0.10"
@@ -2552,10 +2552,10 @@
                       "version": "0.2.14",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0"
+                          "version": "2.6.4"
                         },
                         "sigmund": {
-                          "version": "1.0.0"
+                          "version": "1.0.1"
                         }
                       }
                     },
@@ -2580,14 +2580,6 @@
                 },
                 "async-each": {
                   "version": "0.1.6"
-                },
-                "fsevents": {
-                  "version": "0.3.5",
-                  "dependencies": {
-                    "nan": {
-                      "version": "1.5.3"
-                    }
-                  }
                 }
               }
             }
@@ -2621,6 +2613,12 @@
             }
           }
         },
+        "semver": {
+          "version": "4.3.6"
+        },
+        "shelljs": {
+          "version": "0.5.1"
+        },
         "winston": {
           "version": "0.7.3",
           "dependencies": {
@@ -2734,6 +2732,49 @@
         }
       }
     },
+    "glob": {
+      "version": "6.0.1",
+      "dependencies": {
+        "inflight": {
+          "version": "1.0.4",
+          "dependencies": {
+            "wrappy": {
+              "version": "1.0.1"
+            }
+          }
+        },
+        "inherits": {
+          "version": "2.0.1"
+        },
+        "minimatch": {
+          "version": "3.0.0",
+          "dependencies": {
+            "brace-expansion": {
+              "version": "1.1.2",
+              "dependencies": {
+                "balanced-match": {
+                  "version": "0.3.0"
+                },
+                "concat-map": {
+                  "version": "0.0.1"
+                }
+              }
+            }
+          }
+        },
+        "once": {
+          "version": "1.3.3",
+          "dependencies": {
+            "wrappy": {
+              "version": "1.0.1"
+            }
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.0"
+        }
+      }
+    },
     "grunt": {
       "version": "0.4.5",
       "dependencies": {
@@ -5464,14 +5505,6 @@
             },
             "async-each": {
               "version": "0.1.6"
-            },
-            "fsevents": {
-              "version": "0.3.5",
-              "dependencies": {
-                "nan": {
-                  "version": "1.5.3"
-                }
-              }
             }
           }
         },
@@ -6499,32 +6532,45 @@
       }
     },
     "protractor": {
-      "version": "2.1.0",
+      "version": "2.5.1",
       "dependencies": {
         "request": {
-          "version": "2.36.0",
+          "version": "2.57.0",
           "dependencies": {
-            "qs": {
-              "version": "0.6.6"
+            "bl": {
+              "version": "0.9.4",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2"
+                    },
+                    "isarray": {
+                      "version": "0.0.1"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31"
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                }
+              }
             },
-            "json-stringify-safe": {
-              "version": "5.0.1"
-            },
-            "mime": {
-              "version": "1.2.11"
+            "caseless": {
+              "version": "0.10.0"
             },
             "forever-agent": {
-              "version": "0.5.2"
-            },
-            "node-uuid": {
-              "version": "1.4.3"
-            },
-            "tough-cookie": {
-              "version": "1.1.0"
+              "version": "0.6.1"
             },
             "form-data": {
-              "version": "0.1.4",
+              "version": "0.2.0",
               "dependencies": {
+                "async": {
+                  "version": "0.9.2"
+                },
                 "combined-stream": {
                   "version": "0.0.7",
                   "dependencies": {
@@ -6532,17 +6578,34 @@
                       "version": "0.0.5"
                     }
                   }
-                },
-                "async": {
-                  "version": "0.9.2"
                 }
               }
             },
+            "json-stringify-safe": {
+              "version": "5.0.1"
+            },
+            "mime-types": {
+              "version": "2.0.14",
+              "dependencies": {
+                "mime-db": {
+                  "version": "1.12.0"
+                }
+              }
+            },
+            "node-uuid": {
+              "version": "1.4.7"
+            },
+            "qs": {
+              "version": "3.1.0"
+            },
             "tunnel-agent": {
-              "version": "0.4.0"
+              "version": "0.4.2"
+            },
+            "tough-cookie": {
+              "version": "2.2.1"
             },
             "http-signature": {
-              "version": "0.10.1",
+              "version": "0.11.0",
               "dependencies": {
                 "assert-plus": {
                   "version": "0.1.5"
@@ -6556,38 +6619,120 @@
               }
             },
             "oauth-sign": {
-              "version": "0.3.0"
+              "version": "0.8.0"
             },
             "hawk": {
-              "version": "1.0.0",
+              "version": "2.3.1",
               "dependencies": {
                 "hoek": {
-                  "version": "0.9.1"
+                  "version": "2.16.3"
                 },
                 "boom": {
-                  "version": "0.4.2"
+                  "version": "2.10.1"
                 },
                 "cryptiles": {
-                  "version": "0.2.2"
+                  "version": "2.0.5"
                 },
                 "sntp": {
-                  "version": "0.2.4"
+                  "version": "1.0.9"
                 }
               }
             },
             "aws-sign2": {
               "version": "0.5.0"
+            },
+            "stringstream": {
+              "version": "0.0.5"
+            },
+            "combined-stream": {
+              "version": "1.0.5",
+              "dependencies": {
+                "delayed-stream": {
+                  "version": "1.0.0"
+                }
+              }
+            },
+            "isstream": {
+              "version": "0.1.2"
+            },
+            "har-validator": {
+              "version": "1.8.0",
+              "dependencies": {
+                "bluebird": {
+                  "version": "2.10.2"
+                },
+                "chalk": {
+                  "version": "1.1.1",
+                  "dependencies": {
+                    "ansi-styles": {
+                      "version": "2.1.0"
+                    },
+                    "escape-string-regexp": {
+                      "version": "1.0.3"
+                    },
+                    "has-ansi": {
+                      "version": "2.0.0",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0"
+                        }
+                      }
+                    },
+                    "strip-ansi": {
+                      "version": "3.0.0",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0"
+                        }
+                      }
+                    },
+                    "supports-color": {
+                      "version": "2.0.0"
+                    }
+                  }
+                },
+                "commander": {
+                  "version": "2.9.0",
+                  "dependencies": {
+                    "graceful-readlink": {
+                      "version": "1.0.1"
+                    }
+                  }
+                },
+                "is-my-json-valid": {
+                  "version": "2.12.3",
+                  "dependencies": {
+                    "generate-function": {
+                      "version": "2.0.0"
+                    },
+                    "generate-object-property": {
+                      "version": "1.2.0",
+                      "dependencies": {
+                        "is-property": {
+                          "version": "1.0.2"
+                        }
+                      }
+                    },
+                    "jsonpointer": {
+                      "version": "2.0.0"
+                    },
+                    "xtend": {
+                      "version": "4.0.1"
+                    }
+                  }
+                }
+              }
             }
           }
         },
         "selenium-webdriver": {
-          "version": "2.45.1",
+          "version": "2.47.0",
           "dependencies": {
             "rimraf": {
-              "version": "2.3.4",
+              "version": "2.4.4",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.3",
+                  "version": "5.0.15",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
@@ -6601,13 +6746,13 @@
                       "version": "2.0.1"
                     },
                     "minimatch": {
-                      "version": "2.0.8",
+                      "version": "3.0.0",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.0",
+                          "version": "1.1.2",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.0"
+                              "version": "0.3.0"
                             },
                             "concat-map": {
                               "version": "0.0.1"
@@ -6617,12 +6762,15 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.2",
+                      "version": "1.3.3",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1"
                         }
                       }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0"
                     }
                   }
                 }
@@ -6632,33 +6780,33 @@
               "version": "0.0.24"
             },
             "ws": {
-              "version": "0.7.2",
+              "version": "0.8.1",
               "dependencies": {
                 "options": {
                   "version": "0.0.6"
                 },
                 "ultron": {
-                  "version": "1.0.1"
+                  "version": "1.0.2"
                 },
                 "bufferutil": {
-                  "version": "1.1.0",
+                  "version": "1.2.1",
                   "dependencies": {
                     "bindings": {
                       "version": "1.2.1"
                     },
                     "nan": {
-                      "version": "1.8.4"
+                      "version": "2.1.0"
                     }
                   }
                 },
                 "utf-8-validate": {
-                  "version": "1.1.0",
+                  "version": "1.2.1",
                   "dependencies": {
                     "bindings": {
                       "version": "1.2.1"
                     },
                     "nan": {
-                      "version": "1.8.4"
+                      "version": "2.1.0"
                     }
                   }
                 }
@@ -6671,10 +6819,10 @@
                   "version": "0.6.1"
                 },
                 "xmlbuilder": {
-                  "version": "2.6.2",
+                  "version": "4.2.0",
                   "dependencies": {
                     "lodash": {
-                      "version": "3.5.0"
+                      "version": "3.10.1"
                     }
                   }
                 }
@@ -6689,10 +6837,10 @@
           "version": "1.1.0"
         },
         "jasminewd2": {
-          "version": "0.0.5"
+          "version": "0.0.6"
         },
         "jasmine": {
-          "version": "2.3.1",
+          "version": "2.3.2",
           "dependencies": {
             "exit": {
               "version": "0.1.2"
@@ -6703,7 +6851,33 @@
           }
         },
         "saucelabs": {
-          "version": "0.1.1"
+          "version": "1.0.1",
+          "dependencies": {
+            "https-proxy-agent": {
+              "version": "1.0.0",
+              "dependencies": {
+                "agent-base": {
+                  "version": "2.0.1",
+                  "dependencies": {
+                    "semver": {
+                      "version": "5.0.3"
+                    }
+                  }
+                },
+                "debug": {
+                  "version": "2.2.0",
+                  "dependencies": {
+                    "ms": {
+                      "version": "0.7.1"
+                    }
+                  }
+                },
+                "extend": {
+                  "version": "3.0.0"
+                }
+              }
+            }
+          }
         },
         "glob": {
           "version": "3.2.11",
@@ -6715,7 +6889,7 @@
               "version": "0.3.0",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.6.4"
+                  "version": "2.7.3"
                 },
                 "sigmund": {
                   "version": "1.0.1"
@@ -6748,14 +6922,14 @@
               "version": "0.1.32",
               "dependencies": {
                 "amdefine": {
-                  "version": "0.1.0"
+                  "version": "1.0.0"
                 }
               }
             }
           }
         },
         "html-entities": {
-          "version": "1.1.2"
+          "version": "1.1.3"
         },
         "accessibility-developer-tools": {
           "version": "2.6.0"

npm-shrinkwrap.json

@@ -322,8 +322,8 @@
           "dependencies": {
             "traceur": {
               "version": "0.0.33",
-              "from": "git://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
-              "resolved": "git://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
+              "from": "git+https://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
+              "resolved": "git+https://github.com/vojtajina/traceur-compiler.git#d90b1e34c799bf61cd1aafdc33db0a554fa9e617",
               "dependencies": {
                 "commander": {
                   "version": "2.7.1",
@@ -3667,14 +3667,13 @@
       }
     },
     "dgeni-packages": {
-      "version": "0.10.13",
-      "from": "dgeni-packages@0.10.13",
-      "resolved": "https://registry.npmjs.org/dgeni-packages/-/dgeni-packages-0.10.13.tgz",
+      "version": "0.10.17",
+      "from": "dgeni-packages@0.10.17",
       "dependencies": {
         "catharsis": {
-          "version": "0.8.6",
-          "from": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.6.tgz",
-          "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.6.tgz",
+          "version": "0.8.7",
+          "from": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.7.tgz",
+          "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.7.tgz",
           "dependencies": {
             "underscore-contrib": {
               "version": "0.3.0",
@@ -3696,14 +3695,14 @@
           "resolved": "https://registry.npmjs.org/change-case/-/change-case-2.3.0.tgz",
           "dependencies": {
             "camel-case": {
-              "version": "1.1.1",
-              "from": "https://registry.npmjs.org/camel-case/-/camel-case-1.1.1.tgz",
-              "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-1.1.1.tgz"
+              "version": "1.1.2",
+              "from": "https://registry.npmjs.org/camel-case/-/camel-case-1.1.2.tgz",
+              "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-1.1.2.tgz"
             },
             "constant-case": {
-              "version": "1.1.0",
-              "from": "https://registry.npmjs.org/constant-case/-/constant-case-1.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-1.1.0.tgz"
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/constant-case/-/constant-case-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-1.1.1.tgz"
             },
             "dot-case": {
               "version": "1.1.1",
@@ -3736,9 +3735,9 @@
               "resolved": "https://registry.npmjs.org/param-case/-/param-case-1.1.1.tgz"
             },
             "pascal-case": {
-              "version": "1.1.0",
-              "from": "https://registry.npmjs.org/pascal-case/-/pascal-case-1.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-1.1.0.tgz"
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/pascal-case/-/pascal-case-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-1.1.1.tgz"
             },
             "path-case": {
               "version": "1.1.1",
@@ -3756,14 +3755,14 @@
               "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-1.1.1.tgz"
             },
             "swap-case": {
-              "version": "1.1.0",
-              "from": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.0.tgz"
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.1.tgz"
             },
             "title-case": {
-              "version": "1.1.0",
-              "from": "https://registry.npmjs.org/title-case/-/title-case-1.1.0.tgz",
-              "resolved": "https://registry.npmjs.org/title-case/-/title-case-1.1.0.tgz"
+              "version": "1.1.1",
+              "from": "https://registry.npmjs.org/title-case/-/title-case-1.1.1.tgz",
+              "resolved": "https://registry.npmjs.org/title-case/-/title-case-1.1.1.tgz"
             },
             "upper-case": {
               "version": "1.1.2",
@@ -3800,9 +3799,9 @@
           }
         },
         "htmlparser2": {
-          "version": "3.8.2",
-          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz",
+          "version": "3.8.3",
+          "from": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
           "dependencies": {
             "domhandler": {
               "version": "2.3.0",
@@ -3878,21 +3877,21 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
           "dependencies": {
             "lru-cache": {
-              "version": "2.5.0",
-              "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+              "version": "2.6.4",
+              "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz",
+              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
             },
             "sigmund": {
-              "version": "1.0.0",
-              "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+              "version": "1.0.1",
+              "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+              "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
             }
           }
         },
         "nunjucks": {
-          "version": "1.2.0",
-          "from": "https://registry.npmjs.org/nunjucks/-/nunjucks-1.2.0.tgz",
-          "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-1.2.0.tgz",
+          "version": "1.3.4",
+          "from": "https://registry.npmjs.org/nunjucks/-/nunjucks-1.3.4.tgz",
+          "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-1.3.4.tgz",
           "dependencies": {
             "optimist": {
               "version": "0.6.1",
@@ -3900,9 +3899,9 @@
               "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
               "dependencies": {
                 "wordwrap": {
-                  "version": "0.0.2",
-                  "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+                  "version": "0.0.3",
+                  "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+                  "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                 },
                 "minimist": {
                   "version": "0.0.10",
@@ -3932,14 +3931,14 @@
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                       "dependencies": {
                         "lru-cache": {
-                          "version": "2.5.0",
-                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz",
-                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
+                          "version": "2.6.4",
+                          "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz",
+                          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
                         },
                         "sigmund": {
-                          "version": "1.0.0",
-                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
-                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
+                          "version": "1.0.1",
+                          "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+                          "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                         }
                       }
                     },
@@ -3976,18 +3975,6 @@
                   "version": "0.1.6",
                   "from": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz",
                   "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
-                },
-                "fsevents": {
-                  "version": "0.3.5",
-                  "from": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz",
-                  "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz",
-                  "dependencies": {
-                    "nan": {
-                      "version": "1.5.3",
-                      "from": "https://registry.npmjs.org/nan/-/nan-1.5.3.tgz",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.5.3.tgz"
-                    }
-                  }
                 }
               }
             }
@@ -4037,6 +4024,16 @@
             }
           }
         },
+        "semver": {
+          "version": "4.3.6",
+          "from": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+        },
+        "shelljs": {
+          "version": "0.5.1",
+          "from": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.1.tgz",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.1.tgz"
+        },
         "winston": {
           "version": "0.7.3",
           "from": "https://registry.npmjs.org/winston/-/winston-0.7.3.tgz",
@@ -4216,6 +4213,71 @@
         }
       }
     },
+    "glob": {
+      "version": "6.0.1",
+      "from": "glob@>=6.0.1 <7.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.1.tgz",
+      "dependencies": {
+        "inflight": {
+          "version": "1.0.4",
+          "from": "inflight@>=1.0.4 <2.0.0",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+          "dependencies": {
+            "wrappy": {
+              "version": "1.0.1",
+              "from": "wrappy@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+            }
+          }
+        },
+        "inherits": {
+          "version": "2.0.1",
+          "from": "inherits@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+        },
+        "minimatch": {
+          "version": "3.0.0",
+          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
+          "dependencies": {
+            "brace-expansion": {
+              "version": "1.1.2",
+              "from": "brace-expansion@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
+              "dependencies": {
+                "balanced-match": {
+                  "version": "0.3.0",
+                  "from": "balanced-match@>=0.3.0 <0.4.0",
+                  "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+                },
+                "concat-map": {
+                  "version": "0.0.1",
+                  "from": "concat-map@0.0.1",
+                  "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                }
+              }
+            }
+          }
+        },
+        "once": {
+          "version": "1.3.3",
+          "from": "once@>=1.3.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+          "dependencies": {
+            "wrappy": {
+              "version": "1.0.1",
+              "from": "wrappy@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+            }
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.0",
+          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+        }
+      }
+    },
     "grunt": {
       "version": "0.4.5",
       "from": "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz",
@@ -8405,18 +8467,6 @@
               "version": "0.1.6",
               "from": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz",
               "resolved": "https://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz"
-            },
-            "fsevents": {
-              "version": "0.3.5",
-              "from": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz",
-              "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz",
-              "dependencies": {
-                "nan": {
-                  "version": "1.5.3",
-                  "from": "https://registry.npmjs.org/nan/-/nan-1.5.3.tgz",
-                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.5.3.tgz"
-                }
-              }
             }
           }
         },
@@ -9998,52 +10048,72 @@
       }
     },
     "protractor": {
-      "version": "2.1.0",
-      "from": "protractor@2.1",
+      "version": "2.5.1",
+      "from": "protractor@2.5.1",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-2.5.1.tgz",
       "dependencies": {
         "request": {
-          "version": "2.36.0",
-          "from": "request@~2.36.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.36.0.tgz",
+          "version": "2.57.0",
+          "from": "request@>=2.57.0 <2.58.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.57.0.tgz",
           "dependencies": {
-            "qs": {
-              "version": "0.6.6",
-              "from": "qs@~0.6.0",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
+            "bl": {
+              "version": "0.9.4",
+              "from": "bl@>=0.9.0 <0.10.0",
+              "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.4.tgz",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.0.33",
+                  "from": "readable-stream@>=1.0.26 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.2",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+                    },
+                    "isarray": {
+                      "version": "0.0.1",
+                      "from": "isarray@0.0.1",
+                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.31",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    }
+                  }
+                }
+              }
             },
-            "json-stringify-safe": {
-              "version": "5.0.1",
-              "from": "json-stringify-safe@~5.0.0",
-              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-            },
-            "mime": {
-              "version": "1.2.11",
-              "from": "mime@~1.2.9",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+            "caseless": {
+              "version": "0.10.0",
+              "from": "caseless@>=0.10.0 <0.11.0",
+              "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz"
             },
             "forever-agent": {
-              "version": "0.5.2",
-              "from": "forever-agent@~0.5.0",
-              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
-            },
-            "node-uuid": {
-              "version": "1.4.3",
-              "from": "node-uuid@~1.4.0",
-              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
-            },
-            "tough-cookie": {
-              "version": "1.1.0",
-              "from": "tough-cookie@>=0.12.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"
+              "version": "0.6.1",
+              "from": "forever-agent@>=0.6.0 <0.7.0",
+              "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
             },
             "form-data": {
-              "version": "0.1.4",
-              "from": "form-data@~0.1.0",
-              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+              "version": "0.2.0",
+              "from": "form-data@>=0.2.0 <0.3.0",
+              "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
               "dependencies": {
+                "async": {
+                  "version": "0.9.2",
+                  "from": "async@>=0.9.0 <0.10.0",
+                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+                },
                 "combined-stream": {
                   "version": "0.0.7",
-                  "from": "combined-stream@~0.0.4",
+                  "from": "combined-stream@>=0.0.4 <0.1.0",
                   "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
                   "dependencies": {
                     "delayed-stream": {
@@ -10052,27 +10122,54 @@
                       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
                     }
                   }
-                },
-                "async": {
-                  "version": "0.9.2",
-                  "from": "async@~0.9.0",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
                 }
               }
             },
+            "json-stringify-safe": {
+              "version": "5.0.1",
+              "from": "json-stringify-safe@>=5.0.0 <5.1.0",
+              "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+            },
+            "mime-types": {
+              "version": "2.0.14",
+              "from": "mime-types@>=2.0.1 <2.1.0",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+              "dependencies": {
+                "mime-db": {
+                  "version": "1.12.0",
+                  "from": "mime-db@>=1.12.0 <1.13.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"
+                }
+              }
+            },
+            "node-uuid": {
+              "version": "1.4.7",
+              "from": "node-uuid@>=1.4.0 <1.5.0",
+              "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+            },
+            "qs": {
+              "version": "3.1.0",
+              "from": "qs@>=3.1.0 <3.2.0",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"
+            },
             "tunnel-agent": {
-              "version": "0.4.0",
-              "from": "tunnel-agent@~0.4.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+              "version": "0.4.2",
+              "from": "tunnel-agent@>=0.4.0 <0.5.0",
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
+            },
+            "tough-cookie": {
+              "version": "2.2.1",
+              "from": "tough-cookie@>=0.12.0",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"
             },
             "http-signature": {
-              "version": "0.10.1",
-              "from": "http-signature@~0.10.0",
-              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+              "version": "0.11.0",
+              "from": "http-signature@>=0.11.0 <0.12.0",
+              "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz",
               "dependencies": {
                 "assert-plus": {
                   "version": "0.1.5",
-                  "from": "assert-plus@^0.1.5",
+                  "from": "assert-plus@>=0.1.5 <0.2.0",
                   "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
                 },
                 "asn1": {
@@ -10088,90 +10185,216 @@
               }
             },
             "oauth-sign": {
-              "version": "0.3.0",
-              "from": "oauth-sign@~0.3.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
+              "version": "0.8.0",
+              "from": "oauth-sign@>=0.8.0 <0.9.0",
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"
             },
             "hawk": {
-              "version": "1.0.0",
-              "from": "hawk@~1.0.0",
-              "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
+              "version": "2.3.1",
+              "from": "hawk@>=2.3.0 <2.4.0",
+              "resolved": "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz",
               "dependencies": {
                 "hoek": {
-                  "version": "0.9.1",
-                  "from": "hoek@0.9.x",
-                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
+                  "version": "2.16.3",
+                  "from": "hoek@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                 },
                 "boom": {
-                  "version": "0.4.2",
-                  "from": "boom@0.4.x",
-                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
+                  "version": "2.10.1",
+                  "from": "boom@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                 },
                 "cryptiles": {
-                  "version": "0.2.2",
-                  "from": "cryptiles@0.2.x",
-                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
+                  "version": "2.0.5",
+                  "from": "cryptiles@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
                 },
                 "sntp": {
-                  "version": "0.2.4",
-                  "from": "sntp@0.2.x",
-                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
+                  "version": "1.0.9",
+                  "from": "sntp@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
                 }
               }
             },
             "aws-sign2": {
               "version": "0.5.0",
-              "from": "aws-sign2@~0.5.0",
+              "from": "aws-sign2@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
+            },
+            "stringstream": {
+              "version": "0.0.5",
+              "from": "stringstream@>=0.0.4 <0.1.0",
+              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+            },
+            "combined-stream": {
+              "version": "1.0.5",
+              "from": "combined-stream@>=1.0.1 <1.1.0",
+              "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+              "dependencies": {
+                "delayed-stream": {
+                  "version": "1.0.0",
+                  "from": "delayed-stream@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+                }
+              }
+            },
+            "isstream": {
+              "version": "0.1.2",
+              "from": "isstream@>=0.1.1 <0.2.0",
+              "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+            },
+            "har-validator": {
+              "version": "1.8.0",
+              "from": "har-validator@>=1.6.1 <2.0.0",
+              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
+              "dependencies": {
+                "bluebird": {
+                  "version": "2.10.2",
+                  "from": "bluebird@>=2.9.30 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
+                },
+                "chalk": {
+                  "version": "1.1.1",
+                  "from": "chalk@>=1.0.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+                  "dependencies": {
+                    "ansi-styles": {
+                      "version": "2.1.0",
+                      "from": "ansi-styles@>=2.1.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
+                    },
+                    "escape-string-regexp": {
+                      "version": "1.0.3",
+                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
+                    },
+                    "has-ansi": {
+                      "version": "2.0.0",
+                      "from": "has-ansi@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "strip-ansi": {
+                      "version": "3.0.0",
+                      "from": "strip-ansi@>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                      "dependencies": {
+                        "ansi-regex": {
+                          "version": "2.0.0",
+                          "from": "ansi-regex@>=2.0.0 <3.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+                        }
+                      }
+                    },
+                    "supports-color": {
+                      "version": "2.0.0",
+                      "from": "supports-color@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+                    }
+                  }
+                },
+                "commander": {
+                  "version": "2.9.0",
+                  "from": "commander@>=2.8.1 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+                  "dependencies": {
+                    "graceful-readlink": {
+                      "version": "1.0.1",
+                      "from": "graceful-readlink@>=1.0.0",
+                      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+                    }
+                  }
+                },
+                "is-my-json-valid": {
+                  "version": "2.12.3",
+                  "from": "is-my-json-valid@>=2.12.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz",
+                  "dependencies": {
+                    "generate-function": {
+                      "version": "2.0.0",
+                      "from": "generate-function@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+                    },
+                    "generate-object-property": {
+                      "version": "1.2.0",
+                      "from": "generate-object-property@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+                      "dependencies": {
+                        "is-property": {
+                          "version": "1.0.2",
+                          "from": "is-property@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                        }
+                      }
+                    },
+                    "jsonpointer": {
+                      "version": "2.0.0",
+                      "from": "jsonpointer@2.0.0",
+                      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+                    },
+                    "xtend": {
+                      "version": "4.0.1",
+                      "from": "xtend@>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+                    }
+                  }
+                }
+              }
             }
           }
         },
         "selenium-webdriver": {
-          "version": "2.45.1",
-          "from": "selenium-webdriver@2.45.1",
-          "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.45.1.tgz",
+          "version": "2.47.0",
+          "from": "selenium-webdriver@2.47.0",
+          "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.47.0.tgz",
           "dependencies": {
             "rimraf": {
-              "version": "2.3.4",
-              "from": "rimraf@^2.2.8",
-              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz",
+              "version": "2.4.4",
+              "from": "rimraf@>=2.2.8 <3.0.0",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz",
               "dependencies": {
                 "glob": {
-                  "version": "4.5.3",
-                  "from": "glob@^4.4.2",
-                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+                  "version": "5.0.15",
+                  "from": "glob@>=5.0.14 <6.0.0",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                   "dependencies": {
                     "inflight": {
                       "version": "1.0.4",
-                      "from": "inflight@^1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "inherits@2",
+                      "from": "inherits@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "minimatch": {
-                      "version": "2.0.8",
-                      "from": "minimatch@^2.0.1",
-                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz",
+                      "version": "3.0.0",
+                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
                       "dependencies": {
                         "brace-expansion": {
-                          "version": "1.1.0",
-                          "from": "brace-expansion@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
+                          "version": "1.1.2",
+                          "from": "brace-expansion@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz",
                           "dependencies": {
                             "balanced-match": {
-                              "version": "0.2.0",
-                              "from": "balanced-match@^0.2.0",
-                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
+                              "version": "0.3.0",
+                              "from": "balanced-match@>=0.3.0 <0.4.0",
+                              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
                             },
                             "concat-map": {
                               "version": "0.0.1",
@@ -10183,16 +10406,21 @@
                       }
                     },
                     "once": {
-                      "version": "1.3.2",
-                      "from": "once@^1.3.0",
-                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "version": "1.3.3",
+                      "from": "once@>=1.3.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "wrappy@1",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
+                    },
+                    "path-is-absolute": {
+                      "version": "1.0.0",
+                      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     }
                   }
                 }
@@ -10204,9 +10432,9 @@
               "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz"
             },
             "ws": {
-              "version": "0.7.2",
-              "from": "ws@^0.7.1",
-              "resolved": "https://registry.npmjs.org/ws/-/ws-0.7.2.tgz",
+              "version": "0.8.1",
+              "from": "ws@>=0.8.0 <0.9.0",
+              "resolved": "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz",
               "dependencies": {
                 "options": {
                   "version": "0.0.6",
@@ -10214,41 +10442,41 @@
                   "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
                 },
                 "ultron": {
-                  "version": "1.0.1",
-                  "from": "ultron@1.0.x",
-                  "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz"
+                  "version": "1.0.2",
+                  "from": "ultron@>=1.0.0 <1.1.0",
+                  "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"
                 },
                 "bufferutil": {
-                  "version": "1.1.0",
-                  "from": "bufferutil@1.1.x",
-                  "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.1.0.tgz",
+                  "version": "1.2.1",
+                  "from": "bufferutil@>=1.2.0 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz",
                   "dependencies": {
                     "bindings": {
                       "version": "1.2.1",
-                      "from": "bindings@1.2.x",
+                      "from": "bindings@>=1.2.0 <1.3.0",
                       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
                     },
                     "nan": {
-                      "version": "1.8.4",
-                      "from": "nan@1.8.x",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
+                      "version": "2.1.0",
+                      "from": "nan@>=2.0.5 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
                     }
                   }
                 },
                 "utf-8-validate": {
-                  "version": "1.1.0",
-                  "from": "utf-8-validate@1.1.x",
-                  "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.1.0.tgz",
+                  "version": "1.2.1",
+                  "from": "utf-8-validate@>=1.2.0 <1.3.0",
+                  "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz",
                   "dependencies": {
                     "bindings": {
                       "version": "1.2.1",
-                      "from": "bindings@1.2.x",
+                      "from": "bindings@>=1.2.0 <1.3.0",
                       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
                     },
                     "nan": {
-                      "version": "1.8.4",
-                      "from": "nan@1.8.x",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz"
+                      "version": "2.1.0",
+                      "from": "nan@>=2.0.5 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"
                     }
                   }
                 }
@@ -10261,18 +10489,18 @@
               "dependencies": {
                 "sax": {
                   "version": "0.6.1",
-                  "from": "sax@0.6.x",
+                  "from": "sax@>=0.6.0 <0.7.0",
                   "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"
                 },
                 "xmlbuilder": {
-                  "version": "2.6.2",
+                  "version": "4.2.0",
                   "from": "xmlbuilder@>=1.0.0",
-                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz",
+                  "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.0.tgz",
                   "dependencies": {
                     "lodash": {
-                      "version": "3.5.0",
-                      "from": "lodash@~3.5.0",
-                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"
+                      "version": "3.10.1",
+                      "from": "lodash@>=3.5.0 <4.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
                     }
                   }
                 }
@@ -10291,54 +10519,93 @@
           "resolved": "https://registry.npmjs.org/jasminewd/-/jasminewd-1.1.0.tgz"
         },
         "jasminewd2": {
-          "version": "0.0.5",
-          "from": "jasminewd2@0.0.5"
+          "version": "0.0.6",
+          "from": "jasminewd2@0.0.6",
+          "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-0.0.6.tgz"
         },
         "jasmine": {
-          "version": "2.3.1",
-          "from": "jasmine@2.3.1",
-          "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.3.1.tgz",
+          "version": "2.3.2",
+          "from": "jasmine@2.3.2",
+          "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.3.2.tgz",
           "dependencies": {
             "exit": {
               "version": "0.1.2",
-              "from": "exit@^0.1.2",
+              "from": "exit@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
             },
             "jasmine-core": {
               "version": "2.3.4",
-              "from": "jasmine-core@~2.3.0",
+              "from": "jasmine-core@>=2.3.0 <2.4.0",
               "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.3.4.tgz"
             }
           }
         },
         "saucelabs": {
-          "version": "0.1.1",
-          "from": "saucelabs@~0.1.0",
-          "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"
+          "version": "1.0.1",
+          "from": "saucelabs@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.0.1.tgz",
+          "dependencies": {
+            "https-proxy-agent": {
+              "version": "1.0.0",
+              "from": "https-proxy-agent@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
+              "dependencies": {
+                "agent-base": {
+                  "version": "2.0.1",
+                  "from": "agent-base@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
+                  "dependencies": {
+                    "semver": {
+                      "version": "5.0.3",
+                      "from": "semver@>=5.0.1 <5.1.0",
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+                    }
+                  }
+                },
+                "debug": {
+                  "version": "2.2.0",
+                  "from": "debug@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+                  "dependencies": {
+                    "ms": {
+                      "version": "0.7.1",
+                      "from": "ms@0.7.1",
+                      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+                    }
+                  }
+                },
+                "extend": {
+                  "version": "3.0.0",
+                  "from": "extend@>=3.0.0 <4.0.0",
+                  "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                }
+              }
+            }
+          }
         },
         "glob": {
           "version": "3.2.11",
-          "from": "glob@~3.2",
+          "from": "glob@>=3.2.0 <3.3.0",
           "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
           "dependencies": {
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2",
+              "from": "inherits@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "minimatch": {
               "version": "0.3.0",
-              "from": "minimatch@0.3",
+              "from": "minimatch@>=0.3.0 <0.4.0",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
               "dependencies": {
                 "lru-cache": {
-                  "version": "2.6.4",
-                  "from": "lru-cache@2",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz"
+                  "version": "2.7.3",
+                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.1",
-                  "from": "sigmund@~1.0.0",
+                  "from": "sigmund@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                 }
               }
@@ -10352,17 +10619,17 @@
         },
         "optimist": {
           "version": "0.6.1",
-          "from": "optimist@~0.6.0",
+          "from": "optimist@>=0.6.0 <0.7.0",
           "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
           "dependencies": {
             "wordwrap": {
               "version": "0.0.3",
-              "from": "wordwrap@~0.0.2",
+              "from": "wordwrap@>=0.0.2 <0.1.0",
               "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
             },
             "minimist": {
               "version": "0.0.10",
-              "from": "minimist@~0.0.1",
+              "from": "minimist@>=0.0.1 <0.1.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
             }
           }
@@ -10374,7 +10641,7 @@
         },
         "source-map-support": {
           "version": "0.2.10",
-          "from": "source-map-support@~0.2.6",
+          "from": "source-map-support@>=0.2.6 <0.3.0",
           "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
           "dependencies": {
             "source-map": {
@@ -10383,22 +10650,22 @@
               "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
               "dependencies": {
                 "amdefine": {
-                  "version": "0.1.0",
+                  "version": "1.0.0",
                   "from": "amdefine@>=0.0.4",
-                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
+                  "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
                 }
               }
             }
           }
         },
         "html-entities": {
-          "version": "1.1.2",
-          "from": "html-entities@~1.1.1",
-          "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.1.2.tgz"
+          "version": "1.1.3",
+          "from": "html-entities@>=1.1.1 <1.2.0",
+          "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.1.3.tgz"
         },
         "accessibility-developer-tools": {
           "version": "2.6.0",
-          "from": "accessibility-developer-tools@~2.6.0",
+          "from": "accessibility-developer-tools@>=2.6.0 <2.7.0",
           "resolved": "https://registry.npmjs.org/accessibility-developer-tools/-/accessibility-developer-tools-2.6.0.tgz"
         }
       }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "angularjs",
-  "branchVersion": "^1.4.0-beta.0",
-  "branchPattern": "1.4.*",
+  "branchVersion": "1.3.*",
+  "distTag": "previous_1_3",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular.js.git"
@@ -11,6 +11,10 @@
     "npm": "~2.5"
   },
   "engineStrict": true,
+  "scripts": {
+    "preinstall": "node scripts/npm/check-node-modules.js --purge",
+    "postinstall": "node scripts/npm/copy-npm-shrinkwrap.js"
+  },
   "devDependencies": {
     "angular-benchpress": "0.x.x",
     "benchmark": "1.x.x",
@@ -21,6 +25,7 @@
     "dgeni": "^0.4.0",
     "dgeni-packages": "^0.10.0",
     "event-stream": "~3.1.0",
+    "glob": "^6.0.1",
     "grunt": "~0.4.2",
     "grunt-bump": "~0.0.13",
     "grunt-contrib-clean": "~0.6.0",
@@ -58,7 +63,7 @@
     "marked": "~0.3.0",
     "node-html-encoder": "0.0.2",
     "promises-aplus-tests": "~2.1.0",
-    "protractor": "^2.1.0",
+    "protractor": "^2.0.0",
     "q": "~1.0.0",
     "q-io": "^1.10.9",
     "qq": "^0.3.5",

scripts/angular.js/tag-release.sh

@@ -17,7 +17,7 @@ ARG_DEFS=(
 )
 
 function checkVersionNumber() {
-  BRANCH_PATTERN=$(readJsonProp "package.json" "branchPattern")
+  BRANCH_PATTERN=$(readJsonProp "package.json" "branchVersion")
   if [[ $VERSION_NUMBER != $BRANCH_PATTERN ]]; then
     echo "version-number needs to match $BRANCH_PATTERN on this branch"
     usage

scripts/bower/publish.sh

@@ -14,6 +14,23 @@ function init {
   TMP_DIR=$(resolveDir ../../tmp)
   BUILD_DIR=$(resolveDir ../../build)
   NEW_VERSION=$(cat $BUILD_DIR/version.txt)
+  REPOS=(
+    angular
+    angular-animate
+    angular-aria
+    angular-cookies
+    angular-i18n
+    angular-loader
+    angular-mocks
+    angular-route
+    angular-resource
+    angular-sanitize
+    angular-scenario
+    angular-touch
+    angular-messages
+  )
+  # get the npm dist-tag from a custom property (distTag) in package.json
+  DIST_TAG=$(readJsonProp "package.json" "distTag")
 }
 
 
@@ -95,24 +112,12 @@ function publish {
 
     # don't publish every build to npm
     if [ "${NEW_VERSION/+sha}" = "$NEW_VERSION" ] ; then
-      if [ "${NEW_VERSION/-}" = "$NEW_VERSION" ] ; then
-        if [[ $NEW_VERSION =~ ^1\.2\.[0-9]+$ ]] ; then
-          # publish 1.2.x releases with the appropriate tag
-          # this ensures that `npm install` by default will not grab `1.2.x` releases
-          npm publish --tag=old
-        else
-          # publish releases as "latest"
-          npm publish
-        fi
-      else
-        # publish prerelease builds with the beta tag
-        npm publish --tag=beta
-      fi
+      echo "-- Publishing to npm as $DIST_TAG"
+      npm publish --tag=$DIST_TAG
     fi
 
     cd $SCRIPT_DIR
   done
 }
 
-source $(dirname $0)/repos.inc
 source $(dirname $0)/../utils.inc

scripts/bower/repos.inc

@@ -1,19 +0,0 @@
-#!/bin/false
-# -*- mode: sh; -*- vim: set filetype=sh:
-
-REPOS=(
-  angular
-  angular-animate
-  angular-aria
-  angular-cookies
-  angular-i18n
-  angular-loader
-  angular-message-format
-  angular-messages
-  angular-mocks
-  angular-resource
-  angular-route
-  angular-sanitize
-  angular-scenario
-  angular-touch
-)

scripts/bower/unpublish.sh

@@ -13,6 +13,21 @@ ARG_DEFS=(
 
 function init {
   TMP_DIR=$(resolveDir ../../tmp)
+  REPOS=(
+    angular
+    angular-animate
+    angular-aria
+    angular-cookies
+    angular-i18n
+    angular-loader
+    angular-messages
+    angular-mocks
+    angular-route
+    angular-resource
+    angular-sanitize
+    angular-scenario
+    angular-touch
+  )
 }
 
 function prepare {
@@ -38,5 +53,4 @@ function publish {
   done
 }
 
-source $(dirname $0)/repos.inc
 source $(dirname $0)/../utils.inc

scripts/code.angularjs.org/publish.sh

@@ -23,26 +23,22 @@ function init {
 }
 
 function prepare {
+  if [[  $IS_SNAPSHOT_BUILD ]]; then
+    # nothing to prepare for snapshot builds as
+    # code.angularjs.org will fetch the current snapshot from
+    # the build server during publish
+    exit 0
+  fi
 
   echo "-- Cloning code.angularjs.org"
-  git clone git@github.com:angular/code.angularjs.org.git $REPO_DIR --depth=1
+  git clone git@github.com:angular/code.angularjs.org.git $REPO_DIR
 
+  #
+  # copy the files from the build
+  #
   echo "-- Updating code.angularjs.org"
-
-  if [[  $IS_SNAPSHOT_BUILD ]]; then
-    #
-    # update the snapshot folder
-    #
-    rm -rf $REPO_DIR/snapshot
-    mkdir $REPO_DIR/snapshot
-    cp -r $BUILD_DIR/* $REPO_DIR/snapshot/
-  else
-    #
-    # copy the files from the build
-    #
-    mkdir $REPO_DIR/$NEW_VERSION
-    cp -r $BUILD_DIR/* $REPO_DIR/$NEW_VERSION/
-  fi
+  mkdir $REPO_DIR/$NEW_VERSION
+  cp -r $BUILD_DIR/* $REPO_DIR/$NEW_VERSION/
 
   #
   # commit
@@ -54,6 +50,13 @@ function prepare {
 }
 
 
+function _update_snapshot() {
+  for backend in "$@" ; do
+    echo "-- Updating snapshot version: backend=$backend"
+    curl -G --data-urlencode "ver=$NEW_VERSION" http://$backend:8003/fetchLatestSnapshot.php
+  done
+}
+
 function _update_code() {
   cd $REPO_DIR
 
@@ -71,7 +74,12 @@ function publish {
   # the currently serving Compute Engine backends.
   # code.angularjs.org is served out of port 8003 on these backends.
   backends=("$(dig backends.angularjs.org +short TXT | python -c 'print raw_input()[1:-1].replace(",", "\n")')")
-  _update_code ${backends[@]}
+
+  if [[  $IS_SNAPSHOT_BUILD ]]; then
+    _update_snapshot ${backends[@]}
+  else
+    _update_code ${backends[@]}
+  fi
 }
 
 source $(dirname $0)/../utils.inc

scripts/jenkins/build.sh

@@ -7,6 +7,8 @@ echo "#################################"
 # Enable tracing and exit on first failure
 set -xe
 
+scripts/jenkins/set-node-version.sh
+
 # This is the default set of browsers to use on the CI server unless overridden via env variable
 if [[ -z "$BROWSERS" ]]
 then
@@ -19,6 +21,7 @@ rm -f angular.js.size
 
 
 # BUILD #
+npm install -g grunt-cli
 npm install --color false
 grunt ci-checks package --no-color
 

scripts/jenkins/master.sh

@@ -4,9 +4,7 @@ echo "#################################"
 echo "#### Update master ##############"
 echo "#################################"
 
-ARG_DEFS=(
-  "[--no-test=(true|false)]"
-)
+ARG_DEFS=()
 
 function init {
   if [[ ! $VERBOSE ]]; then
@@ -17,14 +15,7 @@ function init {
 
 function build {
   cd ../..
-
-  if [[ $NO_TEST == "true" ]]; then
-    npm install --color false
-    grunt ci-checks package --no-color
-  else
-    ./jenkins_build.sh
-  fi
-
+  scripts/jenkins/build.sh
   cd $SCRIPT_DIR
 }
 

scripts/jenkins/release.sh

@@ -35,8 +35,10 @@ function init {
 }
 
 function build {
+  ./set-node-version.sh
   cd ../..
 
+  npm install -g grunt-cli
   npm install --color false
   grunt ci-checks package --no-color
 

scripts/jenkins/set-node-version.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Install nvm for this shell
+source ~/.nvm/nvm.sh
+
+# Use node.js at 4.2.x
+nvm install 4.2

scripts/npm/check-node-modules.js

@@ -0,0 +1,74 @@
+// Implementation based on:
+// https://github.com/angular/angular/blob/3b9c08676a4c921bbfa847802e08566fb601ba7a/tools/npm/check-node-modules.js
+'use strict';
+
+// Imports
+var fs = require('fs');
+var path = require('path');
+
+// Constants
+var PROJECT_ROOT = path.join(__dirname, '../../');
+var NODE_MODULES_DIR = 'node_modules';
+var NPM_SHRINKWRAP_FILE = 'npm-shrinkwrap.json';
+var NPM_SHRINKWRAP_CACHED_FILE = NODE_MODULES_DIR + '/npm-shrinkwrap.cached.json';
+
+// Run
+_main();
+
+// Functions - Definitions
+function _main() {
+  var purgeIfStale = process.argv.indexOf('--purge') !== -1;
+
+  process.chdir(PROJECT_ROOT);
+  checkNodeModules(purgeIfStale);
+}
+
+function checkNodeModules(purgeIfStale) {
+  var nodeModulesOk = compareMarkerFiles(NPM_SHRINKWRAP_FILE, NPM_SHRINKWRAP_CACHED_FILE);
+
+  if (nodeModulesOk) {
+    console.log(':-) npm dependencies are looking good!');
+  } else if (purgeIfStale) {
+    console.log(':-( npm dependencies are stale or in an unknown state!');
+    console.log('    Purging \'' + NODE_MODULES_DIR + '\'...');
+    deleteDirSync(NODE_MODULES_DIR);
+  } else {
+    var separator = new Array(81).join('!');
+
+    console.warn(separator);
+    console.warn(':-( npm dependencies are stale or in an unknown state!');
+    console.warn('You can rebuild the dependencies by running `npm install`.');
+    console.warn(separator);
+  }
+
+  return nodeModulesOk;
+}
+
+function compareMarkerFiles(markerFilePath, cachedMarkerFilePath) {
+  if (!fs.existsSync(cachedMarkerFilePath)) return false;
+
+  var opts = {encoding: 'utf-8'};
+  var markerContent = fs.readFileSync(markerFilePath, opts);
+  var cachedMarkerContent = fs.readFileSync(cachedMarkerFilePath, opts);
+
+  return markerContent === cachedMarkerContent;
+}
+
+// Custom implementation of `rm -rf` that works consistently across OSes
+function deleteDirSync(path) {
+  if (fs.existsSync(path)) {
+    fs.readdirSync(path).forEach(deleteDirOrFileSync);
+    fs.rmdirSync(path);
+  }
+
+  // Helpers
+  function deleteDirOrFileSync(subpath) {
+    var curPath = path + '/' + subpath;
+
+    if (fs.lstatSync(curPath).isDirectory()) {
+      deleteDirSync(curPath);
+    } else {
+      fs.unlinkSync(curPath);
+    }
+  }
+}

scripts/npm/copy-npm-shrinkwrap.js

@@ -0,0 +1,60 @@
+'use strict';
+
+// Imports
+var fs = require('fs');
+var path = require('path');
+
+// Constants
+var PROJECT_ROOT = path.join(__dirname, '../../');
+var NODE_MODULES_DIR = 'node_modules';
+var NPM_SHRINKWRAP_FILE = 'npm-shrinkwrap.json';
+var NPM_SHRINKWRAP_CACHED_FILE = NODE_MODULES_DIR + '/npm-shrinkwrap.cached.json';
+
+// Run
+_main();
+
+// Functions - Definitions
+function _main() {
+  process.chdir(PROJECT_ROOT);
+  copyFile(NPM_SHRINKWRAP_FILE, NPM_SHRINKWRAP_CACHED_FILE, onCopied);
+}
+
+// Implementation based on:
+// https://stackoverflow.com/questions/11293857/fastest-way-to-copy-file-in-node-js#answer-21995878
+function copyFile(srcPath, dstPath, callback) {
+  var callbackCalled = false;
+
+  if (!fs.existsSync(srcPath)) {
+    done(new Error('Missing source file: ' + srcPath));
+    return;
+  }
+
+  var rs = fs.createReadStream(srcPath);
+  rs.on('error', done);
+
+  var ws = fs.createWriteStream(dstPath);
+  ws.on('error', done);
+  ws.on('finish', done);
+
+  rs.pipe(ws);
+
+  // Helpers
+  function done(err) {
+    if (callback && !callbackCalled) {
+      callbackCalled = true;
+      callback(err);
+    }
+  }
+}
+
+function onCopied(err) {
+  if (err) {
+    var separator = new Array(81).join('!');
+
+    console.error(separator);
+    console.error(
+        'Failed to copy `' + NPM_SHRINKWRAP_FILE + '` to `' + NPM_SHRINKWRAP_CACHED_FILE + '`:');
+    console.error(err);
+    console.error(separator);
+  }
+}

scripts/npm/install-dependencies.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SHRINKWRAP_FILE=npm-shrinkwrap.json
-SHRINKWRAP_CACHED_FILE=node_modules/npm-shrinkwrap.cached.json
-
-if diff -q $SHRINKWRAP_FILE $SHRINKWRAP_CACHED_FILE; then
-  echo 'No shrinkwrap changes detected. npm install will be skipped...';
-else
-  echo 'Blowing away node_modules and reinstalling npm dependencies...'
-  rm -rf node_modules
-  npm install
-  cp $SHRINKWRAP_FILE $SHRINKWRAP_CACHED_FILE
-  echo 'npm install successful!'
-fi

scripts/travis/before_build.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+mkdir -p $LOGS_DIR
+
+if [ $JOB != "ci-checks" ]; then
+  echo "start_browser_provider"
+  ./scripts/travis/start_browser_provider.sh
+fi
+
+npm install -g grunt-cli
+
+if [ $JOB != "ci-checks" ]; then
+  grunt package
+  echo "wait_for_browser_provider"
+  ./scripts/travis/wait_for_browser_provider.sh
+fi

scripts/travis/build.sh

@@ -5,7 +5,9 @@ set -e
 export BROWSER_STACK_ACCESS_KEY=`echo $BROWSER_STACK_ACCESS_KEY | rev`
 export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
 
-if [ $JOB = "unit" ]; then
+if [ $JOB = "ci-checks" ]; then
+  grunt ci-checks
+elif [ $JOB = "unit" ]; then
   if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
     BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_iOS"
   else
@@ -14,7 +16,6 @@ if [ $JOB = "unit" ]; then
 
   grunt test:promises-aplus
   grunt test:unit --browsers $BROWSERS --reporters dots
-  grunt ci-checks
   grunt tests:docs --browsers $BROWSERS --reporters dots
 elif [ $JOB = "docs-e2e" ]; then
   grunt test:travis-protractor --specs "docs/app/e2e/**/*.scenario.js"
@@ -31,5 +32,5 @@ elif [ $JOB = "e2e" ]; then
   export TARGET_SPECS="test/e2e/tests/**/*.js,$TARGET_SPECS"
   grunt test:travis-protractor --specs "$TARGET_SPECS"
 else
-  echo "Unknown job type. Please set JOB=unit or JOB=e2e-*."
+  echo "Unknown job type. Please set JOB=ci-checks, JOB=unit or JOB=e2e-*."
 fi

scripts/travis/tear_down_browser_provider.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+# Has to be run from project root directory.
+
+./lib/${BROWSER_PROVIDER}/teardown_tunnel.sh

src/.jshintrc

@@ -28,14 +28,14 @@
     "manualUppercase": false,
     "isArrayLike": false,
     "forEach": false,
+    "sortedKeys": false,
     "forEachSorted": false,
     "reverseParams": false,
     "nextUid": false,
     "setHashKey": false,
     "extend": false,
-    "toInt": false,
+    "int": false,
     "inherit": false,
-    "merge": false,
     "noop": false,
     "identity": false,
     "valueFn": false,
@@ -71,8 +71,6 @@
     "toJsonReplacer": false,
     "toJson": false,
     "fromJson": false,
-    "convertTimezoneToLocal": false,
-    "timezoneToOffset": false,
     "startingTag": false,
     "tryDecodeURIComponent": false,
     "parseKeyValue": false,
@@ -156,9 +154,6 @@
     "urlResolve": false,
     "urlIsSameOrigin": false,
 
-    /* ng/controller.js */
-    "identifierForController": false,
-
     /* ng/compile.js */
     "directiveNormalize": false,
 

src/Angular.js

@@ -22,14 +22,14 @@
   nodeName_: true,
   isArrayLike: true,
   forEach: true,
+  sortedKeys: true,
   forEachSorted: true,
   reverseParams: true,
   nextUid: true,
   setHashKey: true,
   extend: true,
-  toInt: true,
+  int: true,
   inherit: true,
-  merge: true,
   noop: true,
   identity: true,
   valueFn: true,
@@ -60,15 +60,12 @@
   shallowCopy: true,
   equals: true,
   csp: true,
-  jq: true,
   concat: true,
   sliceArgs: true,
   bind: true,
   toJsonReplacer: true,
   toJson: true,
   fromJson: true,
-  convertTimezoneToLocal: true,
-  timezoneToOffset: true,
   startingTag: true,
   tryDecodeURIComponent: true,
   parseKeyValue: true,
@@ -269,32 +266,23 @@ function forEach(obj, iterator, context) {
       }
     } else if (obj.forEach && obj.forEach !== forEach) {
         obj.forEach(iterator, context, obj);
-    } else if (isBlankObject(obj)) {
-      // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
-      for (key in obj) {
-        iterator.call(context, obj[key], key, obj);
-      }
-    } else if (typeof obj.hasOwnProperty === 'function') {
-      // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed
+    } else {
       for (key in obj) {
         if (obj.hasOwnProperty(key)) {
           iterator.call(context, obj[key], key, obj);
         }
       }
-    } else {
-      // Slow path for objects which do not have a method `hasOwnProperty`
-      for (key in obj) {
-        if (hasOwnProperty.call(obj, key)) {
-          iterator.call(context, obj[key], key, obj);
-        }
-      }
     }
   }
   return obj;
 }
 
+function sortedKeys(obj) {
+  return Object.keys(obj).sort();
+}
+
 function forEachSorted(obj, iterator, context) {
-  var keys = Object.keys(obj).sort();
+  var keys = sortedKeys(obj);
   for (var i = 0; i < keys.length; i++) {
     iterator.call(context, obj[keys[i]], keys[i]);
   }
@@ -339,31 +327,6 @@ function setHashKey(obj, h) {
   }
 }
 
-
-function baseExtend(dst, objs, deep) {
-  var h = dst.$$hashKey;
-
-  for (var i = 0, ii = objs.length; i < ii; ++i) {
-    var obj = objs[i];
-    if (!isObject(obj) && !isFunction(obj)) continue;
-    var keys = Object.keys(obj);
-    for (var j = 0, jj = keys.length; j < jj; j++) {
-      var key = keys[j];
-      var src = obj[key];
-
-      if (deep && isObject(src)) {
-        if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
-        baseExtend(dst[key], [src], true);
-      } else {
-        dst[key] = src;
-      }
-    }
-  }
-
-  setHashKey(dst, h);
-  return dst;
-}
-
 /**
  * @ngdoc function
  * @name angular.extend
@@ -374,44 +337,31 @@ function baseExtend(dst, objs, deep) {
  * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
  * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
  * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`.
- *
- * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use
- * {@link angular.merge} for this.
+ * Note: Keep in mind that `angular.extend` does not support recursive merge (deep copy).
  *
  * @param {Object} dst Destination object.
  * @param {...Object} src Source object(s).
  * @returns {Object} Reference to `dst`.
  */
 function extend(dst) {
-  return baseExtend(dst, slice.call(arguments, 1), false);
+  var h = dst.$$hashKey;
+
+  for (var i = 1, ii = arguments.length; i < ii; i++) {
+    var obj = arguments[i];
+    if (obj) {
+      var keys = Object.keys(obj);
+      for (var j = 0, jj = keys.length; j < jj; j++) {
+        var key = keys[j];
+        dst[key] = obj[key];
+      }
+    }
+  }
+
+  setHashKey(dst, h);
+  return dst;
 }
 
-
-/**
-* @ngdoc function
-* @name angular.merge
-* @module ng
-* @kind function
-*
-* @description
-* Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
-* to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
-* by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`.
-*
-* Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
-* objects, performing a deep copy.
-*
-* @param {Object} dst Destination object.
-* @param {...Object} src Source object(s).
-* @returns {Object} Reference to `dst`.
-*/
-function merge(dst) {
-  return baseExtend(dst, slice.call(arguments, 1), true);
-}
-
-
-
-function toInt(str) {
+function int(str) {
   return parseInt(str, 10);
 }
 
@@ -659,9 +609,9 @@ function isPromiseLike(obj) {
 }
 
 
-var TYPED_ARRAY_REGEXP = /^\[object (Uint8(Clamped)?)|(Uint16)|(Uint32)|(Int8)|(Int16)|(Int32)|(Float(32)|(64))Array\]$/;
+var TYPED_ARRAY_REGEXP = /^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array\]$/;
 function isTypedArray(value) {
-  return TYPED_ARRAY_REGEXP.test(toString.call(value));
+  return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value));
 }
 
 
@@ -702,9 +652,8 @@ function isElement(node) {
  */
 function makeMap(str) {
   var obj = {}, items = str.split(","), i;
-  for (i = 0; i < items.length; i++) {
+  for (i = 0; i < items.length; i++)
     obj[items[i]] = true;
-  }
   return obj;
 }
 
@@ -719,10 +668,9 @@ function includes(array, obj) {
 
 function arrayRemove(array, value) {
   var index = array.indexOf(value);
-  if (index >= 0) {
+  if (index >= 0)
     array.splice(index, 1);
-  }
-  return index;
+  return value;
 }
 
 /**
@@ -783,101 +731,110 @@ function arrayRemove(array, value) {
  </file>
  </example>
  */
-function copy(source, destination, stackSource, stackDest) {
-  if (isWindow(source) || isScope(source)) {
-    throw ngMinErr('cpws',
-      "Can't copy! Making copies of Window or Scope instances is not supported.");
-  }
-  if (isTypedArray(destination)) {
-    throw ngMinErr('cpta',
-      "Can't copy! TypedArray destination cannot be mutated.");
-  }
+function copy(source, destination) {
+  var stackSource = [];
+  var stackDest = [];
 
-  if (!destination) {
-    destination = source;
-    if (source) {
-      if (isArray(source)) {
-        destination = copy(source, [], stackSource, stackDest);
-      } else if (isTypedArray(source)) {
-        destination = new source.constructor(source);
-      } else if (isDate(source)) {
-        destination = new Date(source.getTime());
-      } else if (isRegExp(source)) {
-        destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]);
-        destination.lastIndex = source.lastIndex;
-      } else if (isObject(source)) {
-        var emptyObject = Object.create(getPrototypeOf(source));
-        destination = copy(source, emptyObject, stackSource, stackDest);
-      }
+  if (destination) {
+    if (isTypedArray(destination)) {
+      throw ngMinErr('cpta', "Can't copy! TypedArray destination cannot be mutated.");
     }
-  } else {
-    if (source === destination) throw ngMinErr('cpi',
-      "Can't copy! Source and destination are identical.");
-
-    stackSource = stackSource || [];
-    stackDest = stackDest || [];
-
-    if (isObject(source)) {
-      var index = stackSource.indexOf(source);
-      if (index !== -1) return stackDest[index];
-
-      stackSource.push(source);
-      stackDest.push(destination);
+    if (source === destination) {
+      throw ngMinErr('cpi', "Can't copy! Source and destination are identical.");
     }
 
+    // Empty the destination object
+    if (isArray(destination)) {
+      destination.length = 0;
+    } else {
+      forEach(destination, function(value, key) {
+        if (key !== '$$hashKey') {
+          delete destination[key];
+        }
+      });
+    }
+
+    stackSource.push(source);
+    stackDest.push(destination);
+    return copyRecurse(source, destination);
+  }
+
+  return copyElement(source);
+
+  function copyRecurse(source, destination) {
+    var h = destination.$$hashKey;
     var result, key;
     if (isArray(source)) {
-      destination.length = 0;
-      for (var i = 0; i < source.length; i++) {
-        result = copy(source[i], null, stackSource, stackDest);
-        if (isObject(source[i])) {
-          stackSource.push(source[i]);
-          stackDest.push(result);
+      for (var i = 0, ii = source.length; i < ii; i++) {
+        destination.push(copyElement(source[i]));
+      }
+    } else if (isBlankObject(source)) {
+      // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+      for (key in source) {
+        destination[key] = copyElement(source[key]);
+      }
+    } else if (source && typeof source.hasOwnProperty === 'function') {
+      // Slow path, which must rely on hasOwnProperty
+      for (key in source) {
+        if (source.hasOwnProperty(key)) {
+          destination[key] = copyElement(source[key]);
         }
-        destination.push(result);
       }
     } else {
-      var h = destination.$$hashKey;
-      if (isArray(destination)) {
-        destination.length = 0;
-      } else {
-        forEach(destination, function(value, key) {
-          delete destination[key];
-        });
-      }
-      if (isBlankObject(source)) {
-        // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
-        for (key in source) {
-          putValue(key, source[key], destination, stackSource, stackDest);
-        }
-      } else if (source && typeof source.hasOwnProperty === 'function') {
-        // Slow path, which must rely on hasOwnProperty
-        for (key in source) {
-          if (source.hasOwnProperty(key)) {
-            putValue(key, source[key], destination, stackSource, stackDest);
-          }
-        }
-      } else {
-        // Slowest path --- hasOwnProperty can't be called as a method
-        for (key in source) {
-          if (hasOwnProperty.call(source, key)) {
-            putValue(key, source[key], destination, stackSource, stackDest);
-          }
+      // Slowest path --- hasOwnProperty can't be called as a method
+      for (key in source) {
+        if (hasOwnProperty.call(source, key)) {
+          destination[key] = copyElement(source[key]);
         }
       }
-      setHashKey(destination,h);
     }
+    setHashKey(destination, h);
+    return destination;
   }
-  return destination;
 
-  function putValue(key, val, destination, stackSource, stackDest) {
-    // No context allocation, trivial outer scope, easily inlined
-    var result = copy(val, null, stackSource, stackDest);
-    if (isObject(val)) {
-      stackSource.push(val);
-      stackDest.push(result);
+  function copyElement(source) {
+    // Simple values
+    if (!isObject(source)) {
+      return source;
     }
-    destination[key] = result;
+
+    // Already copied values
+    var index = stackSource.indexOf(source);
+    if (index !== -1) {
+      return stackDest[index];
+    }
+
+    if (isWindow(source) || isScope(source)) {
+      throw ngMinErr('cpws',
+        "Can't copy! Making copies of Window or Scope instances is not supported.");
+    }
+
+    var needsRecurse = false;
+    var destination;
+
+    if (isArray(source)) {
+      destination = [];
+      needsRecurse = true;
+    } else if (isTypedArray(source)) {
+      destination = new source.constructor(source);
+    } else if (isDate(source)) {
+      destination = new Date(source.getTime());
+    } else if (isRegExp(source)) {
+      destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]);
+      destination.lastIndex = source.lastIndex;
+    } else if (isFunction(source.cloneNode)) {
+        destination = source.cloneNode(true);
+    } else {
+      destination = Object.create(getPrototypeOf(source));
+      needsRecurse = true;
+    }
+
+    stackSource.push(source);
+    stackDest.push(destination);
+
+    return needsRecurse
+      ? copyRecurse(source, destination)
+      : destination;
   }
 }
 
@@ -959,14 +916,14 @@ function equals(o1, o2) {
       } else {
         if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
           isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
-        keySet = createMap();
+        keySet = {};
         for (key in o1) {
           if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
           if (!equals(o1[key], o2[key])) return false;
           keySet[key] = true;
         }
         for (key in o2) {
-          if (!(key in keySet) &&
+          if (!keySet.hasOwnProperty(key) &&
               key.charAt(0) !== '$' &&
               o2[key] !== undefined &&
               !isFunction(o2[key])) return false;
@@ -997,58 +954,7 @@ var csp = function() {
   return (csp.isActive_ = active);
 };
 
-/**
- * @ngdoc directive
- * @module ng
- * @name ngJq
- *
- * @element ANY
- * @param {string=} ngJq the name of the library available under `window`
- * to be used for angular.element
- * @description
- * Use this directive to force the angular.element library.  This should be
- * used to force either jqLite by leaving ng-jq blank or setting the name of
- * the jquery variable under window (eg. jQuery).
- *
- * Since angular looks for this directive when it is loaded (doesn't wait for the
- * DOMContentLoaded event), it must be placed on an element that comes before the script
- * which loads angular. Also, only the first instance of `ng-jq` will be used and all
- * others ignored.
- *
- * @example
- * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
- ```html
- <!doctype html>
- <html ng-app ng-jq>
- ...
- ...
- </html>
- ```
- * @example
- * This example shows how to use a jQuery based library of a different name.
- * The library name must be available at the top most 'window'.
- ```html
- <!doctype html>
- <html ng-app ng-jq="jQueryLib">
- ...
- ...
- </html>
- ```
- */
-var jq = function() {
-  if (isDefined(jq.name_)) return jq.name_;
-  var el;
-  var i, ii = ngAttrPrefixes.length, prefix, name;
-  for (i = 0; i < ii; ++i) {
-    prefix = ngAttrPrefixes[i];
-    if (el = document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) {
-      name = el.getAttribute(prefix + 'jq');
-      break;
-    }
-  }
 
-  return (jq.name_ = name);
-};
 
 function concat(array1, array2, index) {
   return array1.concat(slice.call(array2, index));
@@ -1159,26 +1065,6 @@ function fromJson(json) {
 }
 
 
-function timezoneToOffset(timezone, fallback) {
-  var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
-  return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
-}
-
-
-function addDateMinutes(date, minutes) {
-  date = new Date(date.getTime());
-  date.setMinutes(date.getMinutes() + minutes);
-  return date;
-}
-
-
-function convertTimezoneToLocal(date, timezone, reverse) {
-  reverse = reverse ? -1 : 1;
-  var timezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
-  return addDateMinutes(date, reverse * (timezoneOffset - date.getTimezoneOffset()));
-}
-
-
 /**
  * @returns {string} Returns the string representation of the element.
  */
@@ -1307,9 +1193,10 @@ var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-'];
 
 function getNgAttribute(element, ngAttr) {
   var attr, i, ii = ngAttrPrefixes.length;
+  element = jqLite(element);
   for (i = 0; i < ii; ++i) {
     attr = ngAttrPrefixes[i] + ngAttr;
-    if (isString(attr = element.getAttribute(attr))) {
+    if (isString(attr = element.attr(attr))) {
       return attr;
     }
   }
@@ -1640,12 +1527,7 @@ function bindJQuery() {
   }
 
   // bind to jQuery if present;
-  var jqName = jq();
-  jQuery = window.jQuery; // use default jQuery.
-  if (isDefined(jqName)) { // `ngJq` present
-    jQuery = jqName === null ? undefined : window[jqName]; // if empty; use jqLite. if not empty, use jQuery specified by `ngJq`.
-  }
-
+  jQuery = window.jQuery;
   // Use jQuery if it exists with proper functionality, otherwise default to us.
   // Angular 1.2+ requires jQuery 1.7+ for on()/off() support.
   // Angular 1.3+ technically requires at least jQuery 2.1+ but it may work with older

src/AngularPublic.js

@@ -57,8 +57,6 @@
 
   $AnchorScrollProvider,
   $AnimateProvider,
-  $$CoreAnimateQueueProvider,
-  $$CoreAnimateRunnerProvider,
   $BrowserProvider,
   $CacheFactoryProvider,
   $ControllerProvider,
@@ -67,10 +65,7 @@
   $FilterProvider,
   $InterpolateProvider,
   $IntervalProvider,
-  $$HashMapProvider,
   $HttpProvider,
-  $HttpParamSerializerProvider,
-  $HttpParamSerializerJQLikeProvider,
   $HttpBackendProvider,
   $LocationProvider,
   $LogProvider,
@@ -89,8 +84,7 @@
   $$RAFProvider,
   $$AsyncCallbackProvider,
   $WindowProvider,
-  $$jqLiteProvider,
-  $$CookieReaderProvider
+  $$jqLiteProvider
 */
 
 
@@ -122,7 +116,6 @@ function publishExternalAPI(angular) {
     'bootstrap': bootstrap,
     'copy': copy,
     'extend': extend,
-    'merge': merge,
     'equals': equals,
     'element': jqLite,
     'forEach': forEach,
@@ -219,8 +212,6 @@ function publishExternalAPI(angular) {
       $provide.provider({
         $anchorScroll: $AnchorScrollProvider,
         $animate: $AnimateProvider,
-        $$animateQueue: $$CoreAnimateQueueProvider,
-        $$AnimateRunner: $$CoreAnimateRunnerProvider,
         $browser: $BrowserProvider,
         $cacheFactory: $CacheFactoryProvider,
         $controller: $ControllerProvider,
@@ -230,8 +221,6 @@ function publishExternalAPI(angular) {
         $interpolate: $InterpolateProvider,
         $interval: $IntervalProvider,
         $http: $HttpProvider,
-        $httpParamSerializer: $HttpParamSerializerProvider,
-        $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
         $httpBackend: $HttpBackendProvider,
         $location: $LocationProvider,
         $log: $LogProvider,
@@ -249,9 +238,7 @@ function publishExternalAPI(angular) {
         $window: $WindowProvider,
         $$rAF: $$RAFProvider,
         $$asyncCallback: $$AsyncCallbackProvider,
-        $$jqLite: $$jqLiteProvider,
-        $$HashMap: $$HashMapProvider,
-        $$cookieReader: $$CookieReaderProvider
+        $$jqLite: $$jqLiteProvider
       });
     }
   ]);

src/angular.prefix

@@ -1,6 +1,6 @@
 /**
  * @license AngularJS v"NG_VERSION_FULL"
- * (c) 2010-2015 Google, Inc. http://angularjs.org
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
 (function(window, document, undefined) {

src/apis.js

@@ -73,9 +73,3 @@ HashMap.prototype = {
     return value;
   }
 };
-
-var $$HashMapProvider = [function() {
-  this.$get = [function() {
-    return HashMap;
-  }];
-}];

src/jqLite.js

@@ -866,9 +866,8 @@ forEach({
   children: function(element) {
     var children = [];
     forEach(element.childNodes, function(element) {
-      if (element.nodeType === NODE_TYPE_ELEMENT) {
+      if (element.nodeType === NODE_TYPE_ELEMENT)
         children.push(element);
-      }
     });
     return children;
   },

src/loader.js

@@ -193,18 +193,6 @@ function setupModuleLoader(window) {
            */
           constant: invokeLater('$provide', 'constant', 'unshift'),
 
-           /**
-           * @ngdoc method
-           * @name angular.Module#decorator
-           * @module ng
-           * @param {string} The name of the service to decorate.
-           * @param {Function} This function will be invoked when the service needs to be
-           *                                    instantiated and should return the decorated service instance.
-           * @description
-           * See {@link auto.$provide#decorator $provide.decorator()}.
-           */
-          decorator: invokeLater('$provide', 'decorator'),
-
           /**
            * @ngdoc method
            * @name angular.Module#animation
@@ -218,7 +206,7 @@ function setupModuleLoader(window) {
            *
            *
            * Defines an animation hook that can be later used with
-           * {@link $animate $animate} service and directives that use this service.
+           * {@link ngAnimate.$animate $animate} service and directives that use this service.
            *
            * ```js
            * module.animation('.animation-name', function($inject1, $inject2) {