Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.

Synchronize with angular.io and Update to translate function#20

Merged
byungjune merged 547 commits intoangular:masterfrom
byungjune:master
Jan 9, 2017
Merged

Synchronize with angular.io and Update to translate function#20
byungjune merged 547 commits intoangular:masterfrom
byungjune:master

Conversation

@byungjune
Copy link
Contributor

  • Synchronize with the latest version of angular.io
  • Resolve the conflict to merge
  • Add the folder to './public/translate/ko'
  • Add the function to add the "SHOW/HIDE ENGLISH" button

filipesilva and others added 30 commits November 10, 2016 14:45
This file is generated when running `gulp e2e` and often enough committed by mistake.

/cc @Foxandxss
update docshredder to shred .es6
optimized focus gulp task
convert imports and metadate sections
add DI section
add host and query metadata section
add intro
fix capitalization and grammar
- Eliminate use of deprecated `clear=“all”` in `<br>`.
- No need for local `langName`; use global `_Lang` var instead.
- Remove duplicate id `learning-path`.
(This prevents the text from appearing in the generated HTML as an HTML
comment.)
* remove redundant headings

* update _cache

* misc: make block comment a Jade comment

(This prevents the text from appearing in the generated HTML as an HTML
comment.)
* docs(template-syntax): refresh _cache

* docs(template-syntax/dart): updates to match TS

- Propagates TS-side changes:
  - update #2639 - new two-way binding section, and
  - fix #2687 - invalid attr syntax
- Fixes
  - #1898 - currency symbols
  - #2748 - Dart template-syntax e2e is failing
  - #2749 - deprecated `[className]`

* updated _cache file following Kathy's post-review edits

* Post Ward's review w/ cache updated

- Keep `my-` and `my` prefixes on selectors (for components and
directives, respectively).
- Drop `my-` from file names.
- Drop `My` as component class prefix.
wardbell and others added 20 commits January 2, 2017 17:50
chore: convert relative templateUrl/styleUrls to have ./
docs(style-guide): prefix with ./ and other improvements
- Change : 타입스크립트 -> TypeSrcipt
- Change : 인텔리센스 -> IntelliSense
- Fix to appropriate words contextually
Trans(tutorial/index.jade, toh-pt1.jade) - Review completed
* fix(cb-component-comm): check for isFirstChange

* update initial message
…ble (#3076)

closes #3072, whose criticism prompted these changes.
Trans(tutorial/toh-pt2.jade) - Reveiw Completed
- Synchronize with the latest version of angular.io
- Resolve the conflict to merge
- Add the folder to './public/translate/ko'
- Add the function to add the "SHOW/HIDE ENGLISH" button
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@byungjune
Copy link
Contributor Author

@tiratano 번역해주신 튜토리얼 파트에서 일부 업데이트 된 부분(삭제/변경)이 있어 해당 내용 반영하였습니다.

@tiratano
Copy link
Contributor

tiratano commented Jan 8, 2017

@onyoon7 옛날 옛적에가 없어졌군요 ^^; 네 업데이트 부분 확인했습니다.

@byungjune byungjune requested review from Foxandxss and removed request for Foxandxss January 8, 2017 14:56
@byungjune
Copy link
Contributor Author

byungjune commented Jan 8, 2017

@naomiblack
I got the some bad news from @googlebot.
I just updated to sync with angular.io &angular-ko.
Do I have to get the author consent from commiter that commit was marked with 'x'?
They are almost 30 people.
Is there any other way to merge without consent of all?

cc : @Foxandxss

@byungjune byungjune merged commit 9de6947 into angular:master Jan 9, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.