Commit Graph

82 Commits

Author SHA1 Message Date
Zhicheng Wang f5c85b3e82 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_scripts-include.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	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/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.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/appmodule.jade
#	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/component-styles.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/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/learning-angular.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/pipes.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/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.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/_data.json
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.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
#	public/events.jade
#	public/news.jade
#	public/presskit.jade
2017-04-15 15:34:47 +08:00
Ward Bell a56c4a0b08 chore(aio): blank line before each list-item; - becomes * (#3481) 2017-04-01 00:25:27 +02:00
Zhicheng Wang e281ece936 fix: 修订完了漏翻的提示信息 2017-03-03 17:12:41 +08:00
Zhicheng Wang 89adb52815 翻译完了CLI QuickStart 2017-02-26 17:07:12 +08:00
Zhicheng Wang 6af595d7bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/dart/latest/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	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/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
#	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/component-styles.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/hierarchical-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/pipes.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/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.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/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.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
#	public/events.jade
#	public/presskit.jade
#	public/resources/js/directives/cheatsheet.js
2017-02-26 15:39:42 +08:00
Filipe Silva 1101f07ef2 refactor: add src folder (#3171)
* boilerplate, gulpfile, quickstart

* move ts files up to cookbooks

* move rest of ts files

* fix tsconfig, default build task, json file

* fix js examples

* fix webpack example

* remove a2docs.css references

* fix aot examples

* fix webpack run task

* fix cb-i18n

* fix upgrade examples

* fix unit tests

* fix comment in deployment index

* removed unused typings.json

* fix plunkers

* fix js example paths

* fix ts quickstart/setup prose

* add src folder note to setup

* broadly replace app/ -> src/app/

* broadly replace main.ts

* broadly replaced index.html

* broadly replace tsconfig

* replace systemjs

* fix filetrees

* Minor prose fixes to aot, i18n cookbooks

* remove char harp was complaining about

* update new reactive forms example

* fix quickstart jade error

* fix mistakes uncovered by CI

* fix bad filename errors

* edit style guide 04-06 rule to use src

* add changelog

* Incorporate Jesus's feedback

* fix snippet headers in toh1/2

* chore: tweak changelog and setup text
2017-02-02 19:38:17 +01:00
Ward Bell de4903be56 chore: Angular 1 -> AngularJS / Angular 2 -> Angular (#3143)
* chore: Angular 1 -> AngularJS / Angular 2 -> Angular

* Jesus' tweaks
2017-01-26 12:26:11 +01:00
Filipe Silva 0143d8f454 feat(cli-quickstart): add updated cli-quickstart (#3112)
* feat(cli-quickstart): add updated cli-quickstart

* incorporate Ward's feedback
2017-01-23 23:44:55 +00:00
Ward Bell 79dc1f2dc8 chore: use common instructions for popping out plunker window-button (#2886)
To see the browser title or address bar changes.
Instructions are a little more complicated when the plunker is in embedded style
2016-11-28 21:23:28 -08:00
rexebin 7d5e2cf412 Merge remote-tracking branch 'angular.io/master' into merge-review-rex
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-11-05 14:08:21 +00:00
Alex Wolfe c6cec50a0a updates to improve search results in Swiftype 2016-11-01 13:40:25 -07: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
Alex Wolfe 5732b07423 Upgrade swiftype to 2.0 library and added a results page for searches 2016-10-12 10:01:19 -07:00
Jesús Rodríguez 7c98d16279 chore: add the styleguide back (#2557) 2016-10-06 17:40:01 -04:00
rexebin 6a3f9614d0 remove 一个 2016-09-25 19:58:46 +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
Ward Bell 03680e23bb chore: more "angular2" to "angular" cleanup (#2417) 2016-09-20 11:37:16 +02:00
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Patrice Chalin 0c678c2355 docs: use Jade include rather than Harp partial (#2392)
No net effect on the generated docs.
Preparatory work for ng2.io.
2016-09-19 20:08:03 -07:00
Alex Wolfe 8b7c3b6e70 update title on sidenav (#2386) 2016-09-17 23:52:46 +02:00
Zhicheng Wang 1842c2a28a 移除了左侧菜单中的双语,以提高加载速度 2016-09-17 12:56:35 +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
Alex Wolfe 65db6b9268 design(style): Restyle changes from Alex 2016-09-14 17:18:55 -07:00
Zhicheng Wang fb22c0556c 内容微调 2016-06-29 13:11:23 +08:00
Zhicheng Wang 7202fa6cb4 bugfix: 自动加空格时没有忽略html标签,导致界面混乱 2016-06-19 19:31:02 +08:00
Zhicheng Wang 06b5689842 添加了一个鸣谢清单 2016-06-19 17:17:31 +08:00
Zhicheng Wang d46b4911e6 根据Hantsy的意见,把所有“API参考”改为“API参考手册”
为非对照模式的中文添加translated-cn类,以便自动加空格
2016-06-19 17:04:46 +08:00
Zhicheng Wang 0aa207bbac Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
2016-06-19 10:17:03 +08:00
Naomi Black da3d8f7f73 style(images): add image best practices to styleguide doc 2016-06-16 16:06:13 -07:00
Zhicheng Wang bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhimin YE (Rex) 72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-01 09:51:27 +01:00
Vikash 8569479423 docs: fix numerous typos in many doc files.
closes #1509
2016-06-01 01:08:56 -07:00
Zhicheng Wang c9ff72d31a 把“开发人员指南”批量改名为“开发指南”,前者读起来太啰嗦 2016-05-26 19:20:43 +08:00
Zhimin YE (Rex) 17d6eeb1e2 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
2016-05-25 11:13:25 +01:00
Zhicheng Wang 335ac9d0a3 全部“烹饪书”改名为“烹饪宝典” 2016-05-22 19:26:23 +08:00
Ward Bell 60eeb0123a docs(typings): update typings chapter + update lingering old package references 2016-05-21 16:26:54 -07:00
Zhicheng Wang 86d151c40e 把QuickStart改成“快速起步” 2016-05-18 13:30:07 +08:00
Zhicheng Wang 274bfc1202 把“Cookbook”翻译成中文。
基础知识首页一审完毕。
2016-05-13 18:15:42 +08:00
Zhicheng Wang a2d6add5fe 翻译了大部分“模板语法”章 2016-05-08 21:00:37 +08:00
Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	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/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade
2016-05-03 22:33:20 +08:00
Eric Jimenez 8f158f2241 docs(sidenav reorg): remove glossary and cheatsheet from REFERENCE. Move glossary to BASICS. Rename REFERENCE to API REFERENCE 2016-04-25 14:10:57 -07:00
Zhicheng Wang b86aa26da9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_includes/_main-nav.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/_includes/_side-nav.jade
2016-04-23 15:13:58 +08:00
Eric Jimenez b130056613 docs(sidenav): Restylize sidenav 2016-04-22 14:56:43 -04:00
Zhicheng Wang bc9f46722f 教程第五章翻译了多一半儿,把黑板报批量改为仪表盘,把英雄之旅批量改为英雄指南 2016-04-17 23:31:22 +08:00
Zhicheng Wang 2587cf0105 完成了各种公共页面的汉化 2016-04-13 08:53:17 +08:00
Ward Bell 1a8a2d7d90 docs(api): fix api nav issue #927
closes #932
2016-03-08 10:46:03 -08:00
Ward Bell b0f1f3a4b8 docs: simplify left nav selection/scroll
also added some blog posts to resources
2016-03-04 23:54:44 -08:00
Ward Bell bf3ed182a7 docs: left nav is driven by _data.json files 2016-03-04 19:54:27 -08:00
Josh Otis 746a6649b2 chore: new flat left navigation panel (all language tracks) 2016-03-03 04:51:52 -08:00
Ward Bell 95c34d27bc docs: temporary TS-referencing chapters for gaps in JS/Dart
Also displays styleguide at language level
Fragmented glossary for JS & Dart
2016-03-01 11:22:04 -08:00