Commit Graph

55 Commits

Author SHA1 Message Date
Yang Lin 5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08: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
Alex Wolfe c6cec50a0a updates to improve search results in Swiftype 2016-11-01 13:40:25 -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
Jacob Müller 9a338b659e Some more cleanup 2016-09-21 16:11:12 +02:00
Jacob Müller 8a4a80033e Fix up styles after sync 2016-09-21 15:32:11 +02:00
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
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 65db6b9268 design(style): Restyle changes from Alex 2016-09-14 17:18:55 -07:00
Zhicheng Wang a039c046c5 修改备案号格式 2016-08-28 06:37:16 +08:00
Zhicheng Wang 1d44511bb4 增加备案号 2016-08-27 07:57:43 +08:00
Naomi Black be23e90095 launch(china): announce angular.cn 2016-07-11 22:45:23 -07:00
Zhicheng Wang 78fb5708de 英文版改为English 2016-07-03 16:23:10 +08:00
Zhicheng Wang d7a0458484 把到风格指南的链接改成绝对路径
文字微调
2016-07-02 22:45:30 +08:00
Zhicheng Wang 541eeedcec 修改了导航结构,放上了Naomi的致辞 2016-07-02 21:16:06 +08: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
Naomi Black f3da5c8a36 chinese(url): small change to url in footer 2016-07-01 19:21:36 -07:00
Naomi Black 527fe50b88 footer(china): update the footer for localised docs 2016-07-01 13:41:06 -07:00
Eric Jimenez d5417a32a2 add cn language to footer 2016-07-01 07:59:29 -07:00
Zhicheng Wang fb22c0556c 内容微调 2016-06-29 13:11:23 +08:00
Zhicheng Wang d46b4911e6 根据Hantsy的意见,把所有“API参考”改为“API参考手册”
为非对照模式的中文添加translated-cn类,以便自动加空格
2016-06-19 17:04:46 +08:00
Zhicheng Wang 74547be9e2 修改了翻译的一些小bug 2016-05-13 13:29:08 +08:00
Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	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/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade
2016-05-03 22:33:20 +08:00
Naomi Black 62623d5f9b chore(resources): update resources links and header and footer 2016-04-29 22:57:18 -07:00
Eric Jimenez 36308fe5f6 fix(footer): use cursor pointer on feedback in footer 2016-04-29 17:25:19 -07:00
Eric Jimenez af9793cbbb feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page 2016-04-29 20:07:13 -04:00
Eric Jimenez 083842a1b1 feat(resources): add more pages 2016-04-29 18:02:19 -04:00
Eric Jimenez d8fcd5ef3d feat(nav reorg): reorganize footer and top nav 2016-04-28 19:23:13 -07:00
Zhicheng Wang 2587cf0105 完成了各种公共页面的汉化 2016-04-13 08:53:17 +08:00
Kathy Walrath b1acf37945 chore: remove angulardart.org link from footer
closes #1034
2016-04-01 11:54:10 -07:00
Ward Bell 95c34d27bc docs: temporary TS-referencing chapters for gaps in JS/Dart
Also displays styleguide at language level
Fragmented glossary for JS & Dart
2016-03-01 11:22:04 -08:00
Naomi Black 8e59fb41ce chore(routing): host the license file on angular.io 2016-01-08 15:14:20 -08:00
Naomi Black 9a377db37a chore(links): fix a few more canonical js links to be ts 2015-10-15 13:16:38 -07:00
Naomi Black c4496c0686 docs(devpreview): Change alpha to developer preview and get rid of .x where feasible
closes #47
2015-04-28 12:33:29 -07:00
Alex Wolfe 66282981d3 fixed footer links 2015-04-28 08:29:58 -07:00
Alex Wolfe 116df89300 Merge branch 'master' into api-branch 2015-04-23 08:38:36 -07:00
Alex Wolfe 8e0e727f7d fixes 2015-04-22 10:12:55 -07:00
Kathy Walrath 8e849b2693 Merge pull request #26 from icaliman/patch-1
Fixed github urls
2015-04-14 09:02:20 -07:00
John Caliman 5e9e095111 Fixed github urls 2015-04-09 16:08:28 +03:00
Alex Wolfe 78391effbd initial styleguide files 2015-04-06 06:41:08 -07:00
Alex Wolfe 3cea09ad26 Docs(resources): Add ng-conf video and forms blog post 2015-03-20 21:29:34 -07:00
Alex Wolfe 59806948c3 Design Docs & Notes 2015-03-11 20:37:08 -07:00
Alex Wolfe 564702adcf more mobile styles 2015-03-04 21:39:57 -08:00
Alex Wolfe d71c4560a4 fix footer layout 2015-03-04 14:01:39 -08:00
Kathy Walrath 30778750c4 minor copyedits (_footer.jade) 2015-03-04 13:51:05 -08:00
Naomi Black ef11b770b5 Consistency for naming (Angular for JavaScript) 2015-03-04 12:24:16 -07:00
Alex Wolfe 50e8bcb31a update license & logos 2015-03-02 22:38:35 -08:00
Alex Wolfe 426496c023 Help Page 2015-03-02 06:29:08 -08:00
Alex Wolfe 154d812cc1 update footer links 2015-03-02 06:15:13 -08:00