Zhicheng Wang
|
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 |
Ward Bell
|
1ec0d7621d
|
docs(events): removed events that have passed (#3529)
|
2017-04-11 20:48:27 -07:00 |
Jules Kremer
|
223c944f24
|
editing/testing (#3391)
|
2017-03-18 08:47:32 -10:00 |
|
Jules Kremer
|
985fd01693
|
duplicate correction (#3387)
|
2017-03-17 15:03:37 -10:00 |
|
Jules Kremer
|
56b7afb8bd
|
ngjapan (#3386)
|
2017-03-17 13:56:06 -10:00 |
|
Zhicheng Wang
|
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 |
|
Jules Kremer
|
fe805a71e4
|
docs(events): update events for 2017 (#3223)
|
2017-02-09 09:59:54 -08:00 |
|
Jules Kremer
|
422632fb08
|
docs(events): update for 2017 (#3152)
|
2017-01-26 12:21:48 -08:00 |
|
Jules Kremer
|
f0388b527d
|
docs(events): update the events page (#3141)
|
2017-01-25 11:53:44 -10:00 |
rexebin
|
edda524d0d
|
Merge remote-tracking branch 'angular.io/master'
# Conflicts:
# .travis.yml
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_next-item.jade
# public/_includes/_util-fns.jade
# public/_includes/_version-dropdown.jade
# public/docs/_examples/package.json
# public/docs/_examples/quickstart/dart/lib/app_component.dart
# public/docs/_examples/quickstart/e2e-spec.ts
# public/docs/_examples/quickstart/js/app/app.component.js
# public/docs/_examples/quickstart/ts/app/app.component.ts
# public/docs/_examples/quickstart/ts/index.html
# public/docs/_examples/toh-5/dart/lib/dashboard_component.html
# public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
# public/docs/dart/latest/_util-fns.jade
# public/docs/dart/latest/guide/_data.json
# public/docs/dart/latest/guide/index.jade
# public/docs/dart/latest/quickstart.jade
# public/docs/index.jade
# public/docs/js/latest/quickstart.jade
# public/docs/ts/_cache/glossary.jade
# public/docs/ts/_cache/guide/dependency-injection.jade
# public/docs/ts/_cache/guide/index.jade
# public/docs/ts/_cache/quickstart.jade
# public/docs/ts/_cache/tutorial/toh-pt5.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/_quickstart_repo.jade
# public/docs/ts/latest/cli-quickstart.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/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-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/events.jade
# public/resources/images/devguide/quickstart/hello-angular.png
# scripts/cache.sh
# tools/plunker-builder/indexHtmlTranslator.js
|
2016-11-26 21:43:16 +00:00 |
Naomi Black
|
a1bc22b595
|
events(nov): updates to the events and hero bar
|
2016-11-22 15:12:17 -08:00 |
Yang Lin
|
5a7745fb27
|
Upgrade to 2.2.0
|
2016-11-22 20:07:16 +08:00 |
|
Naomi Black
|
14db838f8b
|
news(nov): Some news and a blog post update
|
2016-11-13 21:48:52 -05:00 |
|
Naomi Black
|
6714e171c8
|
banner(china): announce gdd china events
|
2016-11-05 02:16:07 -07:00 |
|
Naomi Black
|
e7bcc72610
|
news(oct30): October 30 updates to news and events
|
2016-10-31 00:49:53 -07:00 |
|
Naomi Black
|
1dedfd5301
|
news(update): updates to news and banner for oct
|
2016-10-14 19:03:56 -07:00 |
|
Naomi Black
|
7bc0877d31
|
events(aug9): Add anglebrackets
|
2016-08-09 13:06:00 -07:00 |
|
Naomi Black
|
349449ee2d
|
news(july30): update news and events week of july 30
|
2016-07-29 14:48:26 -07:00 |
|
Naomi Black
|
7fa73c4cb0
|
chore(june28): updates to news, events, team bio for max
|
2016-06-28 18:56:29 -07:00 |
Jesse Palmer
|
03f346b988
|
chore: removes past events
closes #1529
|
2016-05-28 09:43:21 -07:00 |
|
Naomi Black
|
e7bccbabaf
|
chore: update events
|
2016-05-13 09:14:11 -07:00 |
alexwolfe
|
9c58d28cfe
|
Updated Events Page
The table now is using the table from the style guide and presents the
information in a clearer more attractive way to viewers.
|
2016-05-13 08:48:27 -07:00 |
|
Naomi Black
|
6d80a42bea
|
chore(hero): remove the ng-conf banner post-event
|
2016-05-09 23:23:11 -07:00 |
|
Naomi Black
|
a9730db70d
|
events(i/o): add google i/o to events page
|
2016-04-26 23:32:39 -07:00 |
|
Naomi Black
|
a5be02ebee
|
chore(news): freshen up news and events for april 7
|
2016-04-07 19:56:01 -07:00 |
|
Naomi Black
|
4e1c1b7775
|
events(news): Add new confirmed event dates
|
2016-03-19 14:55:22 -07:00 |
|
Naomi Black
|
740e38bdae
|
events(update): remove past event from event page
|
2016-03-02 10:37:04 -08:00 |
Jacques Crocker
|
8bc53b260b
|
add event for Angular Attack
|
2016-02-29 23:01:21 -08:00 |
|
Naomi Black
|
37a13330df
|
chore(events): add new events for dec
|
2016-02-10 14:44:30 -08:00 |
|
Naomi Black
|
34dc751f79
|
chore(geography): Put SLC back in UT where it belongs
|
2016-02-03 10:34:10 -08:00 |
|
Naomi Black
|
9a21e0f50b
|
events(devintersection): Add devintersection europe and routing for events
|
2016-02-01 13:18:02 -08:00 |
|
Naomi Black
|
6c689671b2
|
events(new): add an events page to the site
|
2016-02-01 12:28:23 -08:00 |