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
AlexanderLukin
e9bc8c0327
docs(upgrade): change dot to comma ( #3337 )
2017-03-04 12:45:31 +01:00
Ryan Waskiewicz
d954c263ca
docs(upgrade): fix 'resulit' typo ( #3294 )
...
Fix 'resulit' typo in component downgrade section
2017-02-27 11:38:34 +01:00
Zhicheng Wang
23384e2609
fix: some leaks
2017-02-26 23:56:02 +08:00
Zhicheng Wang
7711fa6557
不再使用li进行切换,而是全面转换到li内嵌p元素
2017-02-26 21:44:00 +08:00
Zhicheng Wang
cb17c8afe3
把Angular 2替换为Angular
...
把Angular 1替换为AngularJS
2017-02-26 17:12:55 +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
Dmytro Yarmak
1f20310ed3
docs(upgrade): Fix typos in AngularJS versions (1.5 and 1.x) ( #3239 )
2017-02-14 11:58:32 -08:00
Filipe Silva
7decccfe1b
docs(upgrade): update NgUpgrade with AoT, router, unit tests ( #2803 )
...
Followup from #2781
2017-02-13 16:45:37 +00:00
Jonathan Persson
747807e250
docs(upgrade): add missing word ( #3125 )
2017-02-03 18:25:13 +01: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
Rasmus Reimer
5c19f174f1
docs(upgrade): rename Angular 2 to Angular ( #3169 )
2017-01-31 14:42:47 +01:00
Jesús Rodríguez
b968cabe34
chore: rename files in ngUpgrade ( #3146 )
2017-01-26 15:24:10 +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
Chris Antaki
02f2818f2d
docs(upgrade): fix a few typos ( #2955 )
2016-12-10 19:08:50 +01:00
rexebin
26100f95f6
搭建 -> 搭建本地开发环境
2016-11-27 10:38:15 +00:00
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
Rex YE
7f022c153b
fix aot-compiler, router and upgrade
2016-11-22 15:21:36 +00:00
Yang Lin
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
Ward Bell
ec2e6cb2c7
[WIP] docs(quickstart): QuickStart reboot ( #2762 )
2016-11-21 17:36:16 -08:00
Ward Bell
a7525721c0
Revert "[WIP] docs(quickstart): QuickStart reboot ( #2762 )"
...
This reverts commit 8ccc33e6ffacd7a0acdfc49aab2e6fdecf627fa9.
2016-11-21 17:29:00 -08:00
Ward Bell
8ccc33e6ff
[WIP] docs(quickstart): QuickStart reboot ( #2762 )
2016-11-21 17:13:21 -08:00
Patrice Chalin
061e50fa06
docs: adjust page heading levels ( #2813 )
...
* docs: adjust page heading levels
Only the page TOC should be at heading level 1. All other headings
should start at level 2. This commit also removes duplicate headings,
in continuation of #2796 .
(This fix is necessary to support an auto-TOC feature.)
2016-11-16 10:02:31 -08:00
Patrice Chalin
0dfda08306
docs: in links use href=foo#bar not foo#!#bar ( #2807 )
2016-11-15 15:36:34 -08:00
Filipe Silva
b87a0ea9be
elaborate upgraded component alert
2016-11-14 19:07:06 +00:00
Filipe Silva
59c9a6f3bc
update e2e prose
2016-11-12 22:21:35 +00:00
Filipe Silva
0985055d2f
update phonecat-final prose
2016-11-12 22:09:23 +00:00
Filipe Silva
8f23969bc5
update phonecat-hybrid service and components
2016-11-12 21:55:20 +00:00
Filipe Silva
654f6cf2a2
update phonecat-hybrid bootstrap prose
2016-11-12 21:16:22 +00:00
Filipe Silva
4ac5e60522
improve angular1 type declaration in hybrid apps
2016-11-12 16:06:02 +00:00
Filipe Silva
8e27ff9162
rename upgrade-adapter example to upgrade-module
2016-11-12 15:31:40 +00:00
Filipe Silva
37b57fa9bb
update upgrade-adapter's prose
2016-11-12 15:27:51 +00:00
Zhimin YE
93f08c3723
minor fixes for dynamic forms,
...
form-validation
upgrade
2016-11-04 12:41:10 +00:00
Zhimin YE
4578087fa5
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# README.md
# harp.json
# public/_includes/_hero-home.jade
# public/docs/_examples/quickstart/ts/systemjs.config.1.js
# public/docs/dart/latest/_util-fns.jade
# public/docs/dart/latest/api/_data.json
# public/docs/dart/latest/api/index.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/component-communication.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/change-log.jade
# public/docs/ts/latest/guide/npm-packages.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/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/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
Server Communication and Visual studio 2015 require further merging.
2016-11-03 15:38:23 +00: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
Zhimin YE
0741e1f058
fix: upgrade example
2016-10-18 15:00:32 +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
Zhicheng Wang
78418f4d3c
调整additional的翻译
2016-10-06 19:38:32 +08:00
Zhicheng Wang
dca47cbb1a
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/_examples/quickstart/ts/package.1.json
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/upgrade.jade
2016-10-02 10:39:25 +08:00
Ward Bell
56ac24b411
chore: fix broken links on 9/30, mostly API links ( #2520 )
2016-10-01 07:11:21 -07:00
Jesús Rodríguez
66c630df99
docs(upgrade): update to latest release + tweaks ( #2460 )
2016-09-27 01:22:38 -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
fdf517ee6b
docs(upgrade): temporary fix broken regions ( #2424 )
2016-09-21 14:53:43 +02:00
Zhimin YE (Rex)
b74b446b2c
fix: upgrade 1 example error.
2016-09-19 17:06:50 +01:00
Zhicheng Wang
6f6f89ed9c
把所有“内建”改为“内置”
2016-09-17 11:46:17 +08:00
Zhicheng Wang
50f73986be
翻译完了NgModule FAQ
...
少量错别字修改
2016-09-17 11:45:56 +08:00
Zhicheng Wang
2a1c3626c5
去掉了大部分儿化音
...
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhimin YE (Rex)
873eea9e7e
review: component-communication, testing, upgrade: fixes.
2016-08-16 14:29:37 +01:00