Yang Lin
|
5a7745fb27
|
Upgrade to 2.2.0
|
2016-11-22 20:07:16 +08: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
|
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 |
Jesús Rodríguez
|
66e3eca8eb
|
docs(rc4-to-rc5): change cleanup
closes #2516
|
2016-09-30 17:14:55 -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 |
Ward Bell
|
6def9505cc
|
chore: convert templateUrls to use moduleId where possible. (#2477)
|
2016-09-25 18:51:54 -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
|
a2a5768982
|
微调
|
2016-09-18 10:03:20 +08:00 |
Zhicheng Wang
|
bd29d09085
|
翻译了一部分未翻译的合并
|
2016-09-16 13:21:27 +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
|
bc804322c4
|
docs(aot): update nav to be consistent with aot hyphenation
|
2016-09-14 10:55:46 -07:00 |
Torgeir Helgevold
|
6813ced018
|
docs(cookbook - aot compiler) (#2161)
docs(cb-aot-compiler): new cookbook on AoT compiler
|
2016-09-14 10:10:04 -07:00 |
Zhicheng Wang
|
446acfd81b
|
对上次的合并查漏补缺
|
2016-09-10 18:07:25 +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
|
f971685a7c
|
docs(cb-form-validation): ward's tweaks
renamed from cb-validation to cb-form-validation
other refactorings and text changes
|
2016-08-30 14:53:23 -07:00 |
Deborah Kurata
|
3b4a5d533d
|
docs(cb-form-validation): create Form Validation Cookbook
|
2016-08-30 14:53:23 -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 |
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
|
fe35bc6c31
|
docs(rc4-to-rc5): New RC4->RC5 migration cookbook.
|
2016-08-09 12:28:25 -07:00 |
Peter Bacon Darwin
|
d79adb2422
|
docs(rc5): update docs and plunkers for rc5
|
2016-08-09 11:48:07 -07:00 |
Zhicheng Wang
|
9c4b801f8a
|
更正一个编译bug
|
2016-08-06 20:17:07 +08: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 |
Torgeir Helgevold
|
daac8fffbe
|
docs(cb-dynamic-forms): update subtitle
closes #2004
|
2016-08-01 12:49:15 -07:00 |
Zhicheng Wang
|
fb22c0556c
|
内容微调
|
2016-06-29 13:11:23 +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 |
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 |
Torgeir Helgevold
|
3cb219c5ab
|
docs(dynamic-cookbook): upgrade to use new forms api
convert exiting to use deprecated name
converted to new api
text
warnings
fix plunker
text
test weak
text
space
text
lint
order
tweak
|
2016-06-20 21:02:28 -04:00 |
Zhimin YE (Rex)
|
466f69d30a
|
Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
# public/docs/ts/latest/cookbook/_data.json
# tools/api-builder/angular.io-package/templates/class.template.html
|
2016-06-15 12:01:54 +01:00 |
Deborah Kurata
|
e7f3fc61ce
|
docs(cb-vs2015) new cookbook for Visual Studio 2015 QuickStart
closes #1502
|
2016-06-13 23:55:14 -07:00 |
Zhicheng Wang
|
335ac9d0a3
|
全部“烹饪书”改名为“烹饪宝典”
|
2016-05-22 19:26:23 +08:00 |
Zhicheng Wang
|
ae3b205c77
|
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/attribute-directives.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/style-guide.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
|
2016-05-21 21:02:15 +08:00 |
Ward Bell
|
f9fea00824
|
docs(component-relative-paths): new cookbook
|
2016-05-20 20:33:38 -07:00 |
Zhicheng Wang
|
f50b34ad4f
|
烹饪书-依赖注入 二审中
|
2016-05-17 20:36:35 +08:00 |
Zhicheng Wang
|
2368b8f4c3
|
文字微调
食谱批量替换为菜谱
|
2016-05-17 15:46:28 +08:00 |
Zhicheng Wang
|
1edea2de82
|
设置标题。
|
2016-05-17 13:22:40 +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 |
Ben Nadel
|
c9d405062d
|
docs(cb-set-document-title): new "Set Title" cookbook chapter
closes #1069
|
2016-04-23 14:56:56 -07:00 |
Zhicheng Wang
|
84e96391ca
|
完成了导航菜单
完成了部分公共页面
完成了部分教程
|
2016-04-13 08:53:17 +08:00 |
Torgeir Helgevold
|
c1f2c397ff
|
docs: add DI cookbook
|
2016-04-05 10:15:18 -07:00 |
Foxandxss
|
3cf4c49504
|
chore: fix typo in ts-to-js intro
closes #1025
|
2016-04-02 14:07:42 -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 |
Torgeir Helgevold
|
db7fba867c
|
docs(cb-dynamic-form): new cookbook on dyn form gen with NgFormModel
|
2016-03-16 04:14:31 -07:00 |
Ward Bell
|
bf3ed182a7
|
docs: left nav is driven by _data.json files
|
2016-03-04 19:54:27 -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 |
Deborah Kurata
|
e78a04522b
|
docs(cookbook/a1-a2): new Angular-1 map to Angular-2 cookbook chapter
|
2016-02-24 11:39:16 -08:00 |
Ward Bell
|
823950b936
|
docs(cookbook/component-communication): clear interval timer in OnDestroy
|
2016-02-22 02:40:57 -08:00 |