honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
angular-cn/public/docs/_examples
History
Zhimin YE 4578087fa5 Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	README.md
#	harp.json
#	public/_includes/_hero-home.jade
#	public/docs/_examples/quickstart/ts/systemjs.config.1.js
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/api/_data.json
#	public/docs/dart/latest/api/index.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.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/change-log.jade
#	public/docs/ts/latest/guide/npm-packages.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/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/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade

Server Communication and Visual studio 2015 require further merging.
2016-11-03 15:38:23 +00:00
..
_boilerplate
chore(tsconfig): add compileOnSave (#2658)
2016-10-23 00:51:03 -07:00
animations
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
architecture
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
attribute-directives
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
cb-a1-a2-quick-reference
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
cb-aot-compiler
chore: update to @types (#1872)
2016-10-20 17:01:16 -07:00
cb-component-communication
Merge remote-tracking branch 'remotes/angular.io/master'
2016-10-17 22:48:18 +01:00
cb-component-relative-paths
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
cb-dependency-injection
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
cb-dynamic-form
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
cb-form-validation
chore: remove bootstrap package (#2691)
2016-10-29 10:44:57 -07:00
cb-i18n
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
cb-set-document-title
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
cb-ts-to-js
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
cb-visual-studio-2015/ts
chore: update to @types (#1872)
2016-10-20 17:01:16 -07:00
cli-quickstart
chore: update to @types (#1872)
2016-10-20 17:01:16 -07:00
component-styles
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
dependency-injection
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
displaying-data
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
forms
chore: remove bootstrap package (#2691)
2016-10-29 10:44:57 -07:00
hierarchical-dependency-injection
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
homepage-hello-world
chore: update to 2.1.1 (#2650)
2016-10-21 22:31:09 +01:00
homepage-tabs
chore: remove bootstrap package (#2691)
2016-10-29 10:44:57 -07:00
homepage-todo
chore: remove bootstrap package (#2691)
2016-10-29 10:44:57 -07:00
lifecycle-hooks
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
ngmodule
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
pipes
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
quickstart
chore: remove bootstrap package (#2691)
2016-10-29 10:44:57 -07:00
router
docs(router): Added example of feature module pre-loading (#2595)
2016-10-19 22:02:47 -07:00
security
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
server-communication
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
structural-directives
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
style-guide
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
styleguide
chore: v.2.0.2 + standard MIT licenses property (#2559)
2016-10-06 17:21:05 -07:00
template-syntax
fix(e2e): remove invalid syntax usage (#2687)
2016-10-28 01:08:43 +01:00
testing/ts
docs(testing): fix base setting in karma shims (#2694)
2016-10-29 19:37:27 -07:00
toh-1
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
toh-2
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
toh-3
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
toh-4
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
toh-5
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
toh-6
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
upgrade-adapter
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
upgrade-phonecat-1-typescript
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
upgrade-phonecat-2-hybrid
chore: update to @types (#1872)
2016-10-20 17:01:16 -07:00
upgrade-phonecat-3-final
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
user-input
chore(dart): update to 2.0.0 (#2680)
2016-10-26 16:36:21 +02:00
webpack
chore: update to 2.1.1 (#2650)
2016-10-21 22:31:09 +01:00
.editorconfig
chore: replace VSCode-specific settings.json with broadly recommended .editorconfig
2016-04-05 10:15:27 -07:00
.gitignore
chore: update to @types (#1872)
2016-10-20 17:01:16 -07:00
jsconfig.json
docs(tutorial): combines all 4 sections + revisions/updates to a.53, hides 3&4
2015-12-14 19:57:55 -08:00
package.json
docs(testing): revert to jasmine v.2.4.1 (#2697)
2016-10-29 23:53:21 -07:00
protractor-helpers.ts
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00
protractor.config.js
Merge remote-tracking branch 'remotes/angular.io/master'
2016-10-17 22:48:18 +01:00
tsconfig.json
docs(toh-6-aot): add aot to toh-6 (#2496)
2016-10-12 01:44:49 -07:00
typings.json
chore(test): add protractor4 (#2233)
2016-10-06 15:25:52 -07:00