Commit Graph

424 Commits

Author SHA1 Message Date
Zhicheng Wang cb17c8afe3 把Angular 2替换为Angular
把Angular 1替换为AngularJS
2017-02-26 17:12:55 +08:00
Zhicheng Wang 9b69fbd7b2 修正几个issue 2017-02-26 16:00:32 +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
Marcin Mazurek 9d965a700d docs(forms): remove unnecessary step of installing Bootstrap (#3104) 2017-01-16 22:45:30 -08:00
Naomi Black 7429150632 chore(version): bump the version for the 2.4 docs update 2016-12-22 20:06:34 -08:00
Filipe Silva 1a5f4f4907 chore: update to 2.3.0 (#2942)
* chore: update to 2.3.0

* add 2.3.0 versions in package.json

* update _data.json

* update angular-in-memory-web-api
2016-12-08 00:10:39 +00:00
Patrice Chalin 4a0c3d79b7 docs(api/cheatsheet): show ng version + lang in page header (#2918) 2016-12-01 19:47:58 +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 d9c651fa47 fix api display 2016-11-26 14:53:33 +00:00
Zhicheng Wang 74a2657e04 把小抄的历史版本加入版本控制中,以便识别改动
把小抄同步到最新版本
2016-11-25 23:00:01 +08: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 8ccc33e6ff.
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 2026e5026d docs: fix remaining broken links (#2832)
* docs: fix remaining broken links In particular, don’t show the language dropdown for the docs change-log page (since JS and Dart don’t have a change log). Together with #2830, this fixes #2150

* ignore invalid link from about bios
2016-11-18 21:24:35 -08:00
Filipe Silva 17c7e15467 chore: update to 2.2.0 (#2797) 2016-11-15 00:11:37 +01:00
Ward Bell 33b61977b2 docs(ts-to-js): ward's edits (incomplete) 2016-11-11 19:44:17 -08:00
Filipe Silva 12eb19fa3c feat(cb-ts-to-js): add es6 examples
update docshredder to shred .es6
optimized focus gulp task
convert imports and metadate sections
add DI section
add host and query metadata section
add intro
fix capitalization and grammar
2016-11-11 19:44:17 -08:00
Patrice Chalin 5e79a1a2b5 chore: fix broken links and transform API links for dart docs
- Dart non-api doc pages w/ links to API entries will now have those
links translated from a TS API reference URL to a Dart API reference
URL.
- Created and ran a link checker to verify that all such links to API
entries refer to Dart.
- Fixed links to pages that have moved:
 - JS & Dart: `i18n` is under now `cookbook` not `guide`
 - Dart: testing page is now directly under guide.

Contributes to #1895
Fixes #2273
2016-11-07 13:24:20 -08:00
Ward Bell a46cba06f0 docs(quickstart): app says "Hello Angular!" instead of "My first..." (#2760) 2016-11-05 13:12:11 -07: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
Eric Jimenez 1fe6434b94 chore: rename Developer Guides to Guide in _data.json(#2563) 2016-10-19 21:49:54 +01:00
rexebin 9d9b00b3b9 patch: ts-to-js, component-communication, set-document-title and visual-studio. 2016-10-18 19:53:12 +01:00
Manohar Poreddy 296045ad66 docs(quickstart.js): fix typo (#2614)
declarations instead of declaration
2016-10-18 15:09:49 +02:00
Zhimin YE b7d99121e7 fix: _data.json 2016-10-18 11:03:18 +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
Jesús Rodríguez a63c75cc18 chore: release 2.1.0 (#2589) 2016-10-12 23:41:42 +02:00
Naomi Black 6ca91f710d api(cleanup): Remove preview from the API reference banner 2016-10-07 14:32:48 -07:00
Naomi Black b6e5dc9eec docs(version): fix the version number on the docs homepage 2016-10-06 12:42:33 -07: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 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
rexebin f7c60a07df fix: change all 他 > 它 2016-09-25 19:50:45 +01:00
Ward Bell ac0e82cda7 docs(js/guide): don't use shredder & _data.json fixes (#2467)
replay Patrice's PR #2448
2016-09-24 14:30:06 -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
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 b478aaf7a2 docs(testing): from Igor Minar feedback (Part 1) (#2450) 2016-09-23 02:03:20 -07:00
Tomas Echeverri Valencia c8121d61dd docs(quickstart): Change Npm to npm (#2398) 2016-09-21 11:32:36 -07:00
Patrice Chalin 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
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
Patrice Chalin 98efced068 docs(lang/latest): parameterize landing page Jade by language (#2389)
ng2.io preparatory work.
2016-09-19 20:14:31 -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
Patrice Chalin 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
Mike Reid d07d42873a docs(devguide): add missing app.module.js source in Basics > Forms (#2342)
Add missing app.module.js source example in Basics > Forms dev guide
- File is missing for JavaScript, but present for TypeScript
2016-09-19 09:41:31 -07:00