iSharkFly-Docs/Angular-Docs-Cn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,997 Commits 5 Branches 0 Tags
aa2d4e629fced5bca22ebf244fc1fba8747bb28a
Commit Graph
97 Commits
Author SHA1 Message Date
Zhimin YE b7d99121e7 fix: _data.json 2016-10-18 11:03:18 +01:00
rexebin ce3930b2c0 Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.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/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
 2016-10-17 22:48:18 +01:00
Ward Bell ec1c8281e2 docs(change-log): add documentation change log 2016-10-06 13:21:31 -07:00
Ward Bell e6199a8dfb docs(i18n): add internationalization (i18n) guide (#2491) 
* docs(i18n): add internationalization (i18n) guide

* docs(cb-i18n): revamped to System.import the translation file
 2016-09-29 11:15:55 -07:00
Zhimin YE (Rex) a18aa9ec01 Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-09-26 15:14:39 +01:00
Kapunahele Wong 6c7f330620 docs(Displaying Data): copy edits (#2435) 2016-09-23 16:53:50 -07:00
rexebin a59b1b60ee Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/testing.jade
 2016-09-23 23:22:42 +01:00
Ward Bell b478aaf7a2 docs(testing): from Igor Minar feedback (Part 1) (#2450) 2016-09-23 02:03:20 -07: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
Brandon Roberts c15a68e591 docs(router): Added and organized more router dev guide content 
Moved all heroes functionality into milestone 2
Crisis Center initial functionality is milestone 3
Admin feature module as milestone 4 including route guard examples
Updated milestone 5 to lazy load admin feature module
Added examples for CanLoad, CanActivateChildren guard, component-less routes
Added section on explanation of ActivatedRoute
Added section on animating route components
Added section on relative navigation
 2016-09-14 13:46:16 -07:00
Zhicheng Wang e71848b664 翻译完了浏览器支持 2016-09-14 13:12:05 +08:00
Ward Bell 1fb488b4ec docs: delete forms- and router-deprecated, jade + examples (#2328) 2016-09-13 18:49:51 -07:00
Zhicheng Wang 3d40a26655 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/quickstart.jade
 2016-09-11 21:20:58 +08:00
Zhicheng Wang 446acfd81b 对上次的合并查漏补缺 2016-09-10 18:07:25 +08:00
Marc Laval d4a641e553 docs(browser-support): document browser support and polyfills (#2244) 2016-09-09 10:02:02 -07:00
Patrice Chalin 562e99463a chore(cheatsheet): fix double banner issue (#2293) 
Each page is designed to have a single banner; adjust the cheatsheet to
follow this convention. Also eliminate the article nested within the
`l-conent` div.

Propagated changes/cleanup to JS and Dart.
 2016-09-08 15:01:39 -07: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
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
Zhicheng Wang 94aa3664ab Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	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/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.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
 2016-08-12 07:57:51 +08:00
Ward Bell aef8aa94aa docs(ngmodule): add chapter 2016-08-09 12:31:52 -07:00
Peter Bacon Darwin d79adb2422 docs(rc5): update docs and plunkers for rc5 2016-08-09 11:48:07 -07:00
Zhicheng Wang 221f00c8b7 根据Hongbo-Miao的建议修正了一些问题 2016-07-14 16:48:52 +08:00
Zhicheng Wang 21fe9dc1d2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.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/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
 2016-07-01 08:24:23 +08:00
Naomi Black 8548d3cb06 chore(nav): update left nav to add glossary back 2016-06-28 13:58:30 -07:00
Zhicheng Wang aca0989f52 调整导航结构 2016-06-28 13:32:08 +08:00
Zhicheng Wang d7a71ccf59 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
 2016-06-28 09:40:49 +08:00
Zhicheng Wang 9f2c4270e1 调整了导航菜单，直接显示新版 2016-06-23 09:22:50 +08:00
Naomi Black 1149816dce chore(nav): a missing bit of metadata for the forms guide 2016-06-22 17:53:17 -07:00
Zhicheng Wang bb9adc3eba Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
 2016-06-23 08:48:57 +08:00
Naomi Black 987fbad0f3 chore(nav): clean up left nav titles and alpha-sort them 2016-06-22 17:13:48 -07:00