 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 |
|
|
Jesús Rodríguez
|
45fec1c135
|
docs(forms): remove deprecated forms notice for js (#2395)
|
2016-09-19 18:39:53 +02:00 |
|
|
Zhicheng Wang
|
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 |
|