rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							edda524d0d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	.travis.yml
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_next-item.jade
#	public/_includes/_util-fns.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/_examples/package.json
#	public/docs/_examples/quickstart/dart/lib/app_component.dart
#	public/docs/_examples/quickstart/e2e-spec.ts
#	public/docs/_examples/quickstart/js/app/app.component.js
#	public/docs/_examples/quickstart/ts/app/app.component.ts
#	public/docs/_examples/quickstart/ts/index.html
#	public/docs/_examples/toh-5/dart/lib/dashboard_component.html
#	public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/guide/_data.json
#	public/docs/dart/latest/guide/index.jade
#	public/docs/dart/latest/quickstart.jade
#	public/docs/index.jade
#	public/docs/js/latest/quickstart.jade
#	public/docs/ts/_cache/glossary.jade
#	public/docs/ts/_cache/guide/dependency-injection.jade
#	public/docs/ts/_cache/guide/index.jade
#	public/docs/ts/_cache/quickstart.jade
#	public/docs/ts/_cache/tutorial/toh-pt5.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/_quickstart_repo.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/events.jade
#	public/resources/images/devguide/quickstart/hello-angular.png
#	scripts/cache.sh
#	tools/plunker-builder/indexHtmlTranslator.js 
						
						
					 
					
						2016-11-26 21:43:16 +00:00 
						 
				 
			
				
					
						
							
							
								Yang Lin 
							
						 
					 
					
						
						
						
						
							
						
						
							5a7745fb27 
							
						 
					 
					
						
						
							
							Upgrade to 2.2.0  
						
						
						
						
					 
					
						2016-11-22 20:07:16 +08:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							323becee32 
							
						 
					 
					
						
						
							
							chore: remove bootstrap package ( #2691 )  
						
						
						
						
					 
					
						2016-10-29 10:44:57 -07:00 
						 
				 
			
				
					
						
							
							
								Steven 
							
						 
					 
					
						
						
						
						
							
						
						
							2408bb149a 
							
						 
					 
					
						
						
							
							fix for  #2667  ( #2668 )  
						
						... 
						
						
						
						ported changes made here 541bdc5f63 
						
						
					 
					
						2016-10-26 08:31:29 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							4c85f0a91d 
							
						 
					 
					
						
						
							
							chore: update to 2.1.1 ( #2650 )  
						
						
						
						
					 
					
						2016-10-21 22:31:09 +01:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							14c01fb651 
							
						 
					 
					
						
						
							
							docs(change-log): notes in-mem-web-api breaking change ( #2644 )  
						
						
						
						
					 
					
						2016-10-20 19:28:19 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							0d49fecd30 
							
						 
					 
					
						
						
							
							chore: update to @types ( #1872 )  
						
						... 
						
						
						
						* chore: update examples to @types
* fix toh-6 aot and add types link 
						
						
					 
					
						2016-10-20 17:01:16 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							a63c75cc18 
							
						 
					 
					
						
						
							
							chore: release 2.1.0 ( #2589 )  
						
						
						
						
					 
					
						2016-10-12 23:41:42 +02:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							61b13c13ec 
							
						 
					 
					
						
						
							
							chore: v.2.0.2 + standard MIT licenses property ( #2559 )  
						
						
						
						
					 
					
						2016-10-06 17:21:05 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							9671d99585 
							
						 
					 
					
						
						
							
							chore: update package.json files to latest pkg versions. Use ~ for Ng. ( #2490 )  
						
						... 
						
						
						
						closes  #2488  
					
						2016-09-27 12:20:17 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							6e17d33475 
							
						 
					 
					
						
						
							
							chore: update samples to "angular-in-memory-web-api" ( #2472 )  
						
						... 
						
						
						
						chore: update samples to "angular-in-memory-web-api" 
						
						
					 
					
						2016-09-25 15:24:13 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							693f6ae462 
							
						 
					 
					
						
						
							
							chore: rename Angular 2 to simply Angular ( #2402 )  
						
						
						
						
					 
					
						2016-09-19 20:24:40 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							24c61dd7bc 
							
						 
					 
					
						
						
							
							chore: here we are ( #2353 )  
						
						
						
						
					 
					
						2016-09-15 02:41:19 +01:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							69ae63c4b1 
							
						 
					 
					
						
						
							
							chore: update examples to TS2.0 ( #2329 )  
						
						
						
						
					 
					
						2016-09-14 10:15:51 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							ee955a451e 
							
						 
					 
					
						
						
							
							docs(quickstart): remove compiler-cli from dependencies ( #2285 )  
						
						
						
						
					 
					
						2016-09-13 16:11:22 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							988694bb12 
							
						 
					 
					
						
						
							
							chore: update docs to rc7  
						
						
						
						
					 
					
						2016-09-13 08:48:45 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							01b211193c 
							
						 
					 
					
						
						
							
							docs(browser-support): edits ( #2299 )  
						
						
						
						
					 
					
						2016-09-09 22:21:40 -04:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							77aeb84bc2 
							
						 
					 
					
						
						
							
							chore: remove testing libs from systemjs.config ( #2247 )  
						
						... 
						
						
						
						They belong in the testing shim files 
						
						
					 
					
						2016-09-02 01:11:27 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							f823605a22 
							
						 
					 
					
						
						
							
							chore: fix quickstart  
						
						
						
						
					 
					
						2016-09-01 08:40:42 -07:00 
						 
				 
			
				
					
						
							
							
								Naomi Black 
							
						 
					 
					
						
						
						
						
							
						
						
							38fe94df81 
							
						 
					 
					
						
						
							
							docs(qs-reboot): edits for the quickstart  
						
						
						
						
					 
					
						2016-09-01 07:10:42 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							08b491df7b 
							
						 
					 
					
						
						
							
							chore: add systemjs.config.1.js  
						
						
						
						
					 
					
						2016-09-01 15:48:36 +02:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							9d5bbfca15 
							
						 
					 
					
						
						
							
							chore: update systemjs.configs and plunker-builder/indexHtmlTranslator for RC6  
						
						
						
						
					 
					
						2016-09-01 00:20:58 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							0c962712b3 
							
						 
					 
					
						
						
							
							chore: update to rc6 ( #2177 )  
						
						
						
						
					 
					
						2016-08-31 18:08:57 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							fc2815ff6d 
							
						 
					 
					
						
						
							
							docs(ngmodule): updates for clarity; breaks out CoreModule  
						
						
						
						
					 
					
						2016-08-24 23:10:10 -07:00 
						 
				 
			
				
					
						
							
							
								Cassio Landim 
							
						 
					 
					
						
						
						
						
							
						
						
							fccb32d3f8 
							
						 
					 
					
						
						
							
							chore(system.config.js): remove slash in front of "bundle"  
						
						... 
						
						
						
						closes  #1961 
This slash before the bundles path is generating a double slash for the scripts path, e.g. http://localhost:3000/node_modules/@angular/common//bundles/common.umd.js . Some server are not happy with this double slash and redirect to 404 pages like Firebase Hosting. 
					
						2016-08-17 21:53:21 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							19d06061c5 
							
						 
					 
					
						
						
							
							docs(quickstart): post-RC5 Dart resync ( #2078 )  
						
						... 
						
						
						
						* docs(quickstart): post-RC5 Dart resync
- Resync Dart QS prose with TS, post RC5.
- Added to-be-shared Jade `var` definitions to `_util-fns.jade`.
- Delete cached QS jade file.
- Eliminate the stub file `styles.1.css` in favor of a `docregion` in
the main `styles.css`.
This commit requires a `gulp add-example-boilerplate` after pulling it in.
Contributes to #2077 .
* post-review edits 
						
						
					 
					
						2016-08-10 13:32:07 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							d79adb2422 
							
						 
					 
					
						
						
							
							docs(rc5): update docs and plunkers for rc5  
						
						
						
						
					 
					
						2016-08-09 11:48:07 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							909f230cc7 
							
						 
					 
					
						
						
							
							update router to beta.1  
						
						
						
						
					 
					
						2016-06-30 13:04:04 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							10de4c5753 
							
						 
					 
					
						
						
							
							update in memory web api  
						
						
						
						
					 
					
						2016-06-30 13:03:44 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							94f5609506 
							
						 
					 
					
						
						
							
							add rc4 versions  
						
						
						
						
					 
					
						2016-06-30 12:40:59 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							387f7c6dd2 
							
						 
					 
					
						
						
							
							chore(deps): update in-memory-web-api  
						
						
						
						
					 
					
						2016-06-30 11:50:43 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							c02b942008 
							
						 
					 
					
						
						
							
							chore: update to router alpha.8  
						
						
						
						
					 
					
						2016-06-28 12:52:47 -07:00 
						 
				 
			
				
					
						
							
							
								Ricardo Torres 
							
						 
					 
					
						
						
						
						
							
						
						
							e4f2a22014 
							
						 
					 
					
						
						
							
							fix(docs) router-deprecated still in rc.2  
						
						
						
						
					 
					
						2016-06-22 15:20:44 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							7848feaeaa 
							
						 
					 
					
						
						
							
							chore: update to rc3  
						
						
						
						
					 
					
						2016-06-22 01:51:57 +01:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							9e1e5a1ef8 
							
						 
					 
					
						
						
							
							chore: add forms, update router  
						
						
						
						
					 
					
						2016-06-20 19:57:16 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							643c59a15e 
							
						 
					 
					
						
						
							
							fix(e2e): update broken node typings  
						
						
						
						
					 
					
						2016-06-17 13:52:30 +01:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							30609c8f9c 
							
						 
					 
					
						
						
							
							chore: update quickstart for rc2  
						
						
						
						
					 
					
						2016-06-15 16:48:30 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							761ec00d02 
							
						 
					 
					
						
						
							
							chore: update in-memory-web-api  
						
						
						
						
					 
					
						2016-06-15 15:15:35 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							e9cf2a539f 
							
						 
					 
					
						
						
							
							chore: update to rc2  
						
						
						
						
					 
					
						2016-06-15 12:21:06 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							ffbdcd2b9c 
							
						 
					 
					
						
						
							
							chore: fix systemjs semicolons  
						
						... 
						
						
						
						closes  #1632  
					
						2016-06-13 10:37:20 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							0047919e2d 
							
						 
					 
					
						
						
							
							docs(quickstart): update guide systemjs.config.js  
						
						... 
						
						
						
						closes  #1542  
					
						2016-05-29 11:03:33 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							bd6d788ccb 
							
						 
					 
					
						
						
							
							docs(chore): update samples to angular-in-mem-web-api v.0.0.11  
						
						... 
						
						
						
						Has RegExp query option needed for ToH 7: Http+Observables 
						
						
					 
					
						2016-05-28 08:54:21 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							a775675ab8 
							
						 
					 
					
						
						
							
							docs(typings): update typings snippets for the guides  
						
						
						
						
					 
					
						2016-05-22 01:59:40 +02:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							650a4d17e8 
							
						 
					 
					
						
						
							
							docs(samples): package.json and typings updates  
						
						
						
						
					 
					
						2016-05-21 14:15:48 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							3423ad8491 
							
						 
					 
					
						
						
							
							chore: more conversion of es6-shim to core-js  
						
						
						
						
					 
					
						2016-05-19 23:18:18 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							6e0f80c673 
							
						 
					 
					
						
						
							
							docs: update api-in-mem-web-api to v.0.0.8  
						
						
						
						
					 
					
						2016-05-19 21:50:26 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							efbe3bbdfd 
							
						 
					 
					
						
						
							
							docs(quickstart): fix broken region  
						
						... 
						
						
						
						closes  #1438  
					
						2016-05-19 19:22:45 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							bd52aa3f34 
							
						 
					 
					
						
						
							
							docs: complete  es6-shim to core-js migration  
						
						... 
						
						
						
						closes  #1442  
					
						2016-05-19 19:12:14 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							ba02c40b56 
							
						 
					 
					
						
						
							
							docs: switch from es6-shim to core-js shim  
						
						
						
						
					 
					
						2016-05-19 16:37:54 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							31fe01e01f 
							
						 
					 
					
						
						
							
							docs: SystemJS to use @angular umd bundles  
						
						
						
						
					 
					
						2016-05-18 16:20:24 -07:00