f5c85b3e82
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/_data.json
# public/_includes/_hero-home.jade
# public/_includes/_main-nav.jade
# public/_includes/_scripts-include.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cheatsheet.jade
# public/docs/ts/latest/cli-quickstart.jade
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/ajs-quick-reference.jade
# public/docs/ts/latest/cookbook/aot-compiler.jade
# 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/form-validation.jade
# public/docs/ts/latest/cookbook/i18n.jade
# public/docs/ts/latest/cookbook/index.jade
# public/docs/ts/latest/cookbook/ngmodule-faq.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/change-log.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/displaying-data.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/learning-angular.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/pipes.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/setup-systemjs-anatomy.jade
# public/docs/ts/latest/guide/setup.jade
# public/docs/ts/latest/guide/structural-directives.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/_data.json
# 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
# public/events.jade
# public/news.jade
# public/presskit.jade
2017-04-15 15:34:47 +08:00
23384e2609
fix: some leaks
2017-02-26 23:56:02 +08:00
d6ef5ae68a
页脚微调
2017-02-26 18:44:55 +08:00
6af595d7bd
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/_includes/_hero-home.jade
# public/_includes/_scripts-include.jade
# public/docs/dart/latest/_data.json
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/ajs-quick-reference.jade
# public/docs/ts/latest/cookbook/aot-compiler.jade
# 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/form-validation.jade
# public/docs/ts/latest/cookbook/i18n.jade
# public/docs/ts/latest/cookbook/ngmodule-faq.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/change-log.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/displaying-data.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-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/pipes.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/setup-systemjs-anatomy.jade
# public/docs/ts/latest/guide/setup.jade
# public/docs/ts/latest/guide/structural-directives.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/user-input.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/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
# public/events.jade
# public/presskit.jade
# public/resources/js/directives/cheatsheet.js
2017-02-26 15:39:42 +08:00
710af93bdc
chore: update twitter handle in footer ( #3299 )
...
It's just Angular 🆖 😇
2017-02-23 11:25:59 -10:00
30e44ad2f8
chore: update copyrights in docs to 2017 ( #3067 )
2017-01-05 15:14:32 -08:00
d3b8683c3d
Merge remote-tracking branch 'angular.io/master' into merge-26-11-16
...
# Conflicts:
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_next-item.jade
# public/_includes/_version-dropdown.jade
# public/docs/index.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/_quickstart_repo.jade
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/dynamic-form.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/browser-support.jade
# public/docs/ts/latest/guide/change-log.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/displaying-data.jade
# public/docs/ts/latest/guide/forms.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/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/guide/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/index.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
# public/events.jade
2016-11-26 21:53:28 +00:00
80a311f05e
fix footer link and quickstart title.
2016-11-24 10:27:01 +00:00
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
a423a5abc7
clicking on Books & Training sends user to Education ( #2701 )
...
When user clicks in Books & Training item in footer the website should take them to Education section (anchor) in the middle of the page, not to the top where Development section is.
2016-11-14 10:39:46 -08:00
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
c6cec50a0a
updates to improve search results in Swiftype
2016-11-01 13:40:25 -07:00
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
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
9a338b659e
Some more cleanup
2016-09-21 16:11:12 +02:00
8a4a80033e
Fix up styles after sync
2016-09-21 15:32:11 +02:00
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
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
65db6b9268
design(style): Restyle changes from Alex
2016-09-14 17:18:55 -07:00
a039c046c5
修改备案号格式
2016-08-28 06:37:16 +08:00
1d44511bb4
增加备案号
2016-08-27 07:57:43 +08:00
be23e90095
launch(china): announce angular.cn
2016-07-11 22:45:23 -07:00
78fb5708de
英文版改为English
2016-07-03 16:23:10 +08:00
d7a0458484
把到风格指南的链接改成绝对路径
...
文字微调
2016-07-02 22:45:30 +08:00
541eeedcec
修改了导航结构，放上了Naomi的致辞
2016-07-02 21:16:06 +08:00
3c5a045633
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/guide/router.jade
2016-07-02 19:16:00 +08:00
f3da5c8a36
chinese(url): small change to url in footer
2016-07-01 19:21:36 -07:00
527fe50b88
footer(china): update the footer for localised docs
2016-07-01 13:41:06 -07:00
d5417a32a2
add cn language to footer
2016-07-01 07:59:29 -07:00
fb22c0556c
内容微调
2016-06-29 13:11:23 +08:00
d46b4911e6
根据Hantsy的意见，把所有“API参考”改为“API参考手册”
...
为非对照模式的中文添加translated-cn类，以便自动加空格
2016-06-19 17:04:46 +08:00
74547be9e2
修改了翻译的一些小bug
2016-05-13 13:29:08 +08:00
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
62623d5f9b
chore(resources): update resources links and header and footer
2016-04-29 22:57:18 -07:00
36308fe5f6
fix(footer): use cursor pointer on feedback in footer
2016-04-29 17:25:19 -07:00
af9793cbbb
feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page
2016-04-29 20:07:13 -04:00
083842a1b1
feat(resources): add more pages
2016-04-29 18:02:19 -04:00
d8fcd5ef3d
feat(nav reorg): reorganize footer and top nav
2016-04-28 19:23:13 -07:00
2587cf0105
完成了各种公共页面的汉化
2016-04-13 08:53:17 +08:00
b1acf37945
chore: remove angulardart.org link from footer
...
closes #1034
2016-04-01 11:54:10 -07:00
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
8e59fb41ce
chore(routing): host the license file on angular.io
2016-01-08 15:14:20 -08:00
9a377db37a
chore(links): fix a few more canonical js links to be ts
2015-10-15 13:16:38 -07:00
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
66282981d3
fixed footer links
2015-04-28 08:29:58 -07:00
116df89300
Merge branch 'master' into api-branch
2015-04-23 08:38:36 -07:00
8e0e727f7d
fixes
2015-04-22 10:12:55 -07:00
8e849b2693
Merge pull request #26 from icaliman/patch-1
...
Fixed github urls
2015-04-14 09:02:20 -07:00
5e9e095111
Fixed github urls
2015-04-09 16:08:28 +03:00
78391effbd
initial styleguide files
2015-04-06 06:41:08 -07:00
Zhicheng Wang
Ferdinand Malcher
William KOZA
rexebin
Yang Lin
ikilled
Alex Wolfe
Jacob Müller
Jesús Rodríguez
Naomi Black
Eric Jimenez
Eric Jimenez
Kathy Walrath
Ward Bell
John Caliman