| 
							
							
								 Zhimin YE (Rex) | 35a1cce5dc | review: ngmodule.jade to line 700 | 2016-09-15 16:56:39 +01:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | e693d35fb1 | 合并了最新更新,翻译了官方的发布声明 | 2016-09-15 17:08:17 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 2417245114 | Merge remote-tracking branch 'origin/master' # Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_hero.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_util-fns.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/_data.json
#	public/docs/ts/latest/testing/application-under-test.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/index.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/index.jade
#	public/resources/css/main.scss
#	public/resources/css/module/_side-nav.scss | 2016-09-15 15:23:48 +08:00 |  | 
			
				
					| 
							
							
								 Naomi Black | 053ecc2b10 | docs(aot): More consistency edits to aot/jit | 2016-09-14 13:55:23 -07:00 |  | 
			
				
					| 
							
							
								 Deborah Kurata | a52d8c3e76 | docs(validation): Change to 'Table of Contents' Same change to NgModules
closes #2315 | 2016-09-13 20:46:36 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 2a1c3626c5 | 去掉了大部分儿化音 感谢来自github的iloveyo123u1和Elderry | 2016-09-12 08:35:02 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | ab06793705 | 对上次的合并查漏补缺 | 2016-09-10 18:31:38 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 40523db212 | 翻译完了《Angular模块》 | 2016-09-10 18:01:58 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | f9ed4402e4 | 翻译了一部分ngModule 更新README | 2016-09-09 20:49:37 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 969da7d321 | Merge remote-tracking branch 'origin/master' # Conflicts:
#	README.md
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/homepage-hello-world/ts/index.1.html
#	public/docs/_examples/homepage-tabs/ts/index.1.html
#	public/docs/_examples/homepage-todo/ts/index.1.html
#	public/docs/_examples/systemjs.config.plunker.build.js
#	public/docs/_examples/systemjs.config.plunker.js
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.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/dependency-injection.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/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/features.jade
#	public/resources/js/directives/live-example.js
#	tools/plunker-builder/indexHtmlTranslator.js | 2016-09-08 17:20:01 +08:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 48a30534b3 | docs(ngmodule): drop '_' in  '_@NgModule' (#2217) | 2016-08-31 18:15:53 -07:00 |  | 
			
				
					| 
							
							
								 Kapunahele Wong | 2ec07472ea | Guide & Features edits (#2180) * Guide & Features edits
* PR updates & Architecture edits
* a couple we -> you updates
* architecture edits
* copy edits in arch., index, npm-packages
* few copy edits
* some chapter -> page changes | 2016-08-29 08:37:39 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | e25a1111e0 | docs(ngmodule): add plunker images (#2209) | 2016-08-27 00:45:25 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 1d44511bb4 | 增加备案号 | 2016-08-27 07:57:43 +08:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 320920e1fd | docs(ngmodule): replace export defaultwith explicit export (#2206)Because AoT won't support `export default` for RC6. | 2016-08-26 13:17:05 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 094f63aaf9 | docs(ngmodule): improved NgModule summary description closes #2203 | 2016-08-26 12:38:15 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 8e15829189 | docs(ngmodule): fixes for defects discovered by John Papa (#2197) includes splitting FAQs into its own cookbook. | 2016-08-25 19:12:15 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 8bda4abe7f | docs(ngmodule):  clarity: FormModule is not in imports array (#2195) | 2016-08-25 11:06:28 -07:00 |  | 
			
				
					| 
							
							
								 Jesús Rodríguez | 5b8df3494a | chore: add embedded plunkers functionality (#2194) | 2016-08-25 10:44:22 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | fc2815ff6d | docs(ngmodule): updates for clarity; breaks out CoreModule | 2016-08-24 23:10:10 -07:00 |  | 
			
				
					| 
							
							
								 Zhimin YE (Rex) | 654030f09d | Merge remote-tracking branch 'remotes/angular.io/master' # Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade | 2016-08-23 14:02:54 +01:00 |  | 
			
				
					| 
							
							
								 Ferdinand Malcher | 7972eccb8d | docs(ngModule): fixed typos closes #2143 | 2016-08-18 23:47:05 -07:00 |  | 
			
				
					| 
							
							
								 Daniel Kuczewski | fb585fae74 | docs(ngmodule): replace "swapped" by "replace" closes #2076 | 2016-08-17 17:53:07 -07:00 |  | 
			
				
					| 
							
							
								 Trotyl Yu | 917bf6f603 | docs(ngmodule): Fix typo closes #2103
Another two `@NgModel` typos. | 2016-08-17 17:45:16 -07:00 |  | 
			
				
					| 
							
							
								 Trotyl Yu | f13b4cc04f | docs(ngmodule): Fix typo closes #2104
Remove redundant `by` word. | 2016-08-17 17:43:17 -07:00 |  | 
			
				
					| 
							
							
								 Trotyl Yu | 51f13b51c9 | docs(ngmodule): Fix typo of unneeded underscore closes #2105
Change the underscore to space since it's normal English statement here. | 2016-08-17 17:41:47 -07:00 |  | 
			
				
					| 
							
							
								 Trotyl Yu | b3244ca496 | docs(ngmodule): Fix typo of italic in backquote closes #2106
The underscore would turn to real underscore character within backquote. | 2016-08-17 17:40:45 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 650a6033a1 | 翻译了一部分ngmodule 把邮箱换成图片,以免收到垃圾邮件 | 2016-08-15 17:38:18 +08:00 |  | 
			
				
					| 
							
							
								 Trotyl Yu | b7e42e2d32 | docs(ngmodule): Fix typo closes #2073 | 2016-08-09 22:33:26 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | aef8aa94aa | docs(ngmodule): add chapter | 2016-08-09 12:31:52 -07:00 |  |