Commit Graph

27 Commits

Author SHA1 Message Date
rexebin 9d9b00b3b9 patch: ts-to-js, component-communication, set-document-title and visual-studio. 2016-10-18 19:53:12 +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 56ac24b411 chore: fix broken links on 9/30, mostly API links (#2520) 2016-10-01 07:11:21 -07:00
rexebin f7c60a07df fix: change all 他 > 它 2016-09-25 19:50:45 +01:00
rexebin d9af771f8d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.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/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/support.jade
2016-09-23 22:13:02 +01:00
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Jesús Rodríguez 730c93b5bd docs(ts-to-js): change angular2 to @angular (#2403) 2016-09-19 20:18:20 -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
Filipe Silva 0c962712b3 chore: update to rc6 (#2177) 2016-08-31 18:08:57 -07:00
Zhicheng Wang d034bc33c8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.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/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-06 19:52:08 +08:00
Brandon Roberts b93fb12fea chore(examples): Updated live example links to use helper directive
closes #2005
2016-08-05 16:41:45 -07: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
priestch b21c90c358 fix(doc): fix 404 problem of some api url 2016-06-28 22:25:24 -07:00
Zhicheng Wang bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang eafa80c89b 校对了ts-to-js部分 2016-06-11 21:59:43 +08:00
Zhicheng Wang 164244d77a 修正了api的链接(仅中文版) 2016-06-10 14:45:12 +08:00
Zhimin YE (Rex) f694255b7b review of component-relative-paths.jade 2016-06-09 14:34:12 +01:00
Zhimin YE (Rex) 734e178382 minor change to ts-to-js.jade. 2016-06-09 14:19:16 +01:00
Zhimin YE (Rex) 8ae3d52cbc minor change to ts-to-js.jade review. 2016-06-09 14:18:27 +01:00
Zhimin YE (Rex) c36425eec7 ts-to-js.jade review is done. 2016-06-09 12:48:31 +01:00
Zhicheng Wang 940d0d9c22 开发指南-生命周期钩子 翻译完毕 2016-05-26 19:02:38 +08:00
Rex Ye 78fc8d1e0f ts-to-js.jade draft translation is done. 2016-05-23 14:34:18 +01:00
Zhicheng Wang 335ac9d0a3 全部“烹饪书”改名为“烹饪宝典” 2016-05-22 19:26:23 +08:00
Rex Ye fd8e9c4729 ts-to-ts.jade 部分翻译 2016-05-16 15:15:34 +01:00
Rex Ye 74c5868747 修正pattern的翻译,开始js-to-ts翻译。 2016-05-16 11:20:52 +01:00
Ward Bell 3d5302adce chore: update to rc.0 2016-05-02 19:57:28 -07:00
Tero Parviainen 7f11a6ce05 docs(cb-ts-to-js): add cookbook about applying TypeScript examples to ES5
closes #893
2016-03-27 23:36:51 -07:00