honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,115 Commits 5 Branches 1 Tag
Commit Graph

689 Commits

Author SHA1 Message Date
rexebin
5c46ddf7a7 Merge remote-tracking branch 'remotes/angular.io/master' into merge-review-rex 
# Conflicts:
#	public/_includes/_hero-home.jade
 2016-11-05 14:23:51 +00:00
rexebin
7d5e2cf412 Merge remote-tracking branch 'angular.io/master' into merge-review-rex 
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-11-05 14:08:21 +00:00
Ward Bell
74ef87feac docs: systemjs.config.plunker -> systemjs.config.web w/ auto-bootstrap (#2756) 
see PR #2756
 2016-11-04 21:59:51 -07:00
Benjamin Dopplinger
83faca0f94 docs(dart): remove unnecessary directives import (#2282) 2016-11-04 09:46:36 -07:00
Ward Bell
fa99a8b0b2 docs(toh-5): dashboard uses [routerLink] bindings #998 (#2718) 
* docs(toh-5): dashboard uses [routerLink] bindings #998
closes #998

* chore: temp add toh-5 to bad-code-excerpt-skip-patterns.txt
 2016-11-03 10:25:01 -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
Ward Bell
ae35f0e017 docs(lifecycle-hooks): SimpleChange -> SimpleChanges #2741 (#2742) 2016-11-02 21:50:38 -07:00
cam73
35d8695752 Removes duplication of head tag in example (#2648) 2016-11-02 15:46:29 -07:00
Filipe Silva
f837330eaf chore: remove inner editorconfig (#2736) 2016-11-02 14:49:51 +01:00
Ward Bell
e9d78133e1 docs(testing): revert to jasmine v.2.4.1 (#2697) 
Bug in Jasmine v.2.5.x.  Stick with v.2.4.1 (as karma-jasmine does) until the following issue is resolved:
https://github.com/jasmine/jasmine/issues/1231

Unfortunately, there is no `@types/jasmine` for v.2.4 but only for v.2.5.
 2016-10-29 23:53:21 -07:00
Ward Bell
7e5f5a25ad docs(testing): fix base setting in karma shims (#2694) 2016-10-29 19:37:27 -07:00
Jesús Rodríguez
323becee32 chore: remove bootstrap package (#2691) 2016-10-29 10:44:57 -07:00
Filipe Silva
c426e57818 fix(e2e): remove invalid syntax usage (#2687) 2016-10-28 01:08:43 +01:00
Zhimin YE
2b9c43471a fix: #105 2016-10-27 16:53:40 +01:00
Filipe Silva
44bbc7776a fix(e2e): fix travis e2e (#2684) 
See angular/webdriver-manager#121
 2016-10-27 15:25:09 +01:00
Steven
2408bb149a fix for #2667 (#2668) 
ported changes made here 541bdc5f63
 2016-10-26 08:31:29 -07:00
Patrice Chalin
197be09785 chore(dart): update to 2.0.0 (#2680) 2016-10-26 16:36:21 +02:00
Kathy Walrath
e9d40ab2d7 Update most visible AngularDart pages to 2.0 2016-10-26 14:43:53 +02:00
Patrice Chalin
cfa7ec76f8 example(dart/toh-5): add extra region for use in API docs (#2664) 2016-10-24 22:33:37 +02:00
Ward Bell
c5a1b3f42a chore(tsconfig): add compileOnSave (#2658) 2016-10-23 00:51:03 -07:00
Filipe Silva
4c85f0a91d chore: update to 2.1.1 (#2650) 2016-10-21 22:31:09 +01:00
Ward Bell
14c01fb651 docs(change-log): notes in-mem-web-api breaking change (#2644) 2016-10-20 19:28:19 -07: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
Ward Bell
870ce124d2 docs(template-syntax): explain basic two-way binding (#2639) 
closes issue #2598
 2016-10-20 10:56:17 -07:00
Ward Bell
c28b003a3c docs(HTTP Client): edit copy to conform to G-doc guidelines. (#2630) 2016-10-19 23:17:50 -07:00
Brandon
2f5306f1b6 docs(router): Added example of feature module pre-loading (#2595) 
* added example of feature module pre-loading
* added transition aliases for route animations
 2016-10-19 22:02:47 -07:00
Torgeir Helgevold
3eb7a41602 docs(aot-cb):bundle in-mem-web-api with esm and umd (#2617) 
s

s
 2016-10-19 21:52:32 -07:00
Jesús Rodríguez
b17c5c0878 docs(webpack): change resolve ordering (#2628) 2016-10-19 11:44:53 +02: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
e503efe8c8 docs(toh5): add moduleId information (#2597) 2016-10-13 16:41:57 -07:00
Jesús Rodríguez
a63c75cc18 chore: release 2.1.0 (#2589) 2016-10-12 23:41:42 +02:00
Torgeir Helgevold
cdfe957ab8 docs(toh-6-aot): add aot to toh-6 (#2496) 
* docs(toh-6-aot): add aot to toh-6

s

s

s

s

s

* docs(toh-6-aot): add aot to toh-6

* docs(toh-6-aot): make aot e2e tests run in the same project
Updates tooling for this purpose and also the prose.
 2016-10-12 01:44:49 -07:00
Ward Bell
2e17d587de docs(toh-5): add AppRoutingModule (#2584) 2016-10-11 16:30:30 -07:00
Ward Bell
61b13c13ec chore: v.2.0.2 + standard MIT licenses property (#2559) 2016-10-06 17:21:05 -07:00
Ward Bell
8710eb052d chore(package.json): rename "angular2-" as "angular-" in name (#2558) 
also ignore a2docs.css
 2016-10-06 16:10:30 -07:00
Filipe Silva
5042b3021c chore(test): add protractor4 (#2233) 
* chore(test): add protractor4

* fix lint, remove boilerplate files, fix less gen

* separate scripts between package.json

* ignore a2docs.css in boilerplate

* remove tslint in _examples
 2016-10-06 15:25:52 -07:00
Tim Xiao
d9416a8ae9 docs: fixed path typo in tutorial(Routing, HTTP) (#2526) 
* Fixed typo in tutorial(Routing)

The path to `app.component.css` should start from current directory, not 'app/', since the file is already in 'app/'

* docs: fixed path error in the tutorial (HTTP)

same problem fixed as commit 917e0ce1c2829224e3ee53a069599fccbc5751a3

* docs: Added moduleId for styleUrls referencing in these two classes
 2016-10-05 16:14:44 -07:00
Brandon
ff118810ff docs(router): Updated routing examples to use routing modules (#2478) 
Simplified routing in tutorial example

Updated ngmodule guide and ngmodule faq with routing module prose
 2016-10-05 14:59:09 -07:00
Chase
7c262ccab5 docs(testing): fix minor typo in DashboardHeroComponent (#2518) 
Fixed minor typo in DashboardHeroComponent
 2016-10-04 15:02:07 +02:00
Maxime
ea45887927 docs(testing): fix typo (#2524) 2016-10-04 14:59:10 +02:00
Ward Bell
a2744e7ece chore: update /quickstart/js/package.1.json (#2534) 
also remove /cb-set-document-title/ts/sample.css
 2016-10-03 17:30:45 -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
ba6b681ed4 docs(i18n): incorporate corrections and feedback from Victor Berchet (#2517) 
See PR #2491
 2016-09-30 19:14:41 -07:00
StdVectorBool
d5eec33960 docs(style-guide): example of underscore prefix to avoid. (#2501) 2016-09-30 23:32:46 +02:00
Zhicheng Wang
54d1be2e5a 把angular2-in-memory-web-api改名为angular-in-memory-web-api 
#84
 2016-09-30 21:38:44 +08:00
Ward Bell
66c567bee5 chore(i18n): correct name of i18n extract command (#2511) 2016-09-29 15:15:33 -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
Patrice Chalin
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
Kevin Leung
5cee3b9b8b * docs(toh-6): update 'let' to 'const' for delete hero (#2355) 
Since the update function does use const url instead of let url,
this seemed like a good consistency to have between similar blocks of code.

* docs(toh-6): update 'let' to 'const' for delete hero
 2016-09-27 12:56:04 -07:00
Ward Bell
9671d99585 chore: update package.json files to latest pkg versions. Use ~ for Ng. (#2490) 
closes #2488
 2016-09-27 12:20:17 -07:00