[zanata/zanata-platform] c53040: Merge branch 'master' of https://github.com/zanata...
GitHub
noreply at github.com
Thu Jul 12 00:44:49 UTC 2018
Branch: refs/heads/ZNTA-2529
Home: https://github.com/zanata/zanata-platform
Commit: c530402c11bb00cbddc9ce5862d7bbb4c5beae43
https://github.com/zanata/zanata-platform/commit/c530402c11bb00cbddc9ce5862d7bbb4c5beae43
Author: kgough <kgough at redhat.com>
Date: 2018-07-11 (Wed, 11 Jul 2018)
Changed paths:
M server/zanata-frontend/src/.eslintrc
M server/zanata-frontend/src/app/actions/common-actions.ts
M server/zanata-frontend/src/app/actions/glossary-actions.js
M server/zanata-frontend/src/app/actions/tmx-actions.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/reducers/common-reducer.js
M server/zanata-frontend/src/app/reducers/explore-reducer.js
M server/zanata-frontend/src/app/reducers/glossary-reducer.js
M server/zanata-frontend/src/app/reducers/languages-reducer.js
M server/zanata-frontend/src/app/reducers/profile-reducer.js
A server/zanata-frontend/src/app/reducers/state.ts
M server/zanata-frontend/src/app/reducers/tmx-reducer.js
M server/zanata-frontend/src/app/utils/DateHelper.ts
A server/zanata-frontend/src/app/utils/DeepReadonly.d.ts
M server/zanata-frontend/src/app/utils/prop-types-util.ts
M server/zanata-frontend/src/tslint.json
Log Message:
-----------
Merge branch 'master' of https://github.com/zanata/zanata-platform into ZNTA-2529
Commit: 159f4319fae772da9b1d3a77ba38c37797135507
https://github.com/zanata/zanata-platform/commit/159f4319fae772da9b1d3a77ba38c37797135507
Author: kgough <kgough at redhat.com>
Date: 2018-07-12 (Thu, 12 Jul 2018)
Changed paths:
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/app/components/Icon/index.tsx
M server/zanata-frontend/src/app/components/LoaderText/index.js
M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
M server/zanata-frontend/src/app/containers/Glossary/index.less
M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
R server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.js
A server/zanata-frontend/src/app/editor/components/GlossaryTermModal/index.ts
M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
M server/zanata-frontend/src/app/editor/reducers/activity-reducer.js
R server/zanata-frontend/src/app/editor/reducers/context-reducer.js
M server/zanata-frontend/src/app/editor/reducers/context-reducer.test.js
A server/zanata-frontend/src/app/editor/reducers/context-reducer.ts
R server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.js
A server/zanata-frontend/src/app/editor/reducers/dropdown-reducer.ts
M server/zanata-frontend/src/app/editor/reducers/glossary-reducer.js
M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/filter-status-reducer.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-filter-reducer.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
M server/zanata-frontend/src/app/editor/reducers/settings-reducer.js
A server/zanata-frontend/src/app/editor/reducers/state.ts
M server/zanata-frontend/src/app/editor/reducers/suggestions-reducer.js
M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
M server/zanata-frontend/src/app/editor/utils/activity-util.ts
M server/zanata-frontend/src/app/styles/antd.less
M server/zanata-frontend/src/app/utils/prop-types-util.ts
M server/zanata-frontend/src/package.json
M server/zanata-frontend/src/yarn.lock
Log Message:
-----------
Merge branch 'ZNTA-2529' of https://github.com/zanata/zanata-platform into ZNTA-2529
Commit: dca011345d21a76f9dd3bb22f735c8f900f4a58b
https://github.com/zanata/zanata-platform/commit/dca011345d21a76f9dd3bb22f735c8f900f4a58b
Author: kgough <kgough at redhat.com>
Date: 2018-07-12 (Thu, 12 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/containers/UserProfile/index.less
Log Message:
-----------
refactor(ZNTA-2529) minor styling fixes to user profile
Compare: https://github.com/zanata/zanata-platform/compare/ad6c25b5d450...dca011345d21
**NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
More information about the zanata-commits
mailing list