honeymoose/Angular-Cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,295 Commits 5 Branches 0 Tags
5cfe4fe4df2c8d176a514b251e5ae692c287f580
Commit Graph
506 Commits
Author SHA1 Message Date
Zhimin YE (Rex) 0e14785cba Merge remote-tracking branch 'angular.io/master' 
# Conflicts:
#	README.md
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-07-15 15:52:34 +01:00
Chris Grieger 08d051d2f6 docs(testing): refer to 'lite-server' instead of 'live-server'. 
closes #1737
Since the QuickStart uses 'lite-server', this should also be used for
the testing guide.
 2016-07-14 14:39:59 -07:00
Foxandxss abd860c3ca chore: update testing example to RC4 
closes #1839
 2016-07-14 14:11:02 -07:00
Foxandxss 8ddc93d211 docs(style-guide): create a route redirection 
closes #1857
 2016-07-14 14:09:19 -07:00
Thomas Shafer b669e30187 docs(toh-4): change var keyword to const for HEROES constant 
closes #1858
HEROES is a `const` and is defined as a `const` originally: https://github.com/angular/angular.io/blob/master/public/docs/_examples/toh-2/ts/app/app.component.ts#L10
 2016-07-11 22:07:41 -07:00
Sekib Omazic f15b40f513 fix(package.webpack.json): add angular2-template-loader 
closes #1864
Add missing angular2-template-loader dependency
 2016-07-11 22:02:20 -07:00
Foxandxss 961f5c8994 chore: make animation test wait a bit longer 
closes #1844
 2016-07-11 22:00:04 -07:00
Brandon Roberts 5104470558 docs(router): Removed refs to deprecated router; lowerCamelCase constants 
closes #1834
 2016-07-11 21:44:12 -07:00
Patrice Chalin 761f857f13 docs(architecture/dart): proofread, updated Dart/TS app and jade 
closes #1807
- e2e tests now also cover the tax calculator.
- Dart app updated to match TS (it had no sales tax calculator).
- TS sample source cleanup (e.g. removed many unnecessary `docregions`).
- Prose updated to include @kwalrath's revisions from a while ago, Ward's comments, and
some of my edits as well.

Contributes to #1598 and #1508.
 2016-07-11 20:35:06 -07:00
Zhicheng Wang 273a0fd1e8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/webpack.jade
 2016-07-11 08:32:56 +08:00
Ward Bell 0664a271ba docs(style-guide): spell const variables in lower camel case 
Changes previous guidance on const which insisted on UPPER_SNAKE_CASE
 2016-07-07 22:41:04 -07:00
Ward Bell 2c5f0dbd9a docs(router): more little fixes from #1808 2016-07-07 18:51:36 -07:00
Patrice Chalin 801ac76da0 docs(guide/displaying-data): proofread (#1819) 
* docs(displaying-data/dart): proofread

- Dart prose simplified by removing discussion of "additions to
pubspec.yaml" which are no longer necessary given the current state of
QuickStart.
- E2e suites passed:
  public/docs/_examples/displaying-data/dart
  public/docs/_examples/displaying-data/ts

Contributes to #1598 and #1508.

* docs(displaying-data/ts): proofread

- TS prose updated to include @kwalrath's revisions from a while ago,
with some of my edits as well.
- E2e suites passed:
  public/docs/_examples/displaying-data/dart
  public/docs/_examples/displaying-data/ts

* docs(displaying-data/ts): post-review edits
 2016-07-07 14:00:19 -07:00
Zhicheng Wang 0303a18020 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	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
 2016-07-07 08:15:51 +08:00
Ward Bell d1dd2b82f4 docs(router): changes suggested by Deb Kurata in #1808 2016-07-06 01:11:34 -07:00
Foxandxss da58ff45c7 docs(style-guide): update style-guide samples to use v3 router 
closes #1828
 2016-07-05 23:29:29 -07:00
Foxandxss 341f32d7f6 docs(webpack): add angular2-template-loader 
closes #1825
 2016-07-05 23:25:07 -07:00
Ward Bell e4c5fe32e7 docs(forms): fix import in sample HeroFormsComponent - @angular/common -> @angular/forms 2016-07-04 15:07:12 -07:00
Zhicheng Wang 711a173606 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
 2016-07-03 15:27:10 +08:00
Ward Bell dba3a8f9c9 docs: replace xxx.filter(...)[0] with xxx.find(...) 
see #1801
 2016-07-02 16:13:32 -07:00
Zhicheng Wang 3c5a045633 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
 2016-07-02 19:16:00 +08:00
Foxandxss 1900eb1c70 docs: replace terminal with pathMatch, base href with '/' 
closes #1799
 2016-07-01 16:32:39 -07:00
Patrice Chalin 0ba3d5d8d6 docs(dart/{quickstart,toh-[56]}): fix project names (#1773) 
- Renamed `angular2_getting_started` to `angular2_quickstart` (to match
TS).
- s/-/_/g in project names elsewhere (only toh-5 & -6 needed to be
updated).

Fixes #378.
 2016-07-01 11:05:45 -07:00
Foxandxss 4774f4861e chore: update router to beta 2 2016-07-01 08:00:50 -07:00
Zhicheng Wang 0dd2932a2e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/news.jade
#	public/resources/_data.json
#	public/resources/index.ejs
#	public/resources/js/controllers/resources-controller.js
 2016-07-01 08:38:54 +08:00
Zhicheng Wang 21fe9dc1d2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.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/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
 2016-07-01 08:24:23 +08:00
Patrice Chalin 705d8c50fd docs(security): proofread prose, app now shows good and bad 
- App now shows how Angular handles untrusted URLs and resources
- E2e test covered new functionality
- Copyedits to prose
- Updated provider expressions to use latest syntax

The original security feature tracker:
https://github.com/angular/angular/issues/8511
 2016-06-30 13:04:55 -07:00
Foxandxss 909f230cc7 update router to beta.1 2016-06-30 13:04:04 -07:00
Foxandxss 10de4c5753 update in memory web api 2016-06-30 13:03:44 -07:00
Foxandxss 2379e8b86e update plunkers versions 2016-06-30 12:40:59 -07:00