honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,619 Commits 5 Branches 1 Tag
Commit Graph

32 Commits

Author SHA1 Message Date
Zhicheng Wang
969da7d321 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/homepage-hello-world/ts/index.1.html
#	public/docs/_examples/homepage-tabs/ts/index.1.html
#	public/docs/_examples/homepage-todo/ts/index.1.html
#	public/docs/_examples/systemjs.config.plunker.build.js
#	public/docs/_examples/systemjs.config.plunker.js
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.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/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/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/typescript-configuration.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/toh-pt6.jade
#	public/features.jade
#	public/resources/js/directives/live-example.js
#	tools/plunker-builder/indexHtmlTranslator.js
 2016-09-08 17:20:01 +08:00
Filipe Silva
0c962712b3 chore: update to rc6 (#2177) 2016-08-31 18:08:57 -07:00
Zhicheng Wang
94aa3664ab Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.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
 2016-08-12 07:57:51 +08:00
Peter Bacon Darwin
d79adb2422 docs(rc5): update docs and plunkers for rc5 2016-08-09 11:48:07 -07:00
Zhicheng Wang
0aa207bbac Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
 2016-06-19 10:17:03 +08:00
Filipe Silva
61c85a92a4 chore: add async/await support to e2e tests 2016-06-17 10:43:16 -07: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
Foxandxss
074a33a622 chore: tslint sweep done 2016-06-13 02:40:28 +02:00
Zhicheng Wang
f2dbdb3163 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	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-08 10:02:24 +08:00
Foxandxss
f3205f5beb chore: first sweep on linting the codebase 
closes #1616
 2016-06-07 16:45:13 -07:00
Zhimin YE (Rex)
72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-06-01 09:51:27 +01:00
Ward Bell
8a5df4cfa9 chore: support e2e-specs written in TypeScript 
Update gulpfile and project to add a tsconfig to protractor test folders
Change all sample e2e-spec.js -> e2e-spec.ts
Split typings between e2e-spec & app code
Use same config for all e2e tests
Only 1/3 e2e specs truly converted.
Most don't pass because they fail TS transpile by Protractor due to missing type annotations
 2016-05-31 22:03:13 -07:00
Zhicheng Wang
ae3b205c77 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.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-05-21 21:02:15 +08:00
Ward Bell
e188e472f1 docs(e2e-tests): improve gulp e2e tasks and fix samples that were failing 2016-05-20 20:33:38 -07:00
Zhicheng Wang
29df35d724 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-05-20 15:34:27 +08:00
Ward Bell
ba02c40b56 docs: switch from es6-shim to core-js shim 2016-05-19 16:37:54 -07:00
Zhicheng Wang
5f1f27e09c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.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/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade
 2016-05-19 13:33:02 +08:00
Ward Bell
e99e9185ba docs(index.html) remove extra space in System.importline. 2016-05-11 18:42:31 -07:00
Foxandxss
596825a8b1 docs: update all docs to partially comply the style-guide 2016-05-03 12:42:44 -06: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
Ward Bell
3d5302adce chore: update to rc.0 2016-05-02 19:57:28 -07:00
Foxandxss
6c0c6357a9 docs: rename heros to heroes 2016-05-01 23:04:47 +02:00
Filipe Silva
216120daba chore: update to beta.17 
closes #1213, 1205
 2016-04-28 18:31:00 -07:00
Ward Bell
555ec46be3 docs(e2e): workaround comp-comm interval timer tests 
closes #1081
Note how `browser.get('?e2e')` enables app to know it is running under protractor
 2016-04-12 18:51:17 -07:00
Foxandxss
5f73911eaf chore(toh): change inputs array for input decorator/hero now a class 2016-03-25 16:51:46 -07:00
Ward Bell
a2cb80330a docs: update to beta-12 2016-03-23 21:39:13 -07:00
Ward Bell
639ca37de5 docs: update to beta-11 
closes #987
also updated lifecycle-hooks/e2e-spec for changed hook calling sequence (not a bug; just a change)
 2016-03-18 19:22:00 -07:00
Ward Bell
513e919be5 docs(comp comm cookbook): add #localvar alternative for parent calling child 
also fixes glossary decorator-flag bug
 2016-03-07 14:12:48 -08:00
Ward Bell
ad7f172ea5 docs: share 'styles.css' across all samples all langs; fix styles 2016-02-28 12:47:01 -08:00
Ward Bell
524ff05373 chore: add shims_for_IE.js to all index.html 2016-02-25 14:04:37 -08:00
Ward Bell
823950b936 docs(cookbook/component-communication): clear interval timer in OnDestroy 2016-02-22 02:40:57 -08:00
Novak Istvan
daae4f1429 docs(cookbook/component-communication): first of the cookbook series 
closes #824
 2016-02-21 23:19:40 -08:00