Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/internationalization #1231

Closed
wants to merge 99 commits into from
Closed

Feature/internationalization #1231

wants to merge 99 commits into from

Conversation

luismartinez85
Copy link

  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

  • What is the current behavior? (You can also link to an open issue here)

  • What is the new behavior (if this is a feature change)?

  • Other information:

Jose Manuel Bermudo and others added 30 commits November 7, 2016 12:15
- Del last app
- Add Material Angular2 with Theme
# Conflicts:
#	LICENSE
#	README.md
#	config/head-config.common.js
#	config/karma.conf.js
#	config/webpack.common.js
#	config/webpack.dev.js
#	config/webpack.prod.js
#	karma.conf.js
#	package.json
#	src/app/about/about.component.ts
#	src/app/about/index.ts
#	src/app/app.e2e.ts
#	src/app/app.module.ts
#	src/app/app.routes.ts
#	src/app/core/core.component.spec.ts
#	src/app/modules/+detail/detail.module.ts
#	src/app/modules/home/home.component.scss
#	src/app/modules/home/home.component.spec.ts
#	src/app/modules/home/home.component.ts
#	src/app/modules/no-content/index.ts
#	src/app/modules/no-content/no-content.component.ts
#	src/index.html
#	src/main.browser.ts
#	src/meta/humans.txt
#	src/polyfills.browser.ts
#	src/vendor.ts
#	tsconfig.aot.json
#	tslint.json
#	webpack.config.js
# Conflicts:
#	LICENSE
#	README.md
#	config/head-config.common.js
#	config/karma.conf.js
#	config/webpack.common.js
#	config/webpack.dev.js
#	config/webpack.prod.js
#	karma.conf.js
#	package.json
#	src/app/about/about.component.ts
#	src/app/about/index.ts
#	src/app/app.e2e.ts
#	src/app/app.module.ts
#	src/app/app.routes.ts
#	src/app/core/core.component.spec.ts
#	src/app/modules/+detail/detail.module.ts
#	src/app/modules/home/home.component.scss
#	src/app/modules/home/home.component.spec.ts
#	src/app/modules/home/home.component.ts
#	src/app/modules/no-content/index.ts
#	src/app/modules/no-content/no-content.component.ts
#	src/index.html
#	src/main.browser.ts
#	src/meta/humans.txt
#	src/polyfills.browser.ts
#	src/vendor.ts
#	tsconfig.aot.json
#	tslint.json
#	webpack.config.js
Change HomeComponent to Module cause need import Pipes
Add Material
- Fixed some problems
- Change name structure
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2016 AngularClass LLC
Copyright (c) 2016 FrontStack
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

o_O

@luismartinez85
Copy link
Author

wrong repo, sorry

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants