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
74a2657e04
把小抄的历史版本加入版本控制中，以便识别改动
...
把小抄同步到最新版本
2016-11-25 23:00:01 +08:00
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
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
e9d40ab2d7
Update most visible AngularDart pages to 2.0
2016-10-26 14:43:53 +02:00
b1917b800f
chore: remove deprecated liveExample mixins ( #2670 )
...
`+liveExample` mixins were replaced by `<live-example>` directives a
while ago. This cleanup fixes link issues to the plunker under ng2.io.
2016-10-25 20:26:13 +01:00
1fe6434b94
chore: rename Developer Guides to Guide in _data.json( #2563 )
2016-10-19 21:49:54 +01:00
b7d99121e7
fix: _data.json
2016-10-18 11:03:18 +01:00
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
6e7780dee0
docs(dart/router): link to router tutorial instead of TS router docs ( #2529 )
2016-10-03 10:52:03 -07:00
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
56ac24b411
chore: fix broken links on 9/30, mostly API links ( #2520 )
2016-10-01 07:11:21 -07:00
66e3eca8eb
docs(rc4-to-rc5): change cleanup
...
closes #2516
2016-09-30 17:14:55 -07:00
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
64d5b3dc23
docs(dart): upgrade to beta.22 ( #2494 )
...
* update to beta.22
* Dart SDK 1.19.0 or later is required
* minor edits to sample app titles to e2e tests pass
* Renamed “Angular 2” to “Angular” so that shared e2e tests pass.
* Tweak to QS prose.
2016-09-27 13:41:46 -07:00
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
6def9505cc
chore: convert templateUrls to use moduleId where possible. ( #2477 )
2016-09-25 18:51:54 -07:00
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
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
b478aaf7a2
docs(testing): from Igor Minar feedback (Part 1) ( #2450 )
2016-09-23 02:03:20 -07:00
36a3ea2c21
docs(user-input): misc fixes ( #2430 )
...
- Remove nonexistent `<important>` “element” since it causes problems
for ng2.io. This is probably a typo. It was more likely meant to be an
anchor name than an element name.
- Fix two PENDING links.
2016-09-21 08:48:38 -07:00
0f99a7c130
docs(cookbook): don't use shredder on intro page ( #2418 )
...
Also added missing cookbook AoT chapter placeholders for JS and Dart,
fixing 404s mentioned in #2389 .
2016-09-20 10:59:14 -07:00
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
98efced068
docs(lang/latest): parameterize landing page Jade by language ( #2389 )
...
ng2.io preparatory work.
2016-09-19 20:14:31 -07:00
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
e016f3f31e
docs(tutorial): don't use shredder for intro page ( #2388 )
...
An initial multilang cleanup for ng2.io
2016-09-19 16:56:17 -07:00
d26007aa67
docs: fix {ts,dart,js}/latest/_data.json ( #2387 )
...
* docs: fix {ts,dart,js}/latest/_data.json
Fixes #2384 .
Fixes #2385 .
* post-review updates
Addressing #2407 .
2016-09-20 00:52:41 +02:00
e36f0a4b1a
更新了小抄
2016-09-18 11:14:15 +08:00
ba3152bb88
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_includes/_hero-home.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/guide/style-guide.jade
2016-09-17 12:01:41 +08:00
e2ec60d8dd
udpate colors and contrast for accessibility improvements
2016-09-16 15:58:20 -07:00
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
65db6b9268
design(style): Restyle changes from Alex
2016-09-14 17:18:55 -07:00
1fb488b4ec
docs: delete forms- and router-deprecated, jade + examples ( #2328 )
2016-09-13 18:49:51 -07:00
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
01b211193c
docs(browser-support): edits ( #2299 )
2016-09-09 22:21:40 -04:00
d4a641e553
docs(browser-support): document browser support and polyfills ( #2244 )
2016-09-09 10:02:02 -07:00
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
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
ec076f842e
[WIP] chore(dart): update to beta.21 ( #2280 )
2016-09-07 16:52:04 -07:00
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
907f848c95
docs(toh-6): refactoring of 'add, edit, delete heroes' ( #2170 )
...
* docs(toh-6/dart): refactoring of 'add, edit, delete heroes'
Refactoring of "add, edit, delete heroes" section of toh-6 from one big
bottom-up step into small independent feature slices, where the user
achieves a "milesone" (i.e., can run the full app) after each feature
section. The section rewrite is shorter and offers a better UX.
Other simplifications:
- Error handling is consistent: in the hero service we log to the
console, everwhere else we just let errors bubble up.
- Hero service methods renamed based on function (create, update)
rather then lower-level implementation (post, put).
- @Output properties have been eliminated (since they weren't
explained).
E2E tests now pass on both the TS and Dart sides.
* docs(toh-6/ts): refactoring of 'add, edit, delete heroes'
Refactoring of "add, edit, delete heroes" section of toh-6 from one big
bottom-up step into small independent feature slices, where the user
achieves a "milesone" (i.e., can run the full app) after each feature
section. The section rewrite is shorter and offers a better UX.
Other simplifications:
- Error handling is consistent: in the hero service we log to the
console, everwhere else we just let errors bubble up.
- Hero service methods renamed based on function (create, update)
rather then lower-level implementation (post, put).
- @Output properties have been eliminated (since they weren't
explained).
E2E tests now pass on both the TS and Dart sides.
Post-Dart-review updates included.
* docs(toh-6): ward tweaks
2016-08-26 14:57:45 -07:00
5b09914550
chore: better compression of images using zopfli
...
closes #2196
2016-08-26 10:19:12 -07:00
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
014883d074
docs(*): fix links to Dart API entries ( #2185 )
...
* docs(*): fix links to Dart API entries
* post-review updates
2016-08-24 14:46:06 -07:00
654030f09d
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt2.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
2016-08-23 14:02:54 +01:00
fcaf8fa365
docs(forms): add link to Dart sample ( #2176 )
...
Contributes to #1598 .
Also:
- Trimmed trailing whitespace.
- Fixing user-input (since we don’t need the “Run the” in the link).
2016-08-22 15:41:13 -07:00
9b3614d151
docs(user-input): add link to Dart sample ( #2175 )
...
Contributes to #1598 .
2016-08-22 15:15:30 -07:00
f0daf5d238
docs(lifecycle-hooks): post-RC5 Dart resync ( #2141 )
...
* lifecycle-hooks: copy latest to cache
* docs(lifecycle-hooks): post-RC5 Dart resync
- TS prose: removed mention of `routerOnActivate` which no longer
exists in the new router.
- TS improvements to the sample code have also been propagated to the
Dart sample.
Contributes to #2077 .
E2E tests pass now.
* post-review updates
2016-08-19 15:07:30 -07:00
0a631087fa
docs(dart): upgrade to beta.20 ( #2142 )
2016-08-18 22:47:52 -07:00
08dec19447
docs(glossary): general cleanup and fix links ( #2100 )
...
* glossary: replace cached by latest before edits
* docs(glossary): general cleanup and fix links
This commit addresses issues with the glossary for all languages (JS, TS, Dart).
Fixes #1123 , #1838 , #2036 .
This was originally started as post-RC5 Dart resync, but since mixing Harp partials with Jade mixins can be problematic, this commit does a general cleanup of the 3 x 2 = 6 glossary files (found in `{ts,js,dart}/latest/{.,guide}`).
This commit builds upon #2098 (which created the first `ts/_cache` copy of the glossary), but doesn't really depend on it.
* post-review updates
* post-review updates
2016-08-17 17:50:42 -07:00
rexebin
Zhicheng Wang
Yang Lin
Zhimin YE
Kathy Walrath
Patrice Chalin
Eric Jimenez
Ward Bell
Jesús Rodríguez
Alex Wolfe
Marc Laval
Drew Hintz