Commit Graph

2027 Commits

Author SHA1 Message Date
Zhimin(Rex) YE b5f0eadfa0 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/glossary.jade
2016-06-15 21:58:10 +01:00
Zhimin(Rex) YE 3271bdff60 review of server-communication is done. 2016-06-15 21:44:55 +01:00
Filipe Silva e9cf2a539f chore: update to rc2 2016-06-15 12:21:06 -07:00
Patrice Chalin cd970c21ad docs(toh-3/dart): copyedits and new snake_case glossary entry (#1629) 2016-06-15 10:49:42 -07:00
Zhimin YE (Rex) d23e541541 review to line 888 for server-communication.jade. 2016-06-15 17:04:32 +01:00
Zhicheng Wang 20c59f9e4a Add some blank lines, to avoid unnecessary conflicts on merging. 2016-06-15 23:31:28 +08:00
Zhicheng Wang c1b8183c38 Add some blank lines, to avoid unnecessary conflicts on merging. 2016-06-15 23:21:05 +08:00
Zhicheng Wang 6a5f4a0fc2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-15 23:10:41 +08:00
Patrice Chalin 6e5d8e6491 docs(toh-5/dart): review edits and code cleanup (#1643) 2016-06-15 07:46:26 -07:00
Zhimin YE (Rex) 466f69d30a Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	tools/api-builder/angular.io-package/templates/class.template.html
2016-06-15 12:01:54 +01:00
Peter Bacon Darwin 7ee6e63a6f api-builder: ignore additional platform browser private exports
These exports should not be part of the docs and
cause the doc-gen to fail.

Closes #1667
2016-06-15 08:31:30 +01:00
Zhimin(Rex) YE 04fd6f7102 review of server-communication to line 593 2016-06-14 23:43:52 +01:00
Patrice Chalin 86084260e6 example(dart/quickstart): use <script defer> rather than async (#1665) 2016-06-14 15:37:58 -07:00
Deborah Kurata e7f3fc61ce docs(cb-vs2015) new cookbook for Visual Studio 2015 QuickStart
closes #1502
2016-06-13 23:55:14 -07:00
Zhicheng Wang 7995cb4897 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/style-guide.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
2016-06-14 14:04:30 +08:00
Peter Bacon Darwin c4e87d9b83 api-builder: fix jade formatting of indented constructor code
Closes #1662
2016-06-13 22:42:56 -07:00
Filipe Silva 49a7bc3860 chore: Partition example shredder to do one directory at a time
also exclude /dist/ folder and exclude _examples from jade shredder
closes #1661
2016-06-13 22:20:45 -07:00
Zhicheng Wang df9a0177ea 文字微调 2016-06-14 13:00:36 +08:00
Zhicheng Wang bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang a7e9ff78ff 校对完了词汇表,统一了双语标注 2016-06-14 09:25:26 +08:00
Filipe Silva c50954d5b8 chore: separate lint in travis 2016-06-14 01:01:34 +01:00
Zhicheng Wang c1051cc8e1 微调
为词汇表加上了双语备注
2016-06-14 07:54:46 +08:00
Patrice Chalin 4dab16448b chore(node): recommend v5 via nvmrc
closes #1623
2016-06-13 13:23:38 -07:00
Patrice Chalin ca2e5c5d1d docs(toh-4/ts): copyedits
closes #1638
2016-06-13 11:40:30 -07:00
Patrice Chalin 5adbfb9502 chore(ignored/boilerplate files): cleanup
closes #1646
2016-06-13 11:33:12 -07:00
Foxandxss b1419f48ba chore: fix regions for e2e specs
closes #1657
2016-06-13 11:21:14 -07:00
Foxandxss cba1e1f74b chore: add linting to travis
closes #1656
2016-06-13 11:16:15 -07:00
Helmi 7f256eea75 Fix typo in 'Simulating the web api' section.
closes #1655
2016-06-13 11:05:15 -07:00
Foxandxss 61ad427319 docs(toh): add missing snippets
closes #1649
2016-06-13 10:46:53 -07:00
Patrice Chalin fd46bf4970 docs(toh-5/ts): minor edits
closes #1644
2016-06-13 10:45:23 -07:00
Foxandxss 4dcea96b6d chore: better protractor task
closes #1641
2016-06-13 10:39:51 -07:00
Foxandxss ffbdcd2b9c chore: fix systemjs semicolons
closes #1632
2016-06-13 10:37:20 -07:00
Patrice Chalin 070cb5a193 docs(toh-3/ts): copyedits
closes #1630
2016-06-13 10:36:04 -07:00
Patrice Chalin 16848fc822 docs(toh-2/ts): copyedits
closes #1622
2016-06-13 10:34:19 -07:00
Patrice Chalin 59408b1784 test(toh-1): add e2e for Dart and TS
closes 1620
Contributes to #1619.
2016-06-13 10:30:18 -07:00
Patrice Chalin 2fc7e5ab50 docs(toh-1/ts): minor edits
closes #1615
- Fixed HTML.
- Removed unnecessary snippet since it is in the code.
- Copyedit: (Hero property) -> (hero property).
2016-06-13 10:28:04 -07:00
Brian Olore ce05f9b4f9 docs(style-guide): make each style clickable for easier referencing 2016-06-13 10:24:58 -07:00
Zhicheng Wang f389c57ede 来自网友Z的修改意见 2016-06-13 17:22:28 +08:00
Zhicheng Wang c802c2b5dc 来自网友张旋和Z的修改意见 2016-06-13 17:20:08 +08:00
Zhicheng Wang e338333e2f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
2016-06-13 16:39:34 +08:00
Zhicheng Wang 9789413bda 文字微调 2016-06-13 16:35:21 +08:00
Foxandxss 074a33a622 chore: tslint sweep done 2016-06-13 02:40:28 +02:00
Zhicheng Wang 6a33274e99 修正api文档生成的一个小问题,它导致api的那些jade文件无法正常编译 2016-06-12 08:16:25 +08:00
Zhicheng Wang eafa80c89b 校对了ts-to-js部分 2016-06-11 21:59:43 +08:00
Zhicheng Wang 0b8712d729 微调 2016-06-11 12:08:02 +08:00
Zhicheng Wang f8fd5a1ebd 更明确了ngOnInit的触发时机:每个输入属性的ngOnChanges都完成首次触发之后。 2016-06-11 11:28:16 +08:00
Zhicheng Wang 164244d77a 修正了api的链接(仅中文版) 2016-06-10 14:45:12 +08:00
Zhicheng Wang 6b8e09bf2b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/dependency-injection.jade
2016-06-10 13:34:18 +08:00
Zhimin YE (Rex) f694255b7b review of component-relative-paths.jade 2016-06-09 14:34:12 +01:00
Zhimin YE (Rex) 734e178382 minor change to ts-to-js.jade. 2016-06-09 14:19:16 +01:00