[zanata/zanata-platform] 659bcf: feat(ZNTA-2300): editor concurrent save resolution
GitHub
noreply at github.com
Tue Jul 17 01:51:51 UTC 2018
Branch: refs/heads/react-fragment
Home: https://github.com/zanata/zanata-platform
Commit: 659bcfd58a11a7dc1fae3f0d5fd63136fc8c950c
https://github.com/zanata/zanata-platform/commit/659bcfd58a11a7dc1fae3f0d5fd63136fc8c950c
Author: efloden <efloden at redhat.com>
Date: 2018-06-15 (Fri, 15 Jun 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
Log Message:
-----------
feat(ZNTA-2300): editor concurrent save resolution
Commit: e35cb8ed7227c94d898151677a41591b56a21a34
https://github.com/zanata/zanata-platform/commit/e35cb8ed7227c94d898151677a41591b56a21a34
Author: efloden <efloden at redhat.com>
Date: 2018-06-18 (Mon, 18 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
Log Message:
-----------
feat: create redux action for save conflict
Commit: 4080aa4e5d0f8a40338f31cfe63b7deb12b7cf26
https://github.com/zanata/zanata-platform/commit/4080aa4e5d0f8a40338f31cfe63b7deb12b7cf26
Author: efloden <efloden at redhat.com>
Date: 2018-06-18 (Mon, 18 Jun 2018)
Changed paths:
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/components/components.story.js
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
Log Message:
-----------
feat: convert ConcurrentModal to tsx, handle redux state for modal
Commit: 7c831048c9fbf1c869a351d75468e13d3b1373b4
https://github.com/zanata/zanata-platform/commit/7c831048c9fbf1c869a351d75468e13d3b1373b4
Author: efloden <efloden at redhat.com>
Date: 2018-06-19 (Tue, 19 Jun 2018)
Changed paths:
M common/zanata-adapter-glossary/src/test/java/org/zanata/adapter/glossary/GlossaryCSVReaderTest.java
M server/etc/scripts/configure-app-server.js
M server/functional-test/src/main/java/org/zanata/page/CorePage.java
M server/functional-test/src/main/java/org/zanata/page/editor/ReactEditorPage.java
M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
M server/functional-test/src/test/java/org/zanata/feature/document/DownloadDocumentTest.java
M server/functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M server/functional-test/src/test/java/org/zanata/feature/editor/EditorAlphaTest.java
M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
M server/functional-test/src/test/java/org/zanata/feature/endtoend/UserEndToEndTest.java
M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
M server/pom.xml
M server/services/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Admin/index.js
M server/zanata-frontend/src/app/containers/Explore/index.less
M server/zanata-frontend/src/app/containers/Glossary/Entry.js
M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
M server/zanata-frontend/src/app/containers/Glossary/index.js
M server/zanata-frontend/src/app/containers/Glossary/index.less
M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
M server/zanata-frontend/src/app/containers/Languages/index.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
M server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
M server/zanata-frontend/src/app/editor/components/ActivitySelectList/index.js
M server/zanata-frontend/src/app/editor/components/Button/index.css
M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
M server/zanata-frontend/src/app/editor/components/DocsDropdown/DocsDropdown.test.js
M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.test.js
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.css
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
M server/zanata-frontend/src/app/editor/components/FilterToggle/index.js
M server/zanata-frontend/src/app/editor/components/GlossaryTerm/GlossaryTerm.story.js
M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
M server/zanata-frontend/src/app/editor/components/IconButton/index.js
M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js
M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
M server/zanata-frontend/src/app/editor/components/SelectButton/index.js
M server/zanata-frontend/src/app/editor/components/SelectButtonList/index.js
M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
M server/zanata-frontend/src/app/editor/components/SplitDropdown/index.js
M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js
M server/zanata-frontend/src/app/editor/components/SuggestionDetailsSummary/index.js
M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js
M server/zanata-frontend/src/app/editor/components/TranslatingIndicator/index.js
M server/zanata-frontend/src/app/editor/components/Validation/Validation.story.js
A server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
M server/zanata-frontend/src/app/editor/containers/GlossaryTab.js
M server/zanata-frontend/src/app/editor/containers/NavHeader.js
M server/zanata-frontend/src/app/editor/containers/Root/index.css
M server/zanata-frontend/src/app/editor/containers/SettingsPanel.js
M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/ImportedTMDetailPanel.js
M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/LocalProjectDetailPanel.js
M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.css
M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/index.js
M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/entrypoint/index.js
M server/zanata-frontend/src/app/reducers/glossary-reducer.js
M server/zanata-frontend/src/app/styles/ant-theme-vars.less
M server/zanata-frontend/src/app/styles/antd.less
M server/zanata-frontend/src/app/styles/style.less
M server/zanata-frontend/src/app/utils/FeatureToggles.ts
A server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
A server/zanata-frontend/src/app/validators/ValidationAction.ts
A server/zanata-frontend/src/app/validators/ValidationDisplayRules.ts
A server/zanata-frontend/src/app/validators/ValidationMessages.ts
A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
A server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.ts
A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
A server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
A server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.ts
A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
A server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
A server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
A server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
A server/zanata-frontend/src/app/validators/impl/TabValidation.ts
A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
A server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.ts
A server/zanata-frontend/src/app/validators/index.ts
A server/zanata-frontend/src/app/validators/messages/en.json
A server/zanata-frontend/src/app/validators/messages/fr.json
A server/zanata-frontend/src/app/validators/messages/index.ts
A server/zanata-frontend/src/app/validators/messages/ja.json
M server/zanata-frontend/src/messages/ja.json
M server/zanata-frontend/src/package.json
M server/zanata-frontend/src/tsconfig.json
M server/zanata-frontend/src/yarn.lock
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300
Commit: e3ee678a97d6227f1bbdd36ff0a7ae5625c5dc55
https://github.com/zanata/zanata-platform/commit/e3ee678a97d6227f1bbdd36ff0a7ae5625c5dc55
Author: efloden <efloden at redhat.com>
Date: 2018-06-19 (Tue, 19 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
Log Message:
-----------
feat: implement save original translation selection from conflict modal
Commit: 87789a08ddddbce24979739da99a988889f3d919
https://github.com/zanata/zanata-platform/commit/87789a08ddddbce24979739da99a988889f3d919
Author: efloden <efloden at redhat.com>
Date: 2018-06-22 (Fri, 22 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
Log Message:
-----------
feat: handle save as latest or original
Commit: ef30f354607089ef90624dd9a3ab05ae2ed66f4f
https://github.com/zanata/zanata-platform/commit/ef30f354607089ef90624dd9a3ab05ae2ed66f4f
Author: efloden <efloden at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
Log Message:
-----------
feat: include latest username, modified date in conflict response
display in conflict modal UI
Commit: 0656dd2cb31a42df0b4b6e3dd636bb0dd5250d5f
https://github.com/zanata/zanata-platform/commit/0656dd2cb31a42df0b4b6e3dd636bb0dd5250d5f
Author: efloden <efloden at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
M server/zanata-frontend/src/app/editor/containers/MainContent.js
Log Message:
-----------
refactor: extract conflictData interface
Commit: 124926fd9fed6d2492a3890161f3b967c4999685
https://github.com/zanata/zanata-platform/commit/124926fd9fed6d2492a3890161f3b967c4999685
Author: efloden <efloden at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
Log Message:
-----------
fix: tslint error
Commit: 9897499eb71993452d765a085c4e882c6b3d85ca
https://github.com/zanata/zanata-platform/commit/9897499eb71993452d765a085c4e882c6b3d85ca
Author: efloden <efloden at redhat.com>
Date: 2018-06-25 (Mon, 25 Jun 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
Log Message:
-----------
refactor: use date type on server, convert in frontend
Commit: 7a48f9c1f7bc95af606659052747af99d8e4d4c0
https://github.com/zanata/zanata-platform/commit/7a48f9c1f7bc95af606659052747af99d8e4d4c0
Author: efloden <efloden at redhat.com>
Date: 2018-06-29 (Fri, 29 Jun 2018)
Changed paths:
M build-tools/src/main/resources/zanata-build-tools/checkstyle.xml
M client/zanata-cli/src/test/java/org/zanata/client/BashCompletionGenerator.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextDirStrategy.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/GettextPullStrategy.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/UTF8PropertiesStrategy.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XmlStrategy.java
M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
A client/zanata-client-commands/src/main/java/org/zanata/client/dto/LocaleMappedTranslatedDoc.java
M common/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
M common/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderWriterTest.java
A common/zanata-common-util/src/main/java/org/zanata/common/dto/TranslatedDoc.java
M docs/release-notes.md
M parent/pom.xml
M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
M server/functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M server/functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M server/functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M server/gwt-editor/src/main/java/org/zanata/webtrans/client/service/SaveEventQueue.java
M server/gwt-editor/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
M server/pom.xml
M server/services/pom.xml
M server/services/src/main/java/org/zanata/action/DashboardAction.java
M server/services/src/main/java/org/zanata/action/LocaleSelectorAction.java
M server/services/src/main/java/org/zanata/action/ProjectHomeAction.java
M server/services/src/main/java/org/zanata/action/ProjectPermissionDialog.java
M server/services/src/main/java/org/zanata/action/VersionGroupHome.java
M server/services/src/main/java/org/zanata/action/VersionHome.java
M server/services/src/main/java/org/zanata/action/VersionHomeAction.java
R server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.java
A server/services/src/main/java/org/zanata/adapter/FileFormatAdapter.kt
M server/services/src/main/java/org/zanata/adapter/GenericPropertiesAdapter.java
M server/services/src/main/java/org/zanata/adapter/GettextAdapter.java
M server/services/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
M server/services/src/main/java/org/zanata/adapter/TSAdapter.java
M server/services/src/main/java/org/zanata/adapter/XliffAdapter.java
M server/services/src/main/java/org/zanata/dao/AccountDAO.java
M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
M server/services/src/main/java/org/zanata/file/FilePersistService.java
M server/services/src/main/java/org/zanata/file/FileSystemPersistService.java
M server/services/src/main/java/org/zanata/file/SourceDocumentUpload.java
A server/services/src/main/java/org/zanata/rest/service/ExportRestService.kt
M server/services/src/main/java/org/zanata/rest/service/FileService.java
M server/services/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
A server/services/src/main/java/org/zanata/service/GraphQLScalars.kt
A server/services/src/main/java/org/zanata/service/GraphQLService.java
M server/services/src/main/java/org/zanata/service/ProjectService.java
M server/services/src/main/java/org/zanata/service/TranslationFileService.java
M server/services/src/main/java/org/zanata/service/impl/ProjectServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/services/src/main/java/org/zanata/service/impl/WebhookServiceImpl.java
M server/services/src/main/java/org/zanata/ui/FilterUtil.java
M server/services/src/main/java/org/zanata/ui/InMemoryListFilter.java
M server/services/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
M server/services/src/main/java/org/zanata/util/QueryBuilder.java
A server/services/src/main/java/org/zanata/util/json.kt
M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M server/services/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
M server/services/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M server/services/src/main/resources/messages.properties
M server/services/src/test/java/org/zanata/adapter/AbstractAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/DTDAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/GettextAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/IdmlAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/PlainTextAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/PropertiesLatinOneAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/PropertiesUTF8AdapterTest.java
M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
M server/services/src/test/java/org/zanata/adapter/XliffAdapterTest.java
M server/services/src/test/java/org/zanata/dao/DocumentDAOTest.java
M server/services/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
M server/services/src/test/java/org/zanata/file/DocumentUploadTest.java
M server/services/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
M server/services/src/test/java/org/zanata/limits/LeakyBucketTest.java
M server/services/src/test/java/org/zanata/model/DocumentJPATest.java
M server/services/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
A server/services/src/test/java/org/zanata/rest/service/ExportRestServiceTest.kt
M server/services/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
A server/services/src/test/java/org/zanata/service/GraphQLServiceTest.java
A server/services/src/test/java/org/zanata/test/Descriptions.java
M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandlerTest.java
M server/services/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M server/services/src/test/resources/org/zanata/adapter/test-ts-untranslated.ts
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/.storybook-editor/storyshots-util.js
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/.storybook-frontend/storybook.less
M server/zanata-frontend/src/app/actions/explore-actions.js
M server/zanata-frontend/src/app/actions/glossary-actions.js
M server/zanata-frontend/src/app/actions/languages-actions.js
M server/zanata-frontend/src/app/actions/profile-actions.js
M server/zanata-frontend/src/app/actions/review-actions.ts
M server/zanata-frontend/src/app/actions/tmx-actions.js
M server/zanata-frontend/src/app/actions/version-actions.js
M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
M server/zanata-frontend/src/app/components/EditableText/index.js
M server/zanata-frontend/src/app/components/Icon/Icon.story.js
M server/zanata-frontend/src/app/components/Icon/index.tsx
M server/zanata-frontend/src/app/components/Link/index.js
M server/zanata-frontend/src/app/components/LoaderText/index.js
M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
M server/zanata-frontend/src/app/components/LockIcon/index.tsx
M server/zanata-frontend/src/app/components/Modal/Modal.story.js
M server/zanata-frontend/src/app/components/Modal/ModalBody.jsx
M server/zanata-frontend/src/app/components/Modal/ModalFooter.tsx
M server/zanata-frontend/src/app/components/Modal/ModalHeader.jsx
M server/zanata-frontend/src/app/components/Modal/ModalTitle.jsx
M server/zanata-frontend/src/app/components/Nav/index.jsx
M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
M server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
M server/zanata-frontend/src/app/components/Sidebar/index.jsx
M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
M server/zanata-frontend/src/app/components/TriCheckbox/index.js
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Admin/index.js
M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
M server/zanata-frontend/src/app/containers/Explore/index.js
M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
M server/zanata-frontend/src/app/containers/Glossary/Entry.js
M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
M server/zanata-frontend/src/app/containers/Glossary/NewEntryModal.js
M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
M server/zanata-frontend/src/app/containers/Glossary/index.js
M server/zanata-frontend/src/app/containers/Glossary/index.less
M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
M server/zanata-frontend/src/app/containers/Languages/Entry.js
M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
M server/zanata-frontend/src/app/containers/Languages/index.js
A server/zanata-frontend/src/app/containers/ProjectVersion/MTMerge.js
M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeOptionsCommon.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
M server/zanata-frontend/src/app/containers/UserProfile/ContentStateFilter.jsx
M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
M server/zanata-frontend/src/app/containers/UserProfile/index.less
M server/zanata-frontend/src/app/declarations.d.ts
M server/zanata-frontend/src/app/editor/actions/review-trans-actions.js
M server/zanata-frontend/src/app/editor/api/index.js
M server/zanata-frontend/src/app/editor/components/Button/Button.test.js
M server/zanata-frontend/src/app/editor/components/CommentBox/index.tsx
M server/zanata-frontend/src/app/editor/components/DocsDropdown/index.js
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
M server/zanata-frontend/src/app/editor/components/GlossarySearchInput/GlossarySearchInput.story.js
M server/zanata-frontend/src/app/editor/components/GlossaryTerm/index.js
A server/zanata-frontend/src/app/editor/components/IconButton/IconButton.story.js
M server/zanata-frontend/src/app/editor/components/IconButton/IconButton.test.js
M server/zanata-frontend/src/app/editor/components/IconButton/index.js
M server/zanata-frontend/src/app/editor/components/IconButtonToggle/IconButtonToggle.test.js
M server/zanata-frontend/src/app/editor/components/KeyCombinations.js
M server/zanata-frontend/src/app/editor/components/LanguagesDropdown/index.js
M server/zanata-frontend/src/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js
M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
M server/zanata-frontend/src/app/editor/components/Pager/index.js
M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/PhraseStatusFilter.test.js
M server/zanata-frontend/src/app/editor/components/PhraseStatusFilter/index.js
M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/CriteriaDropdown.js
M server/zanata-frontend/src/app/editor/components/SettingOption/index.js
M server/zanata-frontend/src/app/editor/components/Suggestion.js
M server/zanata-frontend/src/app/editor/components/SuggestionList.js
M server/zanata-frontend/src/app/editor/components/SuggestionMatchPercent/index.js
M server/zanata-frontend/src/app/editor/components/SuggestionTranslationDetails.js
M server/zanata-frontend/src/app/editor/components/TextDiff/index.js
M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
M server/zanata-frontend/src/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js
M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
M server/zanata-frontend/src/app/editor/components/components.story.js
M server/zanata-frontend/src/app/editor/containers/ActivityTab.tsx
M server/zanata-frontend/src/app/editor/containers/KeyShortcutCheatSheet/index.js
M server/zanata-frontend/src/app/editor/containers/NeedSlugMessage.js
M server/zanata-frontend/src/app/editor/containers/Root/index.css
M server/zanata-frontend/src/app/editor/containers/SuggestionDetailsModal/PlainSuggestionContents.js
M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/DetailsPane.tsx
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/entrypoint/index.js
M server/zanata-frontend/src/app/editor/middlewares/getstate-in-actions.js
M server/zanata-frontend/src/app/editor/middlewares/state-change-dispatch.js
M server/zanata-frontend/src/app/editor/middlewares/title-update.js
M server/zanata-frontend/src/app/editor/reducers/header-data-reducer.js
M server/zanata-frontend/src/app/editor/reducers/index.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
M server/zanata-frontend/src/app/editor/reducers/ui-reducer.js
M server/zanata-frontend/src/app/editor/selectors/index.js
M server/zanata-frontend/src/app/editor/utils/filter-util.js
M server/zanata-frontend/src/app/editor/utils/log-todo.js
M server/zanata-frontend/src/app/editor/utils/status-util.ts
M server/zanata-frontend/src/app/editor/utils/string-utils.js
M server/zanata-frontend/src/app/editor/utils/suggestion-util.js
M server/zanata-frontend/src/app/editor/watchers/index.js
M server/zanata-frontend/src/app/editor/watchers/page-number.js
M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
M server/zanata-frontend/src/app/editor/watchers/phrase-list.js
M server/zanata-frontend/src/app/editor/watchers/selected-phrase-searches.js
M server/zanata-frontend/src/app/editor/watchers/watch.js
M server/zanata-frontend/src/app/entrypoint/index.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/require-all.test.ts
M server/zanata-frontend/src/app/styles/ant-theme-vars.less
M server/zanata-frontend/src/app/styles/antd.less
M server/zanata-frontend/src/app/styles/index.less
M server/zanata-frontend/src/app/styles/style.less
M server/zanata-frontend/src/app/utils/GlossaryHelper.js
M server/zanata-frontend/src/app/utils/GlossaryHelper.test.js
M server/zanata-frontend/src/app/validators/ValidationAction.ts
M server/zanata-frontend/src/app/validators/impl/HtmlXmlTagValidation.test.js
M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.test.js
M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
M server/zanata-frontend/src/app/validators/impl/NewlineLeadTrailValidation.test.js
M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.test.js
M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.ts
M server/zanata-frontend/src/app/validators/impl/TabValidation.test.js
M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
M server/zanata-frontend/src/app/validators/index.ts
M server/zanata-frontend/src/jest.config.js
R server/zanata-frontend/src/jest.config.json
M server/zanata-frontend/src/package.json
M server/zanata-frontend/src/tsconfig.json
M server/zanata-frontend/src/tslint.json
M server/zanata-frontend/src/webpack.config.js
M server/zanata-frontend/src/yarn.lock
M server/zanata-model/pom.xml
M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
M server/zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
M server/zanata-model/src/main/java/org/zanata/model/HAccountOption.java
M server/zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M server/zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HDocumentUpload.java
M server/zanata-model/src/main/java/org/zanata/model/HDocumentUploadPart.java
M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
M server/zanata-model/src/main/java/org/zanata/model/HPersonEmailValidationKey.java
M server/zanata-model/src/main/java/org/zanata/model/HProject.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectGlossary.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectLocaleMember.java
M server/zanata-model/src/main/java/org/zanata/model/HProjectMember.java
M server/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
M server/zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
M server/zanata-model/src/main/java/org/zanata/model/LanguageRequest.java
R server/zanata-model/src/main/java/org/zanata/model/PersonProjectMemberships.java
M server/zanata-model/src/main/java/org/zanata/model/Request.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java
M server/zanata-model/src/main/java/org/zanata/model/security/HCredentials.java
M server/zanata-model/src/main/java/org/zanata/model/security/HOpenIdCredentials.java
M server/zanata-model/src/main/java/org/zanata/model/security/HSaml2Credentials.java
M server/zanata-model/src/main/java/org/zanata/model/type/TranslationSourceType.java
A server/zanata-model/src/main/java/org/zanata/service/PersonProjectMemberships.java
M server/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
M server/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationServiceIntegrationTest.java
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300
Commit: f4418e7022e54bb2b8eaec5b7cf4f0c1a89ceaac
https://github.com/zanata/zanata-platform/commit/f4418e7022e54bb2b8eaec5b7cf4f0c1a89ceaac
Author: efloden <efloden at redhat.com>
Date: 2018-06-29 (Fri, 29 Jun 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
Log Message:
-----------
fix: typescript strict checks
Commit: d62c1721203b473b92f253fe91afc1c63976b4d0
https://github.com/zanata/zanata-platform/commit/d62c1721203b473b92f253fe91afc1c63976b4d0
Author: efloden <efloden at redhat.com>
Date: 2018-06-29 (Fri, 29 Jun 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
Log Message:
-----------
fix: java findbugs - exposing internal representation of Date
Commit: 3d2101f8ff2ab365b6f07eda8c1d20096c6aaf11
https://github.com/zanata/zanata-platform/commit/3d2101f8ff2ab365b6f07eda8c1d20096c6aaf11
Author: efloden <efloden at redhat.com>
Date: 2018-07-02 (Mon, 02 Jul 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
Log Message:
-----------
fix: use latest versionNum when resolving with original
Commit: 988161a9561460a1d2c4b7b004c60e8219fab471
https://github.com/zanata/zanata-platform/commit/988161a9561460a1d2c4b7b004c60e8219fab471
Author: efloden <efloden at redhat.com>
Date: 2018-07-02 (Mon, 02 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
Log Message:
-----------
fix: save as latest action params
Commit: a10977c50847bb43ca92ef5c0a24f180f0e569fa
https://github.com/zanata/zanata-platform/commit/a10977c50847bb43ca92ef5c0a24f180f0e569fa
Author: efloden <efloden at redhat.com>
Date: 2018-07-02 (Mon, 02 Jul 2018)
Changed paths:
M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
M server/functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M server/functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
R server/functional-test/src/test/java/org/zanata/ExperimentTest.java
A server/functional-test/src/test/java/org/zanata/ExperimentTest.kt
R server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
A server/functional-test/src/test/java/org/zanata/feature/TransMemoryTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
A server/functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.kt
R server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/comp/InactiveUserLoginCTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterCTest.kt
R server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.java
A server/functional-test/src/test/java/org/zanata/feature/account/comp/RegisterUsernameCharactersCTest.kt
R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.kt
R server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
A server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.kt
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/.storybook-editor/addons.js
M server/zanata-frontend/src/.storybook-editor/config.js
M server/zanata-frontend/src/.storybook-editor/storyshots-editor.test.js
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
R server/zanata-frontend/src/app/components/Modal/Modal.story.js
M server/zanata-frontend/src/app/components/Modal/index.jsx
A server/zanata-frontend/src/app/components/Notification/component.js
M server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
M server/zanata-frontend/src/app/components/components.story.js
M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
M server/zanata-frontend/src/app/containers/Glossary/index.less
M server/zanata-frontend/src/app/editor/components/EditorSearchInput/index.js
M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/GlossaryTermModal.story.js
M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
M server/zanata-frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
M server/zanata-frontend/src/package.json
M server/zanata-frontend/src/yarn.lock
M server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300
Commit: 86e5691a6564e340c3458beef84dc87411dffab9
https://github.com/zanata/zanata-platform/commit/86e5691a6564e340c3458beef84dc87411dffab9
Author: efloden <efloden at redhat.com>
Date: 2018-07-02 (Mon, 02 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
Log Message:
-----------
refactor: ConcurrentModal to stateless component
Commit: c915546facef1ef829288acb0c91e83cb751bd1c
https://github.com/zanata/zanata-platform/commit/c915546facef1ef829288acb0c91e83cb751bd1c
Author: efloden <efloden at redhat.com>
Date: 2018-07-05 (Thu, 05 Jul 2018)
Changed paths:
M .editorconfig
M server/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M server/functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.kt
R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.kt
R server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
A server/functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.kt
M server/functional-test/src/test/java/org/zanata/feature/endtoend/AdminEndToEndTest.java
M server/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
A server/services/src/main/java/org/zanata/rest/admin/ServerSettingsService.java
M server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
A server/services/src/test/java/org/zanata/rest/admin/ServerSettingsServiceTest.java
A server/zanata-frontend/src/app/actions/admin-actions.ts
A server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
M server/zanata-frontend/src/app/containers/Admin/index.js
M server/zanata-frontend/src/app/containers/Root.js
M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
M server/zanata-frontend/src/app/editor/middlewares/new-context-fetch.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/reducers/admin-reducer.test.js
M server/zanata-frontend/src/app/styles/antd.less
M server/zanata-frontend/src/index.html
M server/zanata-frontend/src/messages/ja.json
M server/zanata-war/src/main/webapp/account/register.xhtml
R server/zanata-war/src/main/webapp/admin/home.xhtml
R server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300
Commit: 5f8c24cf0dbd87cb23dc7f047c24afd93adc2271
https://github.com/zanata/zanata-platform/commit/5f8c24cf0dbd87cb23dc7f047c24afd93adc2271
Author: efloden <efloden at redhat.com>
Date: 2018-07-09 (Mon, 09 Jul 2018)
Changed paths:
M server/zanata-frontend/src/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/app/editor/actions/key-shortcuts-actions.js
M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
M server/zanata-frontend/src/app/editor/components/TransUnit/index.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.test.js
M server/zanata-frontend/src/app/editor/components/Validation/Validation.test.js
M server/zanata-frontend/src/app/editor/components/Validation/index.tsx
A server/zanata-frontend/src/app/editor/components/ValidationErrorsModal/index.tsx
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
M server/zanata-frontend/src/app/editor/utils/phrase-util.ts
M server/zanata-frontend/src/app/editor/utils/phrase.ts
M server/zanata-frontend/src/app/editor/utils/status-util.ts
M server/zanata-frontend/src/app/editor/watchers/phrase-detail.js
M server/zanata-frontend/src/app/validators/AbstractValidationAction.ts
M server/zanata-frontend/src/app/validators/ValidationMessages.ts
M server/zanata-frontend/src/app/validators/impl/JavaVariablesValidation.ts
M server/zanata-frontend/src/app/validators/impl/PrintfVariablesValidation.ts
M server/zanata-frontend/src/app/validators/impl/PrintfXSIExtensionValidation.test.js
M server/zanata-frontend/src/app/validators/impl/XmlEntityValidation.test.js
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300
Commit: cd0fa8b1bd0c15c23f051788c98508e0f97e2bf9
https://github.com/zanata/zanata-platform/commit/cd0fa8b1bd0c15c23f051788c98508e0f97e2bf9
Author: efloden <efloden at redhat.com>
Date: 2018-07-09 (Mon, 09 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
Log Message:
-----------
fix: dom hierarchy no div within p
Commit: e94268ba057e515b145822a151c11e29053c5286
https://github.com/zanata/zanata-platform/commit/e94268ba057e515b145822a151c11e29053c5286
Author: efloden <efloden at redhat.com>
Date: 2018-07-12 (Thu, 12 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
Log Message:
-----------
fix: update phrase status on conflict resolution save
Commit: f1e59fc505a8c1c33764e629bec3bc893ffa68e5
https://github.com/zanata/zanata-platform/commit/f1e59fc505a8c1c33764e629bec3bc893ffa68e5
Author: efloden <efloden at redhat.com>
Date: 2018-07-12 (Thu, 12 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
M server/zanata-frontend/src/app/containers/Languages/index.js
M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/reducers/admin-reducer.test.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
M server/zanata-frontend/src/app/reducers/version-reducer.js
Log Message:
-----------
refactor: specify duration for all notifications
Commit: d03d62cd4786801d69619fa39e193488d246c64a
https://github.com/zanata/zanata-platform/commit/d03d62cd4786801d69619fa39e193488d246c64a
Author: efloden <efloden at redhat.com>
Date: 2018-07-12 (Thu, 12 Jul 2018)
Changed paths:
M server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
Log Message:
-----------
feat: close concurrent edit notification on save as latest/original
Commit: a1262ada1d0569abbf909b23fa2016db588db725
https://github.com/zanata/zanata-platform/commit/a1262ada1d0569abbf909b23fa2016db588db725
Author: efloden <efloden at redhat.com>
Date: 2018-07-12 (Thu, 12 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/components/Icon/index.tsx
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/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/package.json
M server/zanata-frontend/src/tslint.json
M server/zanata-frontend/src/yarn.lock
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300
Commit: 61b317ce2b6b12c2308446fc9c1e0d8a5ca614bb
https://github.com/zanata/zanata-platform/commit/61b317ce2b6b12c2308446fc9c1e0d8a5ca614bb
Author: kgough <kgough at redhat.com>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
R server/zanata-frontend/src/app/components/Button/Button.story.js
M server/zanata-frontend/src/app/components/components.story.js
M server/zanata-frontend/src/app/styles/antd.less
M server/zanata-frontend/src/app/styles/styleguide.less
Log Message:
-----------
style(ZNTA-2537) update storybooks
Commit: c8762ee6cdd3689dc34dae2c1232615441e8db8d
https://github.com/zanata/zanata-platform/commit/c8762ee6cdd3689dc34dae2c1232615441e8db8d
Author: kgough <kgough at redhat.com>
Date: 2018-07-16 (Mon, 16 Jul 2018)
Changed paths:
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
M server/zanata-frontend/src/app/components/LockIcon/index.tsx
M server/zanata-frontend/src/app/styles/styleguide.less
Log Message:
-----------
style(ZNTA-2537) fix warnings in LockIcon test, update snapshots
Commit: 3a7dfe06ac5dbd24e02de15f322a881e14fa35d6
https://github.com/zanata/zanata-platform/commit/3a7dfe06ac5dbd24e02de15f322a881e14fa35d6
Author: efloden <efloden at redhat.com>
Date: 2018-07-17 (Tue, 17 Jul 2018)
Changed paths:
M server/functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
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
R server/zanata-frontend/src/app/components/Alert/Alert.story.js
R server/zanata-frontend/src/app/components/Badge/Badge.story.js
R server/zanata-frontend/src/app/components/Breadcrumbs/Breadcrumbs.story.js
M server/zanata-frontend/src/app/components/Button/Button.story.js
M server/zanata-frontend/src/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
M server/zanata-frontend/src/app/components/DraggableVersionPanels/index.tsx
R server/zanata-frontend/src/app/components/Dropdown/Dropdown.story.js
M server/zanata-frontend/src/app/components/EditableText/EditableText.story.js
M server/zanata-frontend/src/app/components/EditableText/index.js
R server/zanata-frontend/src/app/components/Form/Form.story.js
M server/zanata-frontend/src/app/components/Icon/Icon.story.js
R server/zanata-frontend/src/app/components/Label/Label.story.js
M server/zanata-frontend/src/app/components/Link/Link.story.js
R server/zanata-frontend/src/app/components/List/List.story.js
M server/zanata-frontend/src/app/components/LoaderText/LoaderText.story.js
M server/zanata-frontend/src/app/components/LoaderText/index.js
M server/zanata-frontend/src/app/components/LogoLoader/index.less
M server/zanata-frontend/src/app/components/Modal/index.jsx
M server/zanata-frontend/src/app/components/Nav/index.jsx
R server/zanata-frontend/src/app/components/Notification/component.js
R server/zanata-frontend/src/app/components/Pagination/Pagination.story.js
R server/zanata-frontend/src/app/components/Panel/Panel.story.js
M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.js
M server/zanata-frontend/src/app/components/ProgressBar/CancellableProgressBar.test.js
M server/zanata-frontend/src/app/components/ProgressBar/ProgressBar.story.js
M server/zanata-frontend/src/app/components/RejectionsForm/index.js
M server/zanata-frontend/src/app/components/RejectionsForm/index.less
R server/zanata-frontend/src/app/components/SelectableDropdown/SelectableDropdown.test.js
R server/zanata-frontend/src/app/components/SelectableDropdown/index.js
M server/zanata-frontend/src/app/components/Sidebar/Sidebar.story.js
M server/zanata-frontend/src/app/components/Sidebar/index.jsx
M server/zanata-frontend/src/app/components/Sidebar/index.less
M server/zanata-frontend/src/app/components/TMX/TMXExportModal.js
M server/zanata-frontend/src/app/components/TMX/index.less
R server/zanata-frontend/src/app/components/Table/Table.story.js
R server/zanata-frontend/src/app/components/Tabs/Tabs.story.js
M server/zanata-frontend/src/app/components/TextInput/TextInput.story.js
R server/zanata-frontend/src/app/components/Tooltip/Tooltip.story.js
M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.story.js
M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckbox.test.js
M server/zanata-frontend/src/app/components/TriCheckbox/TriCheckboxGroup.js
M server/zanata-frontend/src/app/components/TriCheckbox/index.js
M server/zanata-frontend/src/app/components/TriCheckbox/index.less
R server/zanata-frontend/src/app/components/VersionTMMergeModal/VersionTMMergeModal.story.js
R server/zanata-frontend/src/app/components/Well/Well.story.js
M server/zanata-frontend/src/app/components/components.story.js
M server/zanata-frontend/src/app/components/foundation.story.js
M server/zanata-frontend/src/app/components/index.js
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Admin/index.less
M server/zanata-frontend/src/app/containers/App.js
M server/zanata-frontend/src/app/containers/Explore/GroupTeaser.jsx
M server/zanata-frontend/src/app/containers/Explore/LanguageTeamTeaser.jsx
M server/zanata-frontend/src/app/containers/Explore/ProjectTeaser.jsx
M server/zanata-frontend/src/app/containers/Explore/TeaserList.jsx
M server/zanata-frontend/src/app/containers/Explore/TeaserListHeader.jsx
M server/zanata-frontend/src/app/containers/Explore/UserTeaser.jsx
M server/zanata-frontend/src/app/containers/Explore/index.js
M server/zanata-frontend/src/app/containers/Explore/index.less
M server/zanata-frontend/src/app/containers/Glossary/DeleteAllEntriesModal.jsx
M server/zanata-frontend/src/app/containers/Glossary/DeleteEntryModal.jsx
M server/zanata-frontend/src/app/containers/Glossary/Entry.js
M server/zanata-frontend/src/app/containers/Glossary/EntryModal.js
M server/zanata-frontend/src/app/containers/Glossary/ExportModal.js
M server/zanata-frontend/src/app/containers/Glossary/Header.jsx
M server/zanata-frontend/src/app/containers/Glossary/ImportModal.js
M server/zanata-frontend/src/app/containers/Glossary/ViewHeader.js
M server/zanata-frontend/src/app/containers/Glossary/index.js
M server/zanata-frontend/src/app/containers/Glossary/index.less
M server/zanata-frontend/src/app/containers/Languages/DeleteEntry.js
M server/zanata-frontend/src/app/containers/Languages/Entry.js
M server/zanata-frontend/src/app/containers/Languages/NewLanguageModal.js
M server/zanata-frontend/src/app/containers/Languages/index.js
M server/zanata-frontend/src/app/containers/Languages/index.less
M server/zanata-frontend/src/app/containers/ProjectVersion/DocumentsPage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/GroupsPage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/LanguagesPage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/PeoplePage.js
M server/zanata-frontend/src/app/containers/ProjectVersion/ProjectVersionPanels.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeImportedTM.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeModal.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectSources.js
M server/zanata-frontend/src/app/containers/ProjectVersion/TMMergeProjectTMOptions.js
M server/zanata-frontend/src/app/containers/ProjectVersion/index.less
M server/zanata-frontend/src/app/containers/ProjectVersion/project-version-displays.js
M server/zanata-frontend/src/app/containers/UserProfile/CalendarMonthMatrix.jsx
M server/zanata-frontend/src/app/containers/UserProfile/CalendarPeriodHeading.jsx
M server/zanata-frontend/src/app/containers/UserProfile/CategoryItemMatrix.tsx
M server/zanata-frontend/src/app/containers/UserProfile/CategoryMatrixTable.jsx
M server/zanata-frontend/src/app/containers/UserProfile/DayMatrix.jsx
M server/zanata-frontend/src/app/containers/UserProfile/FilterableMatrixTable.jsx
M server/zanata-frontend/src/app/containers/UserProfile/RecentContributions.jsx
M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
M server/zanata-frontend/src/app/containers/UserProfile/index.less
M server/zanata-frontend/src/app/editor/components/Button/index.css
M server/zanata-frontend/src/app/editor/components/GlossaryTermModal/component.js
M server/zanata-frontend/src/app/editor/components/Pager/Pager.test.tsx
M server/zanata-frontend/src/app/editor/components/Pager/index.js
M server/zanata-frontend/src/app/editor/components/SuggestionUpdateMessage.js
M server/zanata-frontend/src/app/editor/components/TransUnit/index.css
M server/zanata-frontend/src/app/editor/components/TransUnitLocaleHeading.js
M server/zanata-frontend/src/app/editor/components/TransUnitSourceHeader.js
M server/zanata-frontend/src/app/editor/components/TransUnitSourcePanel.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationHeader.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/containers/ControlsHeader.js
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/containers/NavHeader.js
M server/zanata-frontend/src/app/editor/containers/Sidebar/index.css
M server/zanata-frontend/src/app/editor/containers/SuggestionsHeader.js
M server/zanata-frontend/src/app/entrypoint/index.js
R server/zanata-frontend/src/app/styles/ant-theme-vars.less
M server/zanata-frontend/src/app/styles/antd.less
A server/zanata-frontend/src/app/styles/antdvars.less
R server/zanata-frontend/src/app/styles/bstrap-styleguide.less
M server/zanata-frontend/src/app/styles/frontend-jsf.less
M server/zanata-frontend/src/app/styles/frontend-nav.less
M server/zanata-frontend/src/app/styles/style.less
R server/zanata-frontend/src/app/styles/styleguide.css
A server/zanata-frontend/src/app/styles/styleguide.less
R server/zanata-frontend/src/app/styles/variables.less
M server/zanata-frontend/src/package.json
M server/zanata-frontend/src/webpack.config.js
M server/zanata-frontend/src/yarn.lock
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata-platform into editor-concurrent-save/ZNTA-2300
Commit: ee0589a8eb9a89385a3ee59311daf4f3f5a46d66
https://github.com/zanata/zanata-platform/commit/ee0589a8eb9a89385a3ee59311daf4f3f5a46d66
Author: Earl Floden <efloden at redhat.com>
Date: 2018-07-17 (Tue, 17 Jul 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
M server/zanata-frontend/src/app/containers/Languages/index.js
M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/components/components.story.js
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/reducers/admin-reducer.test.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
M server/zanata-frontend/src/app/reducers/version-reducer.js
Log Message:
-----------
Merge pull request #911 from zanata/editor-concurrent-save/ZNTA-2300
feat(ZNTA-2300): editor concurrent save resolution
Commit: 9ee2079de33347dc417c71a89947bc1eb52a37c6
https://github.com/zanata/zanata-platform/commit/9ee2079de33347dc417c71a89947bc1eb52a37c6
Author: Kathryn Gough <kgough at redhat.com>
Date: 2018-07-17 (Tue, 17 Jul 2018)
Changed paths:
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
R server/zanata-frontend/src/app/components/Button/Button.story.js
M server/zanata-frontend/src/app/components/LockIcon/LockIcon.test.js
M server/zanata-frontend/src/app/components/LockIcon/index.tsx
M server/zanata-frontend/src/app/components/components.story.js
M server/zanata-frontend/src/app/styles/antd.less
Log Message:
-----------
Merge pull request #952 from zanata/ZNTA-2537
style(ZNTA-2537) update storybooks and tests
Commit: 2b9de285e125ad62815e1face7d2561779876a1a
https://github.com/zanata/zanata-platform/commit/2b9de285e125ad62815e1face7d2561779876a1a
Author: kgough <kgough at redhat.com>
Date: 2018-07-17 (Tue, 17 Jul 2018)
Changed paths:
M server/services/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
M server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M server/services/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
M server/zanata-frontend/src/.storybook-frontend/__snapshots__/storyshots-frontend.test.js.snap
R server/zanata-frontend/src/app/components/Button/Button.story.js
M server/zanata-frontend/src/app/components/components.story.js
M server/zanata-frontend/src/app/containers/Admin/Review.js
M server/zanata-frontend/src/app/containers/Admin/ServerSettings.tsx
M server/zanata-frontend/src/app/containers/Languages/index.js
M server/zanata-frontend/src/app/containers/UserProfile/index.jsx
M server/zanata-frontend/src/app/editor/actions/phrases-action-types.js
M server/zanata-frontend/src/app/editor/actions/phrases-actions.js
R server/zanata-frontend/src/app/editor/components/ConcurrentModal/Concurrent.story.js
R server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.js
A server/zanata-frontend/src/app/editor/components/ConcurrentModal/index.tsx
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationFooter.js
M server/zanata-frontend/src/app/editor/components/TransUnitTranslationPanel.js
M server/zanata-frontend/src/app/editor/components/components.story.js
M server/zanata-frontend/src/app/editor/containers/MainContent.js
M server/zanata-frontend/src/app/editor/containers/TranslationInfoPanel/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/index.js
M server/zanata-frontend/src/app/editor/reducers/phrase-reducer/phrase-reducer.test.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.js
M server/zanata-frontend/src/app/editor/reducers/review-trans-reducer.test.js
M server/zanata-frontend/src/app/reducers/admin-reducer.js
M server/zanata-frontend/src/app/reducers/admin-reducer.test.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
M server/zanata-frontend/src/app/reducers/version-reducer.js
M server/zanata-frontend/src/app/styles/antd.less
Log Message:
-----------
fix merge conflicts
Compare: https://github.com/zanata/zanata-platform/compare/c44760f009c1...2b9de285e125
**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