Commit Graph

490 Commits

Author SHA1 Message Date
Zhicheng Wang 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
Alex Wolfe 72be55c4d2 chore: more typograhpical fixes (#2352) 2016-09-15 02:35:03 +01:00
Naomi Black 095a36f903 docs(refresh): late bio add and livestream banner 2016-09-14 18:27:02 -07:00
Kapunahele Wong bfc62e0509 chore(bios): adding bio 2016-09-14 18:27:02 -07:00
Alex Wolfe 802bee8d2f fixed headings in api pages 2016-09-14 18:20:48 -07:00
Alex Wolfe 65db6b9268 design(style): Restyle changes from Alex 2016-09-14 17:18:55 -07:00
Georgios Kalpakas c3aa8945fb chore(bios): add bio for gkalpak 2016-09-14 14:38:10 -07:00
Kapunahele Wong 97736ad5ee Security Edits Combined (#2245)
* Security Edits Combined

* Security copy edits

* Fix typo in security

* fixing trailing whitespace
2016-09-14 09:11:53 -07:00
Ward Bell 1da4b1ba9d chore(home): fix joyful-development.png import statement
fixes #2085  Just the linked png, not the svg, jpg, or gif
2016-09-14 08:32:46 -07:00
Ward Bell 07cfce795f docs(testing): testing chapter and samples for RC6 (#2198)
[WIP] docs(testing): new chapter, new samples
2016-09-13 14:39:39 -07:00
Zhicheng Wang 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
Peter Bacon Darwin a2089c5b4f api-builder: render pipes with specialised template 2016-09-09 14:44:46 -07:00
Zhicheng Wang 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
John Papa 58a787a34d green = do (#2257)
blue = consider
red = avoid
light gray = why
2016-09-02 16:41:08 -07:00
Naomi Black 38fe94df81 docs(qs-reboot): edits for the quickstart 2016-09-01 07:10:42 -07:00
Ward Bell 1212b5147f docs(cb-form-validation): add template2 - a step between template and reactive
Raises questions about what really separates Forms from ReactiveForms
2016-08-31 01:15:05 -07:00
Ward Bell 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
Ward Bell e25a1111e0 docs(ngmodule): add plunker images (#2209) 2016-08-27 00:45:25 -07:00
Drew Hintz 5b09914550 chore: better compression of images using zopfli
closes #2196
2016-08-26 10:19:12 -07:00
Jesús Rodríguez 6962f03f30 chore: add _self target to embedded plunkers (#2201) 2016-08-26 10:09:35 -07:00
Jesús Rodríguez 5b8df3494a chore: add embedded plunkers functionality (#2194) 2016-08-25 10:44:22 -07:00
Jesús Rodríguez 40a9b49800 chore: fix live-example for multiple plunkers
closes #2167
2016-08-24 23:36:20 -07:00
Patrice Chalin 2fd85d1adc docs(resources): use ng-href to avoid false broken link reports (#2186) 2016-08-24 14:46:54 -07:00
Zhicheng Wang 94aa3664ab Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	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/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.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
2016-08-12 07:57:51 +08:00
Ward Bell aef8aa94aa docs(ngmodule): add chapter 2016-08-09 12:31:52 -07:00
Zhicheng Wang d034bc33c8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	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/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-06 19:52:08 +08:00
Brandon Roberts b93fb12fea chore(examples): Updated live example links to use helper directive
closes #2005
2016-08-05 16:41:45 -07:00
Zhimin YE (Rex) 60a06e51b9 Merge remote-tracking branch 'angular.io/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-01 09:52:29 +01:00
crisbeto 1e02c4c37c chore(bios): add bio for Kristiyan Kostadinov 2016-07-29 14:48:26 -07:00
Thomas Burleson 486d6c4986 update(bio): improve picture and bio description 2016-07-29 14:48:26 -07:00
Zhicheng Wang e56ea94549 Merge remote-tracking branch 'origin/master' 2016-07-29 08:05:26 +08:00
Eric Jimenez 1e194b1960 change arrow style function to regular function 2016-07-28 13:43:53 -07:00
Zhicheng Wang 7916ec4c8d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-07-26 17:45:25 +08:00
Fatima Remtullah af225701b0 chore: update Loved by Millions image
closes #1951
2016-07-25 10:13:23 -07:00
Zhicheng Wang 4400deeef8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gulpfile.js
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/resources/js/controllers/resources-controller.js
2016-07-24 17:27:48 +08:00
Zhicheng Wang c3b68a6c1b 采纳了几个来自社区的意见 2016-07-22 20:51:32 +08:00
Eric Jimenez 8c1bbbf318 chore: alphabetize entries in resources page. Add margin under frontpage banner 2016-07-19 09:52:25 -07:00
Torgeir Helgevold f50dff818a docs(toh-pt6): add observables to HTTP tutorial chapter
closes #1528
2016-07-18 23:12:44 -07:00
Zhicheng Wang e140256358 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2016-07-17 20:40:12 +08:00
vikerman 6bf6741bcb chore(bios): Added bio for Vikram Subramanian (#1891) 2016-07-15 15:34:05 -07:00
Patrice Chalin 1bef20abc4 docs(api/dart): add support for generation and display (#1888)
Fixes #1880.
Supersedes #1593.
2016-07-15 14:10:12 -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
Zhicheng Wang 6975026f0c 微调,改界面文字 2016-07-07 08:33:14 +08:00
Zhicheng Wang 6264d3bcde 批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐 2016-07-07 08:22:36 +08: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
Brandon Roberts 791b364f6a chore(bios): Added bio for Brandon Roberts 2016-07-06 13:02:27 -07:00
Patrice Chalin b0e0d94b5c docs: revert Jade to markdown
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -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
Zhicheng Wang 6c0cc46a01 chore: add Ralph to bios 2016-06-30 13:19:28 -07:00