[zanata/zanata-server] c51355: Use a jndi configured infinispan cache instead of ...
GitHub
noreply at github.com
Thu May 7 23:52:35 UTC 2015
Branch: refs/heads/remove-seam-text
Home: https://github.com/zanata/zanata-server
Commit: c513552187f78dcf7db96af66c6f2b6236c85a71
https://github.com/zanata/zanata-server/commit/c513552187f78dcf7db96af66c6f2b6236c85a71
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HAccount.java
M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HPerson.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
M zanata-model/src/main/java/org/zanata/model/HTermComment.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
Log Message:
-----------
Use a jndi configured infinispan cache instead of ehcahce.
Need to add this to standalone.xml’s infinispan cache container:
jndi-name="java:jboss/infinispan/container/hibernate" start="EAGER"
Commit: ada124a6af46f1a3cbd6d9f42594b51812590dd8
https://github.com/zanata/zanata-server/commit/ada124a6af46f1a3cbd6d9f42594b51812590dd8
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
Log Message:
-----------
Use infinispan as the hibernate search backend.
This revision handles the whole index in memory.
Commit: 925f1ded6ae0ab2abc8f9f56e405399ee8c98c50
https://github.com/zanata/zanata-server/commit/925f1ded6ae0ab2abc8f9f56e405399ee8c98c50
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
Log Message:
-----------
WIP: Adding infinispan-backed hibernate search.
Commit: 9f474f60268e7ed29742407eee135066f4fcf4a4
https://github.com/zanata/zanata-server/commit/9f474f60268e7ed29742407eee135066f4fcf4a4
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
Log Message:
-----------
Re-instate Lucene version property.
Commit: 004e10460dd1dab37c1301e30ea77f218510cad4
https://github.com/zanata/zanata-server/commit/004e10460dd1dab37c1301e30ea77f218510cad4
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
Log Message:
-----------
Change explicit uses of EhCache for Infinispan.
Implement an infinispan cache wrapper.
Commit: 15ec25329b0728de0d46f37b2f9e7f32c00080ef
https://github.com/zanata/zanata-server/commit/15ec25329b0728de0d46f37b2f9e7f32c00080ef
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
Log Message:
-----------
Use injection for the Infinispan cache manager.
Commit: e6adcdbe401a5d50d72515fe08004ce25a872c50
https://github.com/zanata/zanata-server/commit/e6adcdbe401a5d50d72515fe08004ce25a872c50
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M pom.xml
M zanata-war/pom.xml
Log Message:
-----------
Upgrade hibernate and fix infinispan dependency.
Using hibernate dependency as specified by the JBoss AS 7 bom.
Commit: cb7e3303b54cfbb30a3a13486107a1fa16b7b19b
https://github.com/zanata/zanata-server/commit/cb7e3303b54cfbb30a3a13486107a1fa16b7b19b
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
Log Message:
-----------
Add test cache container to unit tests.
This is a memory-only Infinispan cache container.
Commit: 0fa0a8ea34fe1a5c6463daa29f70f081748df0e4
https://github.com/zanata/zanata-server/commit/0fa0a8ea34fe1a5c6463daa29f70f081748df0e4
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/test/java/org/zanata/ArquillianTest.java
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Configure Arquillian integration tests to use Infinispan.
Configuration is kept to in-memory at all times, since persistence should not be needed for integration tests.
Commit: f1a16afa548e0337514d5a093cf8d6938f08c234
https://github.com/zanata/zanata-server/commit/f1a16afa548e0337514d5a093cf8d6938f08c234
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
Log Message:
-----------
Ammend functional test container configuration to use Infinispan.
Using the same configuration as in integration tests in this revision. It could be adapted to use more production-level settings like cache persistence if so required.
Commit: 737b8dc0e93e41f63965914dd04c8101456d70a4
https://github.com/zanata/zanata-server/commit/737b8dc0e93e41f63965914dd04c8101456d70a4
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)
Changed paths:
M pom.xml
M zanata-war/pom.xml
R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
M zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Code review updates for Infinispan caches.
Commit: f245c4a6c664c6aca687c09c7550a60683fdb8da
https://github.com/zanata/zanata-server/commit/f245c4a6c664c6aca687c09c7550a60683fdb8da
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M .gitignore
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
A functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
A functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
A functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/util/Constants.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
A functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
A functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M functional-test/src/test/resources/setup.properties
M pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
A zanata-war/etc/scripts/enableLanguage.groovy
M zanata-war/pom.xml
R zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
A zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/EditorTextFlow.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnit.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnits.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
A zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectVersionResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/StatisticResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TextFlowResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TransUnitResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TranslationResource.java
A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
M zanata-war/src/main/java/org/zanata/service/GravatarService.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/resources/messages_br.properties
A zanata-war/src/main/resources/messages_cs.properties
A zanata-war/src/main/resources/messages_fr.properties
A zanata-war/src/main/resources/messages_hu.properties
A zanata-war/src/main/resources/messages_it.properties
A zanata-war/src/main/resources/messages_ja.properties
A zanata-war/src/main/resources/messages_pt_BR.properties
A zanata-war/src/main/resources/messages_uk.properties
A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
R zanata-war/src/main/webapp/account/changepassword.xhtml
A zanata-war/src/main/webapp/app/config.json
A zanata-war/src/main/webapp/app/css/app.css
A zanata-war/src/main/webapp/app/css/libs.css
A zanata-war/src/main/webapp/app/images/logo-loader/loader.svg
A zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
A zanata-war/src/main/webapp/app/index.html
A zanata-war/src/main/webapp/app/js/app.js
A zanata-war/src/main/webapp/app/js/libs.js
A zanata-war/src/main/webapp/app/js/templates.js
A zanata-war/src/main/webapp/app/maps/app.js.map
A zanata-war/src/main/webapp/app/maps/libs.js.map
A zanata-war/src/main/webapp/app/translations/de.json
A zanata-war/src/main/webapp/app/translations/fr.json
A zanata-war/src/main/webapp/app/translations/locales
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy
A zanata-war/src/test/java/org/zanata/rest/editor/dto/EditorTextFlowTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into infinispan
Commit: 71204e9496c71bf6e07f23180c6276bba4f2c694
https://github.com/zanata/zanata-server/commit/71204e9496c71bf6e07f23180c6276bba4f2c694
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into infinispan
Conflicts:
zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
Commit: db35acc7ba385a9c9d4b6abd22fe674861adce09
https://github.com/zanata/zanata-server/commit/db35acc7ba385a9c9d4b6abd22fe674861adce09
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
A zanata-war/src/main/java/org/zanata/async/Async.java
A zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
A zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
A zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
A zanata-war/src/main/java/org/zanata/async/AsyncTaskResult.java
R zanata-war/src/main/java/org/zanata/async/AsyncUtils.java
R zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
A zanata-war/src/main/java/org/zanata/async/ContainsAsyncMethods.java
R zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
R zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
R zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
A zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
A zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
R zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
R zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
R zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
R zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
R zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
R zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
M zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
M zanata-war/src/main/java/org/zanata/service/DocumentService.java
A zanata-war/src/main/java/org/zanata/service/IndexingService.java
M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
A zanata-war/src/main/java/org/zanata/service/TranslationArchiveService.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
R zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
A zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into infinispan
Conflicts:
zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
Commit: 7b2ea8e1670f2298f553c3b1ab43a106bf82fe11
https://github.com/zanata/zanata-server/commit/7b2ea8e1670f2298f553c3b1ab43a106bf82fe11
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-10-23 (Thu, 23 Oct 2014)
Changed paths:
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
Log Message:
-----------
Rollback changes for hibernate search on top of Infinispan.
This will be tackled as a separate pull request, as there are some performance problems with the combination in question that warrant further investigation.
Commit: 5c83e13d8a3052d19321b2ff0d75f14f6637e9a1
https://github.com/zanata/zanata-server/commit/5c83e13d8a3052d19321b2ff0d75f14f6637e9a1
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-10-23 (Thu, 23 Oct 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
Log Message:
-----------
Make sure Zanata cannot start if the infinispan cache is not configured.
Commit: 9956fe13ee2e75bfedd6b509ada096e2d4c51966
https://github.com/zanata/zanata-server/commit/9956fe13ee2e75bfedd6b509ada096e2d4c51966
Author: Patrick Huang <pahuang at redhat.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M zanata-war/src/main/resources/pluralforms.properties
Log Message:
-----------
add plural form for me-ME
Commit: b2c6d3b6c833ceed2495701ffca52737a66fea1d
https://github.com/zanata/zanata-server/commit/b2c6d3b6c833ceed2495701ffca52737a66fea1d
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
A .travis-settings.xml
M .travis.yml
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
M functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
M functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/page/webtrans/Plurals.java
M functional-test/src/main/java/org/zanata/util/Constants.java
M functional-test/src/main/java/org/zanata/util/PropertiesHolder.java
M functional-test/src/main/java/org/zanata/util/ScreenshotDirForTest.java
M functional-test/src/main/java/org/zanata/util/TableRow.java
M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/Feature.java
M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
R functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
A functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
A functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
M functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java
M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
M functional-test/src/test/java/org/zanata/util/NoScreenshot.java
M functional-test/src/test/java/org/zanata/util/RetryRule.java
M functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
M functional-test/src/test/java/org/zanata/util/ScreenshotEnabledTestRunListener.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M functional-test/src/test/resources/setup.properties
A functional-test/src/test/resources/upload-idml.idml
A functional-test/src/test/resources/upload-odg.odg
A functional-test/src/test/resources/upload-odp.odp
A functional-test/src/test/resources/upload-ods.ods
A functional-test/src/test/resources/upload-odt.odt
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HProject.java
A zanata-model/src/main/java/org/zanata/model/WebHook.java
M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
A zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
A zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
A zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
A zanata-war/src/main/java/org/zanata/events/JSONType.java
A zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
M zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.java
M zanata-war/src/main/java/org/zanata/service/DocumentService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
R zanata-war/src/main/java/org/zanata/ui/ColumnSort.java
R zanata-war/src/main/java/org/zanata/ui/ColumnSortCompositeComponent.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/db/db.changelog.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/processmanager.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/stats.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/resources/fontello/css/fontello.css
R zanata-war/src/main/webapp/resources/richext/columnSorter.xhtml
M zanata-war/src/main/webapp/resources/script/components-script.js
M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
M zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
M zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Merge branch 'master' into infinispan
Conflicts:
zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
Commit: 0501b44f5bbb89b6487823d8c5ad064fcf47470c
https://github.com/zanata/zanata-server/commit/0501b44f5bbb89b6487823d8c5ad064fcf47470c
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
Log Message:
-----------
Refactor initialization logic for cache container.
Commit: 8d9862f84ceb2824385f4d1c537bd8559336e0d5
https://github.com/zanata/zanata-server/commit/8d9862f84ceb2824385f4d1c537bd8559336e0d5
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
Log Message:
-----------
Compilation error fixes.
Commit: e22728b9dbfcc8f53b240580fc7095bb72372f4c
https://github.com/zanata/zanata-server/commit/e22728b9dbfcc8f53b240580fc7095bb72372f4c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
A zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
A zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
A zanata-war/src/main/java/org/zanata/events/Logout.java
A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
A zanata-war/src/main/java/org/zanata/util/Event.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java
Log Message:
-----------
Emulate CDI events with Seam Events
Commit: d8c8f8e5bc5c77a2d85a6bdcee4da22a0f5364a8
https://github.com/zanata/zanata-server/commit/d8c8f8e5bc5c77a2d85a6bdcee4da22a0f5364a8
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Change explode profile.
Some problems with the touching of the dodeploy file and made sure the profile can be activated via a property.
Commit: e239f214029fbbcda7bd03ac49e29763c0999133
https://github.com/zanata/zanata-server/commit/e239f214029fbbcda7bd03ac49e29763c0999133
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
Log Message:
-----------
Replace the use of seam's jsf messages wrapper.
Create Zanata's own wrapper, which may be replaced later with a CDI extension if needed.
Commit: 8cad539f4700d4cbdcd87170d9331effa5c8f683
https://github.com/zanata/zanata-server/commit/8cad539f4700d4cbdcd87170d9331effa5c8f683
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
Log Message:
-----------
Replace all uses of Seam's FacesMessages.
Use Zanata's own FacesMessages class instead.
Commit: d6864ea6b9eb4c7d7b0a66c12aefa3be3b795d9b
https://github.com/zanata/zanata-server/commit/d6864ea6b9eb4c7d7b0a66c12aefa3be3b795d9b
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
Log Message:
-----------
Fix messages not appearing when ending conversations.
Implement a 'cache' of messages that gets transfered to the FacesContext using a jsf phase listener. Preety much what Seam does.
Commit: 01e5b601b95b2e525efc735f24f9098610ce61bd
https://github.com/zanata/zanata-server/commit/01e5b601b95b2e525efc735f24f9098610ce61bd
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
Log Message:
-----------
Fix some functional tests.
The new messages phase listener was acting at the wrong time and causing Seam to re-create some page scoped beans.
Commit: 72fce56b7041e8cec9aa61d1633950b020d1328b
https://github.com/zanata/zanata-server/commit/72fce56b7041e8cec9aa61d1633950b020d1328b
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
Log Message:
-----------
Add unit tests to satisfy coverage requirements.
Commit: 5e5208b3ab0d8fe7bdd2eeaf2760474fc15a0160
https://github.com/zanata/zanata-server/commit/5e5208b3ab0d8fe7bdd2eeaf2760474fc15a0160
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
Log Message:
-----------
Update code formatting to match checkstyle rules
Commit: bfcfd5438fd9b6926e168017fb674fd66cc9f5dd
https://github.com/zanata/zanata-server/commit/bfcfd5438fd9b6926e168017fb674fd66cc9f5dd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-04 (Wed, 04 Feb 2015)
Changed paths:
M functional-test/pom.xml
R functional-test/src/etc/wildflyModules.groovy
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
A functional-test/src/test/java/org/zanata/util/TestLogger.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M pom.xml
M zanata-model/pom.xml
M zanata-overlay/build.gradle
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/resources/messages_af.properties
A zanata-war/src/main/resources/messages_am.properties
A zanata-war/src/main/resources/messages_ar.properties
A zanata-war/src/main/resources/messages_as.properties
A zanata-war/src/main/resources/messages_ast.properties
A zanata-war/src/main/resources/messages_az.properties
A zanata-war/src/main/resources/messages_bg.properties
A zanata-war/src/main/resources/messages_bn_BD.properties
A zanata-war/src/main/resources/messages_bn_IN.properties
M zanata-war/src/main/resources/messages_br.properties
A zanata-war/src/main/resources/messages_brx.properties
A zanata-war/src/main/resources/messages_bs.properties
A zanata-war/src/main/resources/messages_ca.properties
M zanata-war/src/main/resources/messages_cs.properties
A zanata-war/src/main/resources/messages_cy.properties
A zanata-war/src/main/resources/messages_da.properties
A zanata-war/src/main/resources/messages_de.properties
A zanata-war/src/main/resources/messages_de_CH.properties
A zanata-war/src/main/resources/messages_de_DE.properties
A zanata-war/src/main/resources/messages_el.properties
A zanata-war/src/main/resources/messages_en_GB.properties
A zanata-war/src/main/resources/messages_eo.properties
A zanata-war/src/main/resources/messages_es.properties
A zanata-war/src/main/resources/messages_es_ES.properties
A zanata-war/src/main/resources/messages_es_MX.properties
A zanata-war/src/main/resources/messages_et.properties
A zanata-war/src/main/resources/messages_eu.properties
A zanata-war/src/main/resources/messages_fa.properties
A zanata-war/src/main/resources/messages_fi.properties
M zanata-war/src/main/resources/messages_fr.properties
A zanata-war/src/main/resources/messages_ga.properties
A zanata-war/src/main/resources/messages_gl.properties
A zanata-war/src/main/resources/messages_gu.properties
A zanata-war/src/main/resources/messages_he.properties
A zanata-war/src/main/resources/messages_hi.properties
A zanata-war/src/main/resources/messages_hr.properties
M zanata-war/src/main/resources/messages_hu.properties
A zanata-war/src/main/resources/messages_id.properties
A zanata-war/src/main/resources/messages_is.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
A zanata-war/src/main/resources/messages_ka.properties
A zanata-war/src/main/resources/messages_kn.properties
A zanata-war/src/main/resources/messages_ko.properties
A zanata-war/src/main/resources/messages_ky.properties
A zanata-war/src/main/resources/messages_la.properties
A zanata-war/src/main/resources/messages_lt.properties
A zanata-war/src/main/resources/messages_lv.properties
A zanata-war/src/main/resources/messages_mai.properties
A zanata-war/src/main/resources/messages_ml.properties
A zanata-war/src/main/resources/messages_mn.properties
A zanata-war/src/main/resources/messages_mr.properties
A zanata-war/src/main/resources/messages_ms.properties
A zanata-war/src/main/resources/messages_nb.properties
A zanata-war/src/main/resources/messages_nds.properties
A zanata-war/src/main/resources/messages_nl.properties
A zanata-war/src/main/resources/messages_nn.properties
A zanata-war/src/main/resources/messages_or.properties
A zanata-war/src/main/resources/messages_pa.properties
A zanata-war/src/main/resources/messages_pl.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
A zanata-war/src/main/resources/messages_pt_PT.properties
A zanata-war/src/main/resources/messages_ro.properties
A zanata-war/src/main/resources/messages_ru.properties
A zanata-war/src/main/resources/messages_si.properties
A zanata-war/src/main/resources/messages_sk.properties
A zanata-war/src/main/resources/messages_sl.properties
A zanata-war/src/main/resources/messages_sq.properties
A zanata-war/src/main/resources/messages_sr_Cyrl.properties
A zanata-war/src/main/resources/messages_sr_Latn.properties
A zanata-war/src/main/resources/messages_sv.properties
A zanata-war/src/main/resources/messages_ta.properties
A zanata-war/src/main/resources/messages_ta_IN.properties
A zanata-war/src/main/resources/messages_te.properties
A zanata-war/src/main/resources/messages_th.properties
A zanata-war/src/main/resources/messages_tl.properties
A zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
A zanata-war/src/main/resources/messages_vi.properties
A zanata-war/src/main/resources/messages_xh.properties
A zanata-war/src/main/resources/messages_zh_Hans_CN.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/app/config.json
M zanata-war/src/main/webapp/app/css/app.css
M zanata-war/src/main/webapp/app/css/libs.css
M zanata-war/src/main/webapp/app/index.html
M zanata-war/src/main/webapp/app/js/app.js
M zanata-war/src/main/webapp/app/js/libs.js
M zanata-war/src/main/webapp/app/js/templates.js
M zanata-war/src/main/webapp/app/maps/app.js.map
M zanata-war/src/main/webapp/app/maps/libs.js.map
M zanata-war/src/main/webapp/app/translations/de.json
M zanata-war/src/main/webapp/app/translations/fr.json
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
M zanata-war/src/test/resources/arquillian.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into cdi-prep
Conflicts:
zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
Commit: 962ce62b748df35297905a1cd1d0eee825a7b183
https://github.com/zanata/zanata-server/commit/962ce62b748df35297905a1cd1d0eee825a7b183
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M zanata-war/src/main/resources/messages_br.properties
M zanata-war/src/main/resources/messages_cs.properties
M zanata-war/src/main/resources/messages_en_GB.properties
M zanata-war/src/main/resources/messages_eo.properties
M zanata-war/src/main/resources/messages_fr.properties
M zanata-war/src/main/resources/messages_hu.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
M zanata-war/src/main/resources/messages_ru.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
Log Message:
-----------
Frech updated translations from translate.zanata.org
Commit: 34bc4e6bb0d8d138bad21f8d9e0cd5bfdf03d04b
https://github.com/zanata/zanata-server/commit/34bc4e6bb0d8d138bad21f8d9e0cd5bfdf03d04b
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release server-3.6.0
Commit: 0e2193d26bd84f061af1f99549a27c6eac8efbf0
https://github.com/zanata/zanata-server/commit/0e2193d26bd84f061af1f99549a27c6eac8efbf0
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 69eb5776d9ca18e1391f7905be5e345d693d8d85
https://github.com/zanata/zanata-server/commit/69eb5776d9ca18e1391f7905be5e345d693d8d85
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-26 (Thu, 26 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-test-war/pom.xml
M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
R zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
R zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/db/db.changelog.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
R zanata-war/src/main/webapp/admin/language.xhtml
R zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
Log Message:
-----------
Merge branch 'master' into cdi-prep
Conflicts:
zanata-war/pom.xml
zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
zanata-war/src/main/java/org/zanata/action/LanguageAction.java
zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
Commit: 7f4463714eee3e0fe3957461f3e6b977863b99ad
https://github.com/zanata/zanata-server/commit/7f4463714eee3e0fe3957461f3e6b977863b99ad
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-26 (Thu, 26 Feb 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Fix dependency problem
Commit: f258e488784fb1114e8a323803336b0109fa0520
https://github.com/zanata/zanata-server/commit/f258e488784fb1114e8a323803336b0109fa0520
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-26 (Thu, 26 Feb 2015)
Changed paths:
M .gitignore
M build.sh
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M functional-test/src/test/resources/log4j.xml
M functional-test/src/test/resources/setup.properties
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/app/index.html
A zanata-war/src/main/webapp/resources/script/test/finished.js
Log Message:
-----------
Merge branch 'reduce-boms' into cdi-prep
Conflicts:
pom.xml
Commit: 8dc9f6ceca14e9317da48f9041d5f6e51b307e36
https://github.com/zanata/zanata-server/commit/8dc9f6ceca14e9317da48f9041d5f6e51b307e36
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2015-02-27 (Fri, 27 Feb 2015)
Changed paths:
M .gitignore
M build.sh
A etc/scripts/cargowait.sh
A etc/scripts/functional-test-db-snapshot.sh
A etc/scripts/standalone.cli.messaging.config
A functional-test/etc/mysql-socket.groovy
M functional-test/pom.xml
R functional-test/src/etc/wildflyModules.groovy
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/util/TableRow.java
M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
R functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
R functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
A functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
R functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
R functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
R functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
A functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
A functional-test/src/test/java/org/zanata/util/TestLogger.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M functional-test/src/test/resources/log4j.xml
M functional-test/src/test/resources/setup.properties
M pom.xml
R zanata-dist/etc/assembly.xml
R zanata-dist/etc/sql/config_setup.sql
R zanata-dist/pom.xml
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
A zanata-model/src/test/resources/log4j.xml
A zanata-overlay/.gitignore
A zanata-overlay/build.gradle
A zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
A zanata-overlay/common/bin/zanata-installer/install.bat
A zanata-overlay/common/bin/zanata-installer/install.sh
A zanata-overlay/common/bin/zanata-installer/installer.properties
A zanata-overlay/config/remote-deps.groovy
A zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
A zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-test-war/pom.xml
M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/SortingType.java
R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
A zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
A zanata-war/src/main/java/org/zanata/config/AsyncConfig.java
A zanata-war/src/main/java/org/zanata/config/ConfigStore.java
A zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
A zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
A zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
A zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
A zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
A zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
A zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
A zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
A zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
M zanata-war/src/main/java/org/zanata/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
M zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/db/db.changelog.xml
R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Login Manager.png
R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Service Manager.png
R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kappfinder.png
R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/ksysv.png
R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/locale.png
R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/personal.png
R zanata-war/src/main/resources/images/openid/myopenid.png
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/resources/messages_af.properties
A zanata-war/src/main/resources/messages_am.properties
A zanata-war/src/main/resources/messages_ar.properties
A zanata-war/src/main/resources/messages_as.properties
A zanata-war/src/main/resources/messages_ast.properties
A zanata-war/src/main/resources/messages_az.properties
A zanata-war/src/main/resources/messages_bg.properties
A zanata-war/src/main/resources/messages_bn_BD.properties
A zanata-war/src/main/resources/messages_bn_IN.properties
M zanata-war/src/main/resources/messages_br.properties
A zanata-war/src/main/resources/messages_brx.properties
A zanata-war/src/main/resources/messages_bs.properties
A zanata-war/src/main/resources/messages_ca.properties
M zanata-war/src/main/resources/messages_cs.properties
A zanata-war/src/main/resources/messages_cy.properties
A zanata-war/src/main/resources/messages_da.properties
A zanata-war/src/main/resources/messages_de.properties
A zanata-war/src/main/resources/messages_de_CH.properties
A zanata-war/src/main/resources/messages_de_DE.properties
A zanata-war/src/main/resources/messages_el.properties
A zanata-war/src/main/resources/messages_en_GB.properties
A zanata-war/src/main/resources/messages_eo.properties
A zanata-war/src/main/resources/messages_es.properties
A zanata-war/src/main/resources/messages_es_ES.properties
A zanata-war/src/main/resources/messages_es_MX.properties
A zanata-war/src/main/resources/messages_et.properties
A zanata-war/src/main/resources/messages_eu.properties
A zanata-war/src/main/resources/messages_fa.properties
A zanata-war/src/main/resources/messages_fi.properties
M zanata-war/src/main/resources/messages_fr.properties
A zanata-war/src/main/resources/messages_ga.properties
A zanata-war/src/main/resources/messages_gl.properties
A zanata-war/src/main/resources/messages_gu.properties
A zanata-war/src/main/resources/messages_he.properties
A zanata-war/src/main/resources/messages_hi.properties
A zanata-war/src/main/resources/messages_hr.properties
M zanata-war/src/main/resources/messages_hu.properties
A zanata-war/src/main/resources/messages_id.properties
A zanata-war/src/main/resources/messages_is.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
A zanata-war/src/main/resources/messages_ka.properties
A zanata-war/src/main/resources/messages_kn.properties
A zanata-war/src/main/resources/messages_ko.properties
A zanata-war/src/main/resources/messages_ky.properties
A zanata-war/src/main/resources/messages_la.properties
A zanata-war/src/main/resources/messages_lt.properties
A zanata-war/src/main/resources/messages_lv.properties
A zanata-war/src/main/resources/messages_mai.properties
A zanata-war/src/main/resources/messages_ml.properties
A zanata-war/src/main/resources/messages_mn.properties
A zanata-war/src/main/resources/messages_mr.properties
A zanata-war/src/main/resources/messages_ms.properties
A zanata-war/src/main/resources/messages_nb.properties
A zanata-war/src/main/resources/messages_nds.properties
A zanata-war/src/main/resources/messages_nl.properties
A zanata-war/src/main/resources/messages_nn.properties
A zanata-war/src/main/resources/messages_or.properties
A zanata-war/src/main/resources/messages_pa.properties
A zanata-war/src/main/resources/messages_pl.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
A zanata-war/src/main/resources/messages_pt_PT.properties
A zanata-war/src/main/resources/messages_ro.properties
A zanata-war/src/main/resources/messages_ru.properties
A zanata-war/src/main/resources/messages_si.properties
A zanata-war/src/main/resources/messages_sk.properties
A zanata-war/src/main/resources/messages_sl.properties
A zanata-war/src/main/resources/messages_sq.properties
A zanata-war/src/main/resources/messages_sr_Cyrl.properties
A zanata-war/src/main/resources/messages_sr_Latn.properties
A zanata-war/src/main/resources/messages_sv.properties
A zanata-war/src/main/resources/messages_ta.properties
A zanata-war/src/main/resources/messages_ta_IN.properties
A zanata-war/src/main/resources/messages_te.properties
A zanata-war/src/main/resources/messages_th.properties
A zanata-war/src/main/resources/messages_tl.properties
A zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
A zanata-war/src/main/resources/messages_vi.properties
A zanata-war/src/main/resources/messages_xh.properties
A zanata-war/src/main/resources/messages_zh_Hans_CN.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
A zanata-war/src/main/resources/org/zanata/email/templates/language_team_permission_changed.vm
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
A zanata-war/src/main/webapp-jboss/WEB-INF/ejb-jar.xml
A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-ejb3.xml
A zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/role_rule_edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
R zanata-war/src/main/webapp/admin/language.xhtml
R zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/processmanager.xhtml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
M zanata-war/src/main/webapp/admin/rolerules.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/admin/stats.xhtml
R zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
M zanata-war/src/main/webapp/app/css/app.css
M zanata-war/src/main/webapp/app/css/libs.css
M zanata-war/src/main/webapp/app/index.html
M zanata-war/src/main/webapp/app/js/app.js
M zanata-war/src/main/webapp/app/js/libs.js
M zanata-war/src/main/webapp/app/js/templates.js
M zanata-war/src/main/webapp/app/maps/app.js.map
M zanata-war/src/main/webapp/app/maps/libs.js.map
M zanata-war/src/main/webapp/dashboard/home.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
R zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
R zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/resources/script/components-script.js
A zanata-war/src/main/webapp/resources/script/test/finished.js
M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
M zanata-war/src/main/webapp/tm/create.xhtml
M zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/ForceLoadClass.java
A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
A zanata-war/src/test/java/org/zanata/config/AsyncConfigTest.java
M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
M zanata-war/src/test/java/org/zanata/seam/MethodComponentAccessor.java
M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
M zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
A zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
A zanata-war/src/test/java/org/zanata/validator/UsernameValidationTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
M zanata-war/src/test/resources/arquillian.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
M zanata-war/src/test/resources/log4j.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into infinispan
Conflicts:
pom.xml
zanata-war/pom.xml
zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
Commit: 260dfa2fbc0de5500693bdc8b2b273084a77dadc
https://github.com/zanata/zanata-server/commit/260dfa2fbc0de5500693bdc8b2b273084a77dadc
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-27 (Fri, 27 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
R functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
A functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
A functional-test/src/test/java/org/zanata/util/EmailQuery.java
M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
R zanata-war/src/main/webapp/help/edit_help_content.xhtml
R zanata-war/src/main/webapp/help/view.xhtml
Log Message:
-----------
Merge branch 'integration/master' into cdi-prep
Conflicts:
zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
Commit: 612ee5db075df5a7f90fd0ae39497c17bd86a509
https://github.com/zanata/zanata-server/commit/612ee5db075df5a7f90fd0ae39497c17bd86a509
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
Log Message:
-----------
Fix FacesMessages display component specific message
Commit: 89ce917d98d414fcc239cae5d9b3bb053d6dae95
https://github.com/zanata/zanata-server/commit/89ce917d98d414fcc239cae5d9b3bb053d6dae95
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
Log Message:
-----------
Fix saving server config event
Commit: 45f7a22b4531bf33124a1862460790f2471e7f7d
https://github.com/zanata/zanata-server/commit/45f7a22b4531bf33124a1862460790f2471e7f7d
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-04 (Wed, 04 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
Log Message:
-----------
Merge branch 'master' into cdi-prep
Commit: 1bab304606750c485c662e6c2d320d3428d4f9b9
https://github.com/zanata/zanata-server/commit/1bab304606750c485c662e6c2d320d3428d4f9b9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
Log Message:
-----------
Wait for page silence before and after login
Commit: 88baf2b754890f1b2248ff21d475a06d84030760
https://github.com/zanata/zanata-server/commit/88baf2b754890f1b2248ff21d475a06d84030760
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Reduce unnecessary log warnings
Commit: f66cff370768e87f71e37b4a0e5c6ffca37562fd
https://github.com/zanata/zanata-server/commit/f66cff370768e87f71e37b4a0e5c6ffca37562fd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
Log Message:
-----------
Merge pull request #711 from zanata/wait-around-login
Wait for page silence before and after login
Commit: 5cf48725f04f8cfb1014daf92babf5ad1ea7187e
https://github.com/zanata/zanata-server/commit/5cf48725f04f8cfb1014daf92babf5ad1ea7187e
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
Log Message:
-----------
Skip some notifications which have regressed
Error recorded in RHBZ1199852
Commit: d97eee2537bf1010e46fd21a3c41086fabb63565
https://github.com/zanata/zanata-server/commit/d97eee2537bf1010e46fd21a3c41086fabb63565
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
Log Message:
-----------
Merge pull request #718 from zanata/skip-broken-notifications
Skip some notifications which have regressed
Commit: 9c0e238fb711bbb0fd0f3236f1bde443bbef678e
https://github.com/zanata/zanata-server/commit/9c0e238fb711bbb0fd0f3236f1bde443bbef678e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Update classloader-leak-prevention to 1.12.0
Commit: 17bcbceda57298472cbe470b0d153b528a621023
https://github.com/zanata/zanata-server/commit/17bcbceda57298472cbe470b0d153b528a621023
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
A docs/configuration/authentication.md
A docs/configuration/document-storage-directory.md
A docs/configuration/email.md
A docs/configuration/infinispan.md
A docs/configuration/jms-messaging.md
A docs/images/create-project-completed.png
A docs/images/create-project.png
A docs/images/create-version-master.png
A docs/images/create-version.png
A docs/images/project-about-settings.png
A docs/images/project-general-settings.png
A docs/images/project-languages-add.png
A docs/images/project-languages-remove.png
A docs/images/project-languages-settings.png
A docs/images/project-permissions-settings.png
A docs/images/project-settings-button.png
A docs/images/project-translation-settings.png
A docs/images/user-dashboard-create-version.png
A docs/index.md
A docs/release-notes.md
A docs/user-guide/Opening-a-Translation-Project.md
A docs/user-guide/client-configuration.md
A docs/user-guide/contributing-translations.md
A docs/user-guide/joining-a-language-team.md
A docs/user-guide/keyboard-shortcuts.md
A docs/user-guide/project-types.md
A docs/user-guide/projects/create-project.md
A docs/user-guide/projects/create-version.md
A docs/user-guide/projects/project-settings.md
A docs/user-guide/projects/upload-strings.md
A docs/user-guide/translators-new-account.md
M functional-test/src/main/java/org/zanata/page/BasePage.java
A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
R functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
A functional-test/src/main/java/org/zanata/util/LanguageList.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
A functional-test/src/test/java/org/zanata/util/EmailQuery.java
A mkdocs.yml
M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
A zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
A zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
A zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
A zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
A zanata-war/src/main/java/org/zanata/ui/AbstractTextSearch.java
A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButton.java
A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButtonRenderer.java
A zanata-war/src/main/java/org/zanata/ui/input/TextInput.java
A zanata-war/src/main/java/org/zanata/ui/input/TextInputRenderer.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
M zanata-war/src/main/resources/pluralforms.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
R zanata-war/src/main/webapp/help/edit_help_content.xhtml
R zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/resources/script/components-script.js
A zanata-war/src/main/webapp/resources/script/settings-tab-languages.js
A zanata-war/src/main/webapp/resources/zanata/ajax-command-button.xhtml
A zanata-war/src/main/webapp/resources/zanata/ajax-command-link.xhtml
A zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
A zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into infinispan
Commit: f6bd5b2a61a358a907c8a0fa16d7be3566d60325
https://github.com/zanata/zanata-server/commit/f6bd5b2a61a358a907c8a0fa16d7be3566d60325
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Fix maven validation problems.
Commit: 6531ac9fc9014c2890d3f0376af6f2d6f89aad2b
https://github.com/zanata/zanata-server/commit/6531ac9fc9014c2890d3f0376af6f2d6f89aad2b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
Log Message:
-----------
fail fast if jms is not configured properly
Commit: 895a90e27e66c55c861ee3bf8a95a25b4debad64
https://github.com/zanata/zanata-server/commit/895a90e27e66c55c861ee3bf8a95a25b4debad64
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
Log Message:
-----------
Administration page settings tests
Commit: 2838bcf20d960ce9c8153a4ffed64c670328cef3
https://github.com/zanata/zanata-server/commit/2838bcf20d960ce9c8153a4ffed64c670328cef3
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
Log Message:
-----------
Merge pull request #722 from zanata/admin-page-tests
Administration page settings tests
Commit: e02cd00544f3f92f4168b80a611000d980f4ec2e
https://github.com/zanata/zanata-server/commit/e02cd00544f3f92f4168b80a611000d980f4ec2e
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
M zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
Log Message:
-----------
Correct checkstyle errors
Commit: b2e94a8e847f6dee74bb1ce116b394bce3813134
https://github.com/zanata/zanata-server/commit/b2e94a8e847f6dee74bb1ce116b394bce3813134
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
A docs/configuration/authentication.md
A docs/configuration/document-storage-directory.md
A docs/configuration/email.md
A docs/configuration/infinispan.md
A docs/configuration/jms-messaging.md
A docs/images/create-project-completed.png
A docs/images/create-project.png
A docs/images/create-version-master.png
A docs/images/create-version.png
A docs/images/project-about-settings.png
A docs/images/project-general-settings.png
A docs/images/project-languages-add.png
A docs/images/project-languages-remove.png
A docs/images/project-languages-settings.png
A docs/images/project-permissions-settings.png
A docs/images/project-settings-button.png
A docs/images/project-translation-settings.png
A docs/images/user-dashboard-create-version.png
A docs/index.md
A docs/release-notes.md
A docs/user-guide/Opening-a-Translation-Project.md
A docs/user-guide/client-configuration.md
A docs/user-guide/contributing-translations.md
A docs/user-guide/joining-a-language-team.md
A docs/user-guide/keyboard-shortcuts.md
A docs/user-guide/project-types.md
A docs/user-guide/projects/create-project.md
A docs/user-guide/projects/create-version.md
A docs/user-guide/projects/project-settings.md
A docs/user-guide/projects/upload-strings.md
A docs/user-guide/translators-new-account.md
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
A functional-test/src/main/java/org/zanata/util/LanguageList.java
R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
A mkdocs.yml
M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
A zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
A zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
A zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
A zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
A zanata-war/src/main/java/org/zanata/ui/AbstractTextSearch.java
A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButton.java
A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButtonRenderer.java
A zanata-war/src/main/java/org/zanata/ui/input/TextInput.java
A zanata-war/src/main/java/org/zanata/ui/input/TextInputRenderer.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/pluralforms.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
A zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
M zanata-war/src/main/webapp/resources/script/components-script.js
A zanata-war/src/main/webapp/resources/script/settings-tab-languages.js
A zanata-war/src/main/webapp/resources/zanata/ajax-command-button.xhtml
A zanata-war/src/main/webapp/resources/zanata/ajax-command-link.xhtml
A zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
A zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into cdi-prep
Conflicts:
zanata-war/src/main/java/org/zanata/action/VersionHome.java
Commit: 38cab87c6daee3f3e1230a0ffbfc21d9f153927f
https://github.com/zanata/zanata-server/commit/38cab87c6daee3f3e1230a0ffbfc21d9f153927f
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M docs/configuration/infinispan.md
M docs/release-notes.md
M mkdocs.yml
Log Message:
-----------
Activate Infinispan configuration documentation.
Commit: 1c0294e98365ebcb41e4fc2ef603037cbc203ee2
https://github.com/zanata/zanata-server/commit/1c0294e98365ebcb41e4fc2ef603037cbc203ee2
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
Log Message:
-----------
Enable reset of the from email and loglevel config options under test
Commit: 72a6b50b33e77757c9c46a6016e11669332b5c80
https://github.com/zanata/zanata-server/commit/72a6b50b33e77757c9c46a6016e11669332b5c80
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Add Infinispan configuration to all standalone.xml instances.
Commit: e635b29ddd26ef6ec68d181579df73282089c9b4
https://github.com/zanata/zanata-server/commit/e635b29ddd26ef6ec68d181579df73282089c9b4
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
Log Message:
-----------
Merge pull request #723 from zanata/allow-logging-config-reset
Enable reset of the from email and loglevel config options under test
Commit: 76edc6c519aaf5e718f919d73e69472c4f46131b
https://github.com/zanata/zanata-server/commit/76edc6c519aaf5e718f919d73e69472c4f46131b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
Log Message:
-----------
rhbz1201080 - when server url is set to empty, it will not reuse previous set value
Commit: 31ef41ad9828762e7bfb562de6e24e99719a0432
https://github.com/zanata/zanata-server/commit/31ef41ad9828762e7bfb562de6e24e99719a0432
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
change link in language team permission change email template since we don't have that page anymore
Commit: 8769ce18cdeda8318c6474a6aa0144f38e015add
https://github.com/zanata/zanata-server/commit/8769ce18cdeda8318c6474a6aa0144f38e015add
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Merge pull request #725 from zanata/fix-servr-url-bug
Fix servr url bug
Commit: 5decdf0ae1656a341f9cc634a0d001b188ae24df
https://github.com/zanata/zanata-server/commit/5decdf0ae1656a341f9cc634a0d001b188ae24df
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M docs/configuration/infinispan.md
M docs/release-notes.md
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M mkdocs.yml
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HAccount.java
M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HPerson.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
M zanata-model/src/main/java/org/zanata/model/HTermComment.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/pom.xml
A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
M zanata-war/src/test/java/org/zanata/ArquillianTest.java
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Merge pull request #577 from zanata/infinispan
Introduce Infinispan as cache and hibernate back-end
Full functional tests passed. Not attempting a squash merge.
Commit: b919e90ea615e2443c687216d85934982fc44a7b
https://github.com/zanata/zanata-server/commit/b919e90ea615e2443c687216d85934982fc44a7b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Merge pull request #720 from zanata/update-leak-prevention
Update classloader-leak-prevention to 1.12.0
Commit: baef61afe74989d5e2970700c6e10fcfb6efddfb
https://github.com/zanata/zanata-server/commit/baef61afe74989d5e2970700c6e10fcfb6efddfb
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Merge pull request #717 from zanata/reduce-logging
Reduce unnecessary log warnings
Commit: d302e683430b5ecd2ee98279f02ed4b711f04516
https://github.com/zanata/zanata-server/commit/d302e683430b5ecd2ee98279f02ed4b711f04516
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M docs/configuration/infinispan.md
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HAccount.java
M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HPerson.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
M zanata-model/src/main/java/org/zanata/model/HTermComment.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
M zanata-war/pom.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Move back to Ehcache for hibernate 2nd level cache.
At least until a solution is found in terms of compatibility between Wildfly (hibernate 4.3, infinispan 6) and EAP (hibernate 4.2, infinispan 5).
Other data caches will still use infinispan.
Commit: 541fc6c7f37e73a11b23e5c30f8a178d497118a8
https://github.com/zanata/zanata-server/commit/541fc6c7f37e73a11b23e5c30f8a178d497118a8
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M docs/configuration/infinispan.md
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HAccount.java
M zanata-model/src/main/java/org/zanata/model/HAccountResetPasswordKey.java
M zanata-model/src/main/java/org/zanata/model/HCopyTransOptions.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HPerson.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HRoleAssignmentRule.java
M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
M zanata-model/src/main/java/org/zanata/model/HTermComment.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
M zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
M zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
M zanata-war/pom.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Merge pull request #730 from zanata/revert-hibernate-infinispan
Move back to Ehcache for hibernate 2nd level cache.
Commit: d0b3c45f212b5c7841f1e414e3b807cd9551573e
https://github.com/zanata/zanata-server/commit/d0b3c45f212b5c7841f1e414e3b807cd9551573e
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2015-03-16 (Mon, 16 Mar 2015)
Changed paths:
M docs/configuration/infinispan.md
Log Message:
-----------
Remove some mentions of Hibernate in the docs caches' section.
Commit: 7f16400f2379acab61ee3af5a0ac990729d9408c
https://github.com/zanata/zanata-server/commit/7f16400f2379acab61ee3af5a0ac990729d9408c
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2015-03-16 (Mon, 16 Mar 2015)
Changed paths:
M docs/configuration/infinispan.md
Log Message:
-----------
Merge pull request #731 from zanata/docs-cache-update
Remove some mentions of Hibernate in the docs caches' section.
Commit: 649a824cb6c6509f75c0b1d0c639be78dbc433b3
https://github.com/zanata/zanata-server/commit/649a824cb6c6509f75c0b1d0c639be78dbc433b3
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2015-03-16 (Mon, 16 Mar 2015)
Changed paths:
M docs/configuration/authentication.md
A docs/configuration/installation.md
A docs/images/project-view-versions.png
A docs/images/version-view-languages.png
A docs/user-guide/projects/project-view.md
A docs/user-guide/versions/version-view.md
M mkdocs.yml
Log Message:
-----------
Documentation imprevovements.
See Pull Request: https://github.com/zanata/zanata-server/pull/729
Squashed commit of the following:
commit 28f03c1b70c2f4cdeb44a150efb4adb1fefb7885
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: Mon Mar 16 08:46:13 2015 +1000
Documentation spelling errors and other review comments.
commit 2e2bca41c0aef40cd3ab9c3b0d77cc3111f567c1
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: Thu Mar 12 14:25:36 2015 +1000
Add installation documentation.
commit add05845332b31b88a1e2158b68169ceb7a45200
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: Fri Mar 6 17:49:08 2015 +1000
Add a project and version view sections.
Commit: 4ea3f29b862bbe4bf08a12bec629f7aecf43b7f2
https://github.com/zanata/zanata-server/commit/4ea3f29b862bbe4bf08a12bec629f7aecf43b7f2
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-17 (Tue, 17 Mar 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
Log Message:
-----------
rhbz1194543 - change resId for plaintext and libreoffice to be content hash.
Closes #724
Squashed commit of the following:
commit 4eb3604690c332cd3c1af961b47eceb2f1f67fef
Author: David Mason <drdmason at gmail.com>
Date: Tue Mar 17 12:47:40 2015 +1000
Add timeout requirement to release notes.
Testing found that the server can timeout during startup if there is
enough data to migrate, so it may be necessary to increase the server
startup timeout in the server configuration. This is now documented.
commit 7e4b1de3dde5e6096f3cf87e7a6800cce34ce652
Author: David Mason <drdmason at gmail.com>
Date: Mon Mar 16 13:57:17 2015 +1000
Improve logging during id migration from positional to hash-based.
commit bcc5dfb267c1745e996dab874333294e1f2c3150
Author: David Mason <drdmason at gmail.com>
Date: Fri Mar 13 10:17:04 2015 +1000
Add release notes entry for using content hash for text document id
commit 74934bcb1a4ab025cff5fe7da08f947b310715a4
Author: David Mason <drdmason at gmail.com>
Date: Thu Mar 12 13:57:29 2015 +1000
Use try-with-resources for prepared statements when migrating resId from positional to content hash
commit f71d9cb82fa1c7cfa031a3e64b9b90612397397e
Author: David Mason <drdmason at gmail.com>
Date: Thu Mar 12 13:33:13 2015 +1000
Add warning note to some text unit id sources
commit 674f99cd26ca972a3be60df32a627c1023fdc486
Author: David Mason <drdmason at gmail.com>
Date: Tue Mar 10 13:23:47 2015 +1000
Change resId for plaintext and libreoffice to use content hash.
This includes migration of resId in all existing documents of
the above types to be the content hash.
Commit: bacdfcdba3dafc7c20f66e504b2aa9458ead53ae
https://github.com/zanata/zanata-server/commit/bacdfcdba3dafc7c20f66e504b2aa9458ead53ae
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-17 (Tue, 17 Mar 2015)
Changed paths:
A docs/images/version-merge-trans-cancel.png
A docs/images/version-merge-trans-dialog.png
A docs/images/version-merge-trans-progress.png
A docs/images/version-more-action-menu.png
M docs/release-notes.md
A docs/user-guide/merge-translations.md
M mkdocs.yml
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
A zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
A zanata-war/src/main/java/org/zanata/ui/CopyAction.java
M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml
Log Message:
-----------
Implement merge translation from existing version: https://bugzilla.redhat.com/show_bug.cgi?id=1133989
Squashed commit of the following:
commit 59b3e0449a48abbdb76929534a26ea9a045bf790
Merge: 7f09ae2 4ea3f29
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 17 15:47:28 2015 +1000
Merge branch 'integration/master' into rhbz1133989
Conflicts:
zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
commit 7f09ae2a06aa02c9a942597215170f7a4a8481c7
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 17 13:51:51 2015 +1000
Limit to maintainer's projects to merge from in UI.
commit 2e96c942b4f2fd71dea8fd5f6725c40d09116cf9
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 16 16:09:57 2015 +1000
Disable merge button if there's no version available to copy
commit 8be5f3606c74ffbf7532dd92524b28c5d7684f74
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 16 13:07:07 2015 +1000
Update docs printscreen and messages
commit f8680c0263d19b916850b612f669e15c2906c88c
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 16 11:23:42 2015 +1000
Add docs for merge-trans feature
commit 1b6e2b2a6c48d18984153cf491edcab470c429f3
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 16 06:43:19 2015 +1000
Fix unit test
commit 4e7d7bebc74c88a98dffbfc1d9f29cb07239df04
Author: Alex Eng <aeng at redhat.com>
Date: Sun Mar 15 14:43:26 2015 +1000
Fix load source versions for merge trans dialog
commit 9e7c75df3d7e96df1106b52a4150a6696e395fb9
Merge: f7eaffb 541fc6c
Author: Alex Eng <aeng at redhat.com>
Date: Sun Mar 15 14:23:55 2015 +1000
Merge branch 'integration/master' into rhbz1133989
commit f7eaffb27a1def5a427865cd3fb08e53951a197d
Author: Alex Eng <aeng at redhat.com>
Date: Sun Mar 15 14:21:10 2015 +1000
Refactor and changes on PR review
commit 6d4c388833248785d3b19da52a0bc35d9b65ff00
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 13 16:38:32 2015 +1000
Fix unit test
commit 032013279dfaa040571b46b1ebb2eb821bab2820
Merge: f0419d1 baef61a
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 13 15:59:58 2015 +1000
Merge branch 'integration/master' into rhbz1133989
commit f0419d1e34877b75d82f12ded3fc2ff0427662b7
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 13 15:29:04 2015 +1000
Fix checkstyle
commit 16d58ba99edbf748ae3e59b670e9b53984cf5c1c
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 13 15:10:15 2015 +1000
Fixed project selector issue for merge trans
commit 5d1ce6f68ab50f01da3af966d688bf48efee5853
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 12 15:57:35 2015 +1000
WIP: implement project selector for merge translation dialog
commit fa50a891bc03a86ac5677735d24109ac243dcd75
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 12 14:09:04 2015 +1000
Refactor query, UI and test
commit 43e9f0736fa4b68bd0cedbb829d068502c14661c
Author: Alex Eng <aeng at redhat.com>
Date: Wed Mar 11 18:32:42 2015 +1000
Fix preload of progressBar component
commit 43bf35defdce8f9884c9a2cfff4ed9b0fc3b72b0
Author: Alex Eng <aeng at redhat.com>
Date: Wed Mar 11 16:02:20 2015 +1000
Rename js name unique
commit d42b55873f4eba08708f4bdcaaccf2d43880a743
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 10 15:57:38 2015 +1000
Create loading component for copy actions
commit 511ed109830792cd98df57415a829b0a761c4380
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 10 15:26:42 2015 +1000
Create modal for merge-trans operations from version page
commit c05f4e6d1cda679ef926ed1b5b4b795b787243aa
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 9 15:13:12 2015 +1000
Add unit test, fix shouldMerge to check for same content
commit b8065176d8d69f506cbe9ef0a7ef3a2c04a8c270
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 6 16:34:55 2015 +1000
WIP: add unit test for merge translation
commit f8705176892deca12f548c33f47202eab9074dce
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 6 11:10:21 2015 +1000
Add unit test for merge translations
commit fd06390f48f423b6d1ab4d9a4fc7c52c0d4cf156
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 5 15:38:07 2015 +1000
Work in progress: add time log
commit 16b295dbc94eaa458c63b94d86b78f2f199ac122
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 5 15:04:49 2015 +1000
Implement merge translation from and to existing version: https://bugzilla.redhat.com/show_bug.cgi?id=1133989
Commit: 2f98a27637fad17711fc57b97149d5182e157e71
https://github.com/zanata/zanata-server/commit/2f98a27637fad17711fc57b97149d5182e157e71
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
A zanata-model/src/main/java/org/zanata/model/UserTranslationMatrix.java
A zanata-war/src/main/java/org/zanata/dao/DatabaseSpecific.java
M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
rhbz1183994 - create DAO query to query user matrix for date range
Commit: 49f1d622822c408ff1d186621e9ec85eb728599c
https://github.com/zanata/zanata-server/commit/49f1d622822c408ff1d186621e9ec85eb728599c
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
Log Message:
-----------
move StatisticsServiceImpl to rest service package
Commit: 2baee3a62737459b9e092afa7baabbbb1356fd3d
https://github.com/zanata/zanata-server/commit/2baee3a62737459b9e092afa7baabbbb1356fd3d
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
A zanata-war/src/main/java/org/zanata/rest/dto/matrix/ContentStateToWordCount.java
A zanata-war/src/main/java/org/zanata/rest/dto/matrix/MatrixMap.java
A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerLocaleMatrix.java
A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectMatrix.java
A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectVersionMatrix.java
A zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
Log Message:
-----------
rhbz1183994 - add REST api for user matrix stats
Commit: cb0cac8e34a4b99274bfadf1bfbb7721a6465c11
https://github.com/zanata/zanata-server/commit/cb0cac8e34a4b99274bfadf1bfbb7721a6465c11
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
R zanata-war/src/main/java/org/zanata/rest/dto/matrix/ContentStateToWordCount.java
A zanata-war/src/main/java/org/zanata/rest/dto/matrix/DetailMatrix.java
R zanata-war/src/main/java/org/zanata/rest/dto/matrix/MatrixMap.java
R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerLocaleMatrix.java
R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectMatrix.java
R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectVersionMatrix.java
M zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
Log Message:
-----------
rhbz1183994 - refactor dto
Commit: 74a183b7ff7d98330e21a1337311294da4c0b180
https://github.com/zanata/zanata-server/commit/74a183b7ff7d98330e21a1337311294da4c0b180
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M etc/scripts/cargowait.sh
Log Message:
-----------
change cargowait script
Commit: 38a9447758ff5ecbbf3d251255cfea399cc8cbc5
https://github.com/zanata/zanata-server/commit/38a9447758ff5ecbbf3d251255cfea399cc8cbc5
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
R zanata-model/src/main/java/org/zanata/model/UserTranslationMatrix.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
rhbz1183994 - remove table and use live query only
Commit: 21f03e6f03e622ff6705b96c420ccf673d9db9b0
https://github.com/zanata/zanata-server/commit/21f03e6f03e622ff6705b96c420ccf673d9db9b0
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
Log Message:
-----------
rhbz1183994 - convert timezone in query so the group by column value is correct
Commit: da6345f21587b1a98fe97d2e65e1aac2ec1d1bcc
https://github.com/zanata/zanata-server/commit/da6345f21587b1a98fe97d2e65e1aac2ec1d1bcc
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
R zanata-war/src/main/java/org/zanata/dao/DatabaseSpecific.java
M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
R zanata-war/src/main/java/org/zanata/rest/dto/matrix/DetailMatrix.java
R zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
Log Message:
-----------
rhbz1183994 - refactor to return a list
Commit: 7332f5021e6269e80b847c9a5790e158e368ae60
https://github.com/zanata/zanata-server/commit/7332f5021e6269e80b847c9a5790e158e368ae60
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/GravatarService.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/profile/home.xhtml
A zanata-war/src/main/webapp/profile/js/bundle.min.js
M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
Log Message:
-----------
rhbz1183994 - add user profile page and enable username search
Commit: 14d2ba86b574dab9689e6124a5ab64a64dd6521a
https://github.com/zanata/zanata-server/commit/14d2ba86b574dab9689e6124a5ab64a64dd6521a
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
Log Message:
-----------
make search username case insensitive
Commit: 96c186172789f15589cc173b622bdea90ae5bef1
https://github.com/zanata/zanata-server/commit/96c186172789f15589cc173b622bdea90ae5bef1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
rhbz1183994 - add to release note
Commit: 697b4c6caff10b45519c24a646e4ed9bfe33422e
https://github.com/zanata/zanata-server/commit/697b4c6caff10b45519c24a646e4ed9bfe33422e
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
Log Message:
-----------
rhbz1183994 - reduce the chance of user crashing server log
Commit: da5ac91605ccb357f9d1ea6d0907f7ee29b11cfe
https://github.com/zanata/zanata-server/commit/da5ac91605ccb357f9d1ea6d0907f7ee29b11cfe
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
Log Message:
-----------
rhbz1183994 - add index on lastModifiedBy column and fail on invalid timezone
Commit: 01dfdf026f9368b90802d03c174e16624790e012
https://github.com/zanata/zanata-server/commit/01dfdf026f9368b90802d03c174e16624790e012
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
A docs/user-guide/user-profile.md
M mkdocs.yml
Log Message:
-----------
rhbz1183994 - add basic doc
Commit: 7440fcaa577c7c58b8ac041168c4a118bdbac6c3
https://github.com/zanata/zanata-server/commit/7440fcaa577c7c58b8ac041168c4a118bdbac6c3
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
Log Message:
-----------
fix issues
Commit: ed95b1878c10825a72045e72b251024381feb140
https://github.com/zanata/zanata-server/commit/ed95b1878c10825a72045e72b251024381feb140
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
Log Message:
-----------
Merge pull request #721 from zanata/fail-fast-jms
fail fast if jms is not configured properly
Commit: dddea7d131297e6c3168cee8d527dc2c006b6eab
https://github.com/zanata/zanata-server/commit/dddea7d131297e6c3168cee8d527dc2c006b6eab
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/db/db.changelog.xml
Log Message:
-----------
rhbz1194543 - change resId for plaintext and libreoffice to be content hash.
Closes #734
Squashed commit of the following:
commit 823f613f8829d0110623f248bfe99c3a626c75e9
Author: David Mason <drdmason at gmail.com>
Date: Mon Mar 16 13:57:17 2015 +1000
Improve logging during id migration from positional to hash-based.
commit e4ad8892ff54f7a2b5b6f26af32dce29db7285e4
Author: David Mason <drdmason at gmail.com>
Date: Thu Mar 12 13:57:29 2015 +1000
Use try-with-resources for prepared statements when migrating resId from positional to content hash
commit 03d48b6bdd438881e23776f2f70e20d50eb50682
Author: David Mason <drdmason at gmail.com>
Date: Thu Mar 12 13:33:13 2015 +1000
Add warning note to some text unit id sources
commit fe76f4fb8cf95ddb7d6eaaad4f76185dc7505a9e
Author: David Mason <drdmason at gmail.com>
Date: Tue Mar 10 13:23:47 2015 +1000
Change resId for plaintext and libreoffice to use content hash.
This includes migration of resId in all existing documents of
the above types to be the content hash.
Conflicts:
zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
The conflicting file did not yet exist on this branch (this is a back-ported change)
so it was added with only the basic xml structure and the relevant change.
An element was also added in the main db.changelog file to import the conflicting
file.
Commit: e78c4976616498dc57a2b1684388121ab53aa39f
https://github.com/zanata/zanata-server/commit/e78c4976616498dc57a2b1684388121ab53aa39f
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M docs/release-notes.md
A docs/user-guide/user-profile.md
M etc/scripts/cargowait.sh
M mkdocs.yml
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/GravatarService.java
R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/profile/home.xhtml
A zanata-war/src/main/webapp/profile/js/bundle.min.js
M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
Log Message:
-----------
Merge pull request #694 from zanata/rhbz1183994-user-stats
Rhbz1183994 user contribution matrix
Commit: b021f28b7ebb455d092aff96420d038a97409ae1
https://github.com/zanata/zanata-server/commit/b021f28b7ebb455d092aff96420d038a97409ae1
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Bug 1066780 should be in asset, not part of 3.6
* [1066780](https://bugzilla.redhat.com/show_bug.cgi?id=1066780) - RFE: Improve the project list page [proto]
Commit: 75a212749e4d6f4d7e2ef2cfc7fde2d0a0f40171
https://github.com/zanata/zanata-server/commit/75a212749e4d6f4d7e2ef2cfc7fde2d0a0f40171
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-03-19 (Thu, 19 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Merge branch 'master' into integration/master
Commit: a1a8a605c96c870550858063cecc3038ee43cd68
https://github.com/zanata/zanata-server/commit/a1a8a605c96c870550858063cecc3038ee43cd68
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/messages_br.properties
M zanata-war/src/main/resources/messages_cs.properties
M zanata-war/src/main/resources/messages_en_GB.properties
M zanata-war/src/main/resources/messages_eo.properties
M zanata-war/src/main/resources/messages_fr.properties
M zanata-war/src/main/resources/messages_hu.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
M zanata-war/src/main/resources/messages_ru.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
functional-test/pom.xml
pom.xml
zanata-model/pom.xml
zanata-test-war/pom.xml
zanata-war/pom.xml
zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
The pom conflicts were just the release version conflicting with the
development version. Kept the development version (3.7.0-SNAPSHOT) in
all cases.
The conflict in db.changelog-3.7.xml was caused by the file being created
in both release and master branches. In the release branch it had a single
changeset that was already in the master branch, so the master copy was
kept in its entirety. There was an XML comment on the changeset in release,
this was kept and put above the identical changeset in master.
Commit: 9f0f82d030497b1bdd133dcab653fa0ab55b9390
https://github.com/zanata/zanata-server/commit/9f0f82d030497b1bdd133dcab653fa0ab55b9390
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Add 3.6.1 section
Also move Bug 1194543 to 3.6.1
Commit: 21f6ca8bc06ed3a454139442e0413acacac0e537
https://github.com/zanata/zanata-server/commit/21f6ca8bc06ed3a454139442e0413acacac0e537
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Increase timeout on server startup in all standalone.xml files.
Changes the timeout to 1000 seconds (16min 40s) from default 300s (5min)
to prevent timeout when liquibase changesets take longer than 5 minutes
to run.
Commit: dbb94962e1e283c6e3e1bb3949413269e2b3a534
https://github.com/zanata/zanata-server/commit/dbb94962e1e283c6e3e1bb3949413269e2b3a534
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Merge pull request #739 from zanata/increase-startup-timeout
Increase timeout on server startup in all standalone.xml files.
Commit: 600d7882e7e666bdec3e62537d3c3541225fb611
https://github.com/zanata/zanata-server/commit/600d7882e7e666bdec3e62537d3c3541225fb611
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
Log Message:
-----------
rhbz1183412 Uses server's default locale when sending emails
Commit: 53cc989f30c3f01c3683c588aa51f0de1ffa9b80
https://github.com/zanata/zanata-server/commit/53cc989f30c3f01c3683c588aa51f0de1ffa9b80
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: 03d7921daa2b8cd9e4d43d4da29364bb1c8b8aa3
https://github.com/zanata/zanata-server/commit/03d7921daa2b8cd9e4d43d4da29364bb1c8b8aa3
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Update release-notes.md
Commit: 86afd037a5bf382267f23b44b68e274e699ed995
https://github.com/zanata/zanata-server/commit/86afd037a5bf382267f23b44b68e274e699ed995
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M docs/release-notes.md
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
rhbz1197902 - clear hibernate session after each translation batch save
Commit: 21e1f2173cb8358ff74c1d0666b2addf360710c8
https://github.com/zanata/zanata-server/commit/21e1f2173cb8358ff74c1d0666b2addf360710c8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
A docs/release-notes.md
Log Message:
-----------
Copy release notes from master (except 3.7)
Commit: e45bed1ab688e57a87eaa90d985d58a21a69079d
https://github.com/zanata/zanata-server/commit/e45bed1ab688e57a87eaa90d985d58a21a69079d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Update release notes for rhbz1183412
Commit: 0206a8b242d6bfc3a5f63ffae1530930804328c8
https://github.com/zanata/zanata-server/commit/0206a8b242d6bfc3a5f63ffae1530930804328c8
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M docs/release-notes.md
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Merge pull request #733 from zanata/rhbz1197902-push-slow
rhbz1197902 - clear hibernate session after each translation batch save
Commit: e553261205e458509d3268aa4acb7f2504667777
https://github.com/zanata/zanata-server/commit/e553261205e458509d3268aa4acb7f2504667777
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
rhbz1197902 - clear hibernate session after each translation batch save
Conflicts:
docs/release-notes.md
zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
zanata-war/src/test/resources/arquillian/persistence.xml
Commit: 36ed1f6d76a7796cee49e54e1ce3946743b9956b
https://github.com/zanata/zanata-server/commit/36ed1f6d76a7796cee49e54e1ce3946743b9956b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
Log Message:
-----------
fix IT test
Commit: 0a283b990e35515070d1a80a9266066c1029d9ea
https://github.com/zanata/zanata-server/commit/0a283b990e35515070d1a80a9266066c1029d9ea
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
Log Message:
-----------
rhbz1202670 - display version state in a standard way
Closes #738
commit 70f9cb2453e954cac6f3c2e1671958706b929cca
Author: David Mason <drdmason at gmail.com>
Date: Thu Mar 19 12:32:01 2015 +1000
Show appropriate icon for readonly and obsolete in the editor
commit a99c8361511ae3ca2c34d5f6ed2f2eac311ebd4f
Author: David Mason <drdmason at gmail.com>
Date: Thu Mar 19 09:24:21 2015 +1000
Use version label template in site.
Use label in all the places I could find:
- project -> versions tab
- project: your latest activity
- version page
- create version page
- group -> projects tab
- group -> languages tab -> projects
- group -> settings -> projects tab
- group -> request to join
- dashboard -> activity tab
- dashboard -> projects: versions dropdown
commit dbd1101a0019d0dd1dcd3a53d96c10a400370dc6
Author: David Mason <drdmason at gmail.com>
Date: Thu Mar 19 09:23:40 2015 +1000
Create template for displaying version slugs with state-dependent styling and icons.
Commit: 2f750bc267be4b8f0c85347d92e2f92f7c665023
https://github.com/zanata/zanata-server/commit/2f750bc267be4b8f0c85347d92e2f92f7c665023
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
Log Message:
-----------
try to fix IT case
Commit: 42c2ebcfb49aad1d89236de8b94407c63d4fbf6d
https://github.com/zanata/zanata-server/commit/42c2ebcfb49aad1d89236de8b94407c63d4fbf6d
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
Log Message:
-----------
try to fix IT case
Commit: d53570694462c945bcfcd889081313e12f373f63
https://github.com/zanata/zanata-server/commit/d53570694462c945bcfcd889081313e12f373f63
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
Log Message:
-----------
try to fix IT case
Commit: 59f69871de495e8e10a85bd866286411b1f72311
https://github.com/zanata/zanata-server/commit/59f69871de495e8e10a85bd866286411b1f72311
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
Log Message:
-----------
try to fix IT case
Commit: dd4b92fafa5d40443b60da064b4fa8e9521602ca
https://github.com/zanata/zanata-server/commit/dd4b92fafa5d40443b60da064b4fa8e9521602ca
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
Log Message:
-----------
try to fix IT case
Commit: cccbd4f9695df2b0645e9937382394a59ee2227d
https://github.com/zanata/zanata-server/commit/cccbd4f9695df2b0645e9937382394a59ee2227d
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
try to fix IT case
Commit: fd1eab80d3cecefd3b6460e438bf3b8c17209c9f
https://github.com/zanata/zanata-server/commit/fd1eab80d3cecefd3b6460e438bf3b8c17209c9f
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-23 (Mon, 23 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
Log Message:
-----------
try to fix IT case
Commit: 1e5a2f13cf189851edc0c383b125349c1c80d58e
https://github.com/zanata/zanata-server/commit/1e5a2f13cf189851edc0c383b125349c1c80d58e
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
A call to addAfterTestOperation() to delete all database entries had been removed in
commit 0fa0a8ea34fe1a5c6463daa29f70f081748df0e4 but modified on release branch. Kept
the integration/master version with the call absent.
zanata-war/src/test/resources/arquillian/persistence.xml
A property had been added in integration/master branch. Kept it.
Commit: a649964165e1e89806334b0a346dd79e620b4bce
https://github.com/zanata/zanata-server/commit/a649964165e1e89806334b0a346dd79e620b4bce
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
Log Message:
-----------
try to fix IT case
Commit: fe9939daf11fdd3feb2302e241cda4aab85de8cd
https://github.com/zanata/zanata-server/commit/fe9939daf11fdd3feb2302e241cda4aab85de8cd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
A docs/release-notes.md
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
Log Message:
-----------
Merge pull request #740 from zanata/rhbz1183412
rhbz1183412 Use server's default locale when sending emails
Commit: 3e944285f6b92a4729729bcd6fb8feda54f297bb
https://github.com/zanata/zanata-server/commit/3e944285f6b92a4729729bcd6fb8feda54f297bb
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Conflicts:
docs/release-notes.md
Commit: b03d30d86e36a16462c2bcf8820d431a8ab9fd94
https://github.com/zanata/zanata-server/commit/b03d30d86e36a16462c2bcf8820d431a8ab9fd94
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
Log Message:
-----------
Use version label template on version merge dialog.
This can be seen by navigating to:
- version -> merge translations dialog
Commit: 487cde4243a32df4553fca3b420ee04fd5939b02
https://github.com/zanata/zanata-server/commit/487cde4243a32df4553fca3b420ee04fd5939b02
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Add bugfix rhbz1202670 to release notes
Commit: c002cb30f87db1b176809e3716ca3f6ce1714c28
https://github.com/zanata/zanata-server/commit/c002cb30f87db1b176809e3716ca3f6ce1714c28
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M docs/index.md
A docs/user-guide/client-command-hook.md
M docs/user-guide/client-configuration.md
M mkdocs.yml
Log Message:
-----------
Add command hook docs and update home page
Commit: 333016f8380d66b4ece6f0d8dbd97e5cb3f5c8d4
https://github.com/zanata/zanata-server/commit/333016f8380d66b4ece6f0d8dbd97e5cb3f5c8d4
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
Log Message:
-----------
Merge pull request #741 from zanata/display-version-state
Update version display for version merge, add release notes entry.
Commit: 188ca6872305995ccb6e8d0e9dee2992d9c48b4f
https://github.com/zanata/zanata-server/commit/188ca6872305995ccb6e8d0e9dee2992d9c48b4f
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Update assets version to 6.1
https://bugzilla.redhat.com/show_bug.cgi?id=875965
Commit: a75bb3378e532346982deec02b3357362f76986e
https://github.com/zanata/zanata-server/commit/a75bb3378e532346982deec02b3357362f76986e
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
Log Message:
-----------
display email only to admin in language page
Commit: a330cb1e6123c4a0346fcfb437b7cde2ded547cc
https://github.com/zanata/zanata-server/commit/a330cb1e6123c4a0346fcfb437b7cde2ded547cc
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M docs/index.md
A docs/user-guide/client-command-hook.md
M docs/user-guide/client-configuration.md
M mkdocs.yml
Log Message:
-----------
Merge pull request #744 from zanata/update-docs
Update docs
Commit: d90b3d3b899ca5daba661646e0667da146e25cd5
https://github.com/zanata/zanata-server/commit/d90b3d3b899ca5daba661646e0667da146e25cd5
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
M zanata-war/src/main/webapp/language/home.xhtml
Log Message:
-----------
Fix language sorting in members size: https://bugzilla.redhat.com/show_bug.cgi?id=1205468
Commit: c8b35140dd43bd9aaf782f6d0e34362cb697dcbb
https://github.com/zanata/zanata-server/commit/c8b35140dd43bd9aaf782f6d0e34362cb697dcbb
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
Log Message:
-----------
Merge pull request #745 from zanata/rhbz1205465
display email only to admin in language page
Commit: 0ea0d3c3fb48eda646ce820575dfc6bf11254503
https://github.com/zanata/zanata-server/commit/0ea0d3c3fb48eda646ce820575dfc6bf11254503
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
Commit: cabb3de7dfa49f075749263d806eda143e5ba7a8
https://github.com/zanata/zanata-server/commit/cabb3de7dfa49f075749263d806eda143e5ba7a8
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
M zanata-war/src/main/webapp/language/home.xhtml
Log Message:
-----------
Merge pull request #746 from zanata/rhbz1205468
Fix language sorting in members size
Commit: 386919d8b5ca742faf9fc7aad7093c8f1e3bf002
https://github.com/zanata/zanata-server/commit/386919d8b5ca742faf9fc7aad7093c8f1e3bf002
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/util/LanguageList.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
Log Message:
-----------
Edit and delete tests for project language alias
Commit: 735b6666641495262fc216e5541fdaf6219bd8e0
https://github.com/zanata/zanata-server/commit/735b6666641495262fc216e5541fdaf6219bd8e0
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
M zanata-war/src/main/webapp/language/home.xhtml
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
zanata-war/src/main/webapp/language/home.xhtml
Commit: 0a4465ec09aebd0ea4d07540d90c87748a91f713
https://github.com/zanata/zanata-server/commit/0a4465ec09aebd0ea4d07540d90c87748a91f713
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M docs/user-guide/project-types.md
Log Message:
-----------
Update docs for project type
Commit: 76eaefe82cd930eb60b6768dd401fa4b4ecf0a8c
https://github.com/zanata/zanata-server/commit/76eaefe82cd930eb60b6768dd401fa4b4ecf0a8c
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M docs/user-guide/project-types.md
Log Message:
-----------
Merge pull request #748 from zanata/project-type-docs
Update docs for project type
Commit: 90df3ec5fe4a3e441a8aafe77be5367246ecad1c
https://github.com/zanata/zanata-server/commit/90df3ec5fe4a3e441a8aafe77be5367246ecad1c
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Merge pull request #742 from zanata/rhbz875965
Update assets version to 6.1 for whitespace changes
Commit: bfeace93bca7daeede9a8ca6f8ef13f6e2013bf9
https://github.com/zanata/zanata-server/commit/bfeace93bca7daeede9a8ca6f8ef13f6e2013bf9
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Update release notes for bugzilla 875965, 1205465, 1205468
Commit: 8b37b3a20b8c88cc8edbb17901d2bd9a3a830578
https://github.com/zanata/zanata-server/commit/8b37b3a20b8c88cc8edbb17901d2bd9a3a830578
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M docs/release-notes.md
M pom.xml
Log Message:
-----------
upgrade zanata-common to 3.6.0
Commit: c58827464f92f6007757f9e987495762bb2a9685
https://github.com/zanata/zanata-server/commit/c58827464f92f6007757f9e987495762bb2a9685
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Merge pull request #749 from zanata/add-release-note
Update release notes for bugzilla 875965, 1205465, 1205468
Commit: df6cae674be93b1d3be41283695028c431bc45c6
https://github.com/zanata/zanata-server/commit/df6cae674be93b1d3be41283695028c431bc45c6
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-25 (Wed, 25 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
docs/release-notes.md
zanata-war/pom.xml
Commit: 9fd2486b7932d983c0ce64617658816119a2c42e
https://github.com/zanata/zanata-server/commit/9fd2486b7932d983c0ce64617658816119a2c42e
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
R CHANGELOG.md
M docs/configuration/installation.md
M docs/release-notes.md
Log Message:
-----------
Moved changelog.md to readthedocs section
Squashed commit of the following:
commit 426132892e13a79a9db90ed9fd548e4faf513756
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 26 08:41:10 2015 +1000
Remove changeLog.md, all moved to readthedocs
commit 08aac89c4974270af093fd11ba51a5af858c2545
Author: Alex Eng <aeng at redhat.com>
Date: Wed Mar 25 16:36:23 2015 +1000
Update old release notes for readthedocs
Commit: e048380fbe1467b6619ad320923ec1d3e0a2bd9f
https://github.com/zanata/zanata-server/commit/e048380fbe1467b6619ad320923ec1d3e0a2bd9f
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Update release notes for 3.6.1
Commit: 97545b4439e39bcd8a231a0972a34724d5ba179d
https://github.com/zanata/zanata-server/commit/97545b4439e39bcd8a231a0972a34724d5ba179d
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Merge pull request #752 from zanata/update-release-notes
Update release notes for 3.6.1
Commit: 70ff2ce5170dc5d6fb8f4a274d58712af6361732
https://github.com/zanata/zanata-server/commit/70ff2ce5170dc5d6fb8f4a274d58712af6361732
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: d43744fe01f6d97c15727b33d9944068e04ca624
https://github.com/zanata/zanata-server/commit/d43744fe01f6d97c15727b33d9944068e04ca624
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M docs/release-notes.md
M pom.xml
Log Message:
-----------
Merge pull request #747 from zanata/rhbz1029734-po-header
upgrade zanata-common to 3.6.0
Commit: 5c0fe34179f85b3817db92539672f6560428eadc
https://github.com/zanata/zanata-server/commit/5c0fe34179f85b3817db92539672f6560428eadc
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-26 (Thu, 26 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/util/LanguageList.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
Log Message:
-----------
Merge pull request #716 from zanata/edit-and-delete-project-lang-alias
Edit and delete tests for project language alias
Commit: 490b014d7f8b2022e062ffacde2c0e9dca61d7a1
https://github.com/zanata/zanata-server/commit/490b014d7f8b2022e062ffacde2c0e9dca61d7a1
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-27 (Fri, 27 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
Log Message:
-----------
Log as DEBUG when permission is denied (not WARN)
Commit: 8ccbfa173e78e44d0ebc3d066c0ddbc7d1c6e894
https://github.com/zanata/zanata-server/commit/8ccbfa173e78e44d0ebc3d066c0ddbc7d1c6e894
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
A zanata-war/src/main/java/org/zanata/limits/RateLimiterToken.java
M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
R zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
A zanata-war/src/main/java/org/zanata/rest/InvalidApiKeyUtil.java
M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
A zanata-war/src/main/java/org/zanata/util/HttpUtil.java
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
A zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java
Log Message:
-----------
Implement anonymous pull:
https://bugzilla.redhat.com/show_bug.cgi?id=1172618
Squashed commit of the following:
commit 7dcf92eb065ce759b5f2de6101dbc33d15e6a4af
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 26 15:29:00 2015 +1000
Fix 'download-tmx missing quote'
commit 9297d202c5b0a11690d85c7161a769936274ad6c
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 24 16:20:33 2015 +1000
Remove single quote on API Key in error message
commit 4127de26b31d0f8d3dd8411d0ad6fbac477c7acd
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 24 15:17:29 2015 +1000
Add release notes
commit e390c8654ee7d4aea1b17707a776e337c6d3dead
Merge: bd0d3e8 fe9939d
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 24 15:16:33 2015 +1000
Merge branch 'release' into rhbz1172618
commit bd0d3e8805bd71cb9451ef25b7c00ad787509399
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 24 13:17:07 2015 +1000
Add authentication check for TMX REST
commit e7ec0cf7ffb9756afcf2723adeec2cdfb162280c
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 24 07:16:37 2015 +1000
Fix RawRestTest
commit ff97eab5457eae77c24f6bf02cfc1460fe0d4451
Merge: 65b6188 fd1eab8
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 24 06:53:20 2015 +1000
Merge branch 'release' into rhbz1172618
commit 65b6188a3a4b0fff91c2fdc549e46b3b5e8c6e2d
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 23 13:04:36 2015 +1000
Refactor rate limiter key, fix functional test
commit 8a7343bd2b986b965d999f292e785842ac24b8d9
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 23 11:43:26 2015 +1000
Add ZANATA_PROXY_HEADER for proxy-header scan
commit 30a3ae764e5052083572b4b468ada920f378a6df
Author: Alex Eng <aeng at redhat.com>
Date: Sun Mar 22 01:04:40 2015 +1000
Refactor test and RestLimitingSynchronousDispatcher from PR review
commit a49a516d5c7dca819aeb121b232602a4d2e92f20
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 20 15:56:16 2015 +1000
Fix checkstyle
commit ec6bea8eb871cff05025bd0e13491e1d4c25dfac
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 20 15:55:02 2015 +1000
Add unit test and integration test for anonymous REST request
commit 3bf93abbf800fe76f511c0ac2b649087bba49bcf
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 19 09:18:22 2015 +1000
Allow anonymous REST request for READ: https://bugzilla.redhat.com/show_bug.cgi?id=1172618
Commit: e9d0b2c07259fe76e638f3f3b1e5c6e920d3f521
https://github.com/zanata/zanata-server/commit/e9d0b2c07259fe76e638f3f3b1e5c6e920d3f521
Author: Alex Eng <aeng at redhat.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
A zanata-war/src/main/java/org/zanata/limits/RateLimiterToken.java
M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
R zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
A zanata-war/src/main/java/org/zanata/rest/InvalidApiKeyUtil.java
M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
A zanata-war/src/main/java/org/zanata/util/HttpUtil.java
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
A zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
docs/release-notes.md
zanata-war/src/test/java/org/zanata/RestTest.java
zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
Commit: af1ae14ae768cb1652513cbb2205f65f4a790742
https://github.com/zanata/zanata-server/commit/af1ae14ae768cb1652513cbb2205f65f4a790742
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
Log Message:
-----------
Restore constraints on glossary tables for H2
Commit: 8a8b0fdd925310f69a6bbc6c34c22f9ee23da41e
https://github.com/zanata/zanata-server/commit/8a8b0fdd925310f69a6bbc6c34c22f9ee23da41e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-30 (Mon, 30 Mar 2015)
Changed paths:
R CHANGELOG.md
M docs/configuration/authentication.md
M docs/configuration/infinispan.md
A docs/configuration/installation.md
A docs/images/project-view-versions.png
A docs/images/version-merge-trans-cancel.png
A docs/images/version-merge-trans-dialog.png
A docs/images/version-merge-trans-progress.png
A docs/images/version-more-action-menu.png
A docs/images/version-view-languages.png
M docs/index.md
M docs/release-notes.md
A docs/user-guide/client-command-hook.md
M docs/user-guide/client-configuration.md
A docs/user-guide/merge-translations.md
M docs/user-guide/project-types.md
A docs/user-guide/projects/project-view.md
A docs/user-guide/user-profile.md
A docs/user-guide/versions/version-view.md
M etc/scripts/cargowait.sh
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/util/LanguageList.java
M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M mkdocs.yml
M pom.xml
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
A zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/service/GravatarService.java
A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
A zanata-war/src/main/java/org/zanata/ui/CopyAction.java
M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_br.properties
M zanata-war/src/main/resources/messages_cs.properties
M zanata-war/src/main/resources/messages_en_GB.properties
M zanata-war/src/main/resources/messages_eo.properties
M zanata-war/src/main/resources/messages_fr.properties
M zanata-war/src/main/resources/messages_hu.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
M zanata-war/src/main/resources/messages_ru.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
A zanata-war/src/main/webapp/profile/home.xhtml
A zanata-war/src/main/webapp/profile/js/bundle.min.js
M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/test/java/org/zanata/ArquillianTest.java
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into cdi-prep
Conflicts:
zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
Commit: 6ad52dedd57c3a9259cec0ef2fe4b11a65407bbf
https://github.com/zanata/zanata-server/commit/6ad52dedd57c3a9259cec0ef2fe4b11a65407bbf
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
Log Message:
-----------
Remove log message that was unintentionally committed
Commit: 70c2121bcfcc5d23ae1f124528ccc0cb13b82a4d
https://github.com/zanata/zanata-server/commit/70c2121bcfcc5d23ae1f124528ccc0cb13b82a4d
Author: David Mason <drdmason at gmail.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
Log Message:
-----------
Merge pull request #757 from zanata/remove-excess-logging
Remove log message that was unintentionally committed
Commit: 25bf1e2dcb5bdc827ad23c89ed04368f7c3a024c
https://github.com/zanata/zanata-server/commit/25bf1e2dcb5bdc827ad23c89ed04368f7c3a024c
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
Log Message:
-----------
Check errors when a test page is created/returned
We can assume, in cases other than testing the error page, that
the error page should not be seen when transitioning between
other pages. Add a check in the constructor for all core pages
of Zanata.
Commit: 846756e5dccd8530faaef9524baeaf049ebb48e3
https://github.com/zanata/zanata-server/commit/846756e5dccd8530faaef9524baeaf049ebb48e3
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
Log Message:
-----------
Remove excess waits for test page
Commit: 89ed042e00f8e96fd8d7577d5181ab67675c9a87
https://github.com/zanata/zanata-server/commit/89ed042e00f8e96fd8d7577d5181ab67675c9a87
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release server-3.6.1
Commit: bc8a9fa502cbdf70a62b830e0a298311a518f8ca
https://github.com/zanata/zanata-server/commit/bc8a9fa502cbdf70a62b830e0a298311a518f8ca
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 26bf0a4764d644ba7e6d1186297354ee1671c920
https://github.com/zanata/zanata-server/commit/26bf0a4764d644ba7e6d1186297354ee1671c920
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M functional-test/pom.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
Log Message:
-----------
Fix liquibase changeset to be compatible with mysql/mariadb version > 5.5
Commit: 3b41c40ce17eae3d8eab4ee52f30fd9038f4378d
https://github.com/zanata/zanata-server/commit/3b41c40ce17eae3d8eab4ee52f30fd9038f4378d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
Log Message:
-----------
Merge pull request #755 from zanata/restore-glossary-constraints
Restore constraints on glossary tables for H2
Commit: 08e2ac3ce9bbbc44b5f67fd0181fa8b3dfafdc8e
https://github.com/zanata/zanata-server/commit/08e2ac3ce9bbbc44b5f67fd0181fa8b3dfafdc8e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-03-31 (Tue, 31 Mar 2015)
Changed paths:
M docs/configuration/installation.md
Log Message:
-----------
Mention MySQL 5.5 specifically
Commit: e74f9e52e369fb6055e65e0bebd2508272898709
https://github.com/zanata/zanata-server/commit/e74f9e52e369fb6055e65e0bebd2508272898709
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
M zanata-war/src/main/webapp/version-group/home.xhtml
Log Message:
-----------
rhbz1165939 Do not display empty actions panel on groups page
Commit: 1daed2500e28de531e83ffe12cbf5ae23cc18c93
https://github.com/zanata/zanata-server/commit/1daed2500e28de531e83ffe12cbf5ae23cc18c93
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
M zanata-war/src/main/webapp/version-group/home.xhtml
Log Message:
-----------
Merge pull request #760 from zanata/rhbz1165939
rhbz1165939 Do not display empty actions panel on groups page
Commit: 4b1baa596433b6fa70361b3409645e24621a4a43
https://github.com/zanata/zanata-server/commit/4b1baa596433b6fa70361b3409645e24621a4a43
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
M pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
A zanata-war/src/main/java/org/zanata/events/Logout.java
A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
A zanata-war/src/main/java/org/zanata/util/Event.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java
Log Message:
-----------
Merge pull request #653 from zanata/cdi-prep
Prepare for CDI move
- Convert our Seam events to be closer to CDI events.
- Reimplement FacesMessages to be independent of Seam.
Commit: 4fa9e013f9c8442233e5977852510898cae12d8e
https://github.com/zanata/zanata-server/commit/4fa9e013f9c8442233e5977852510898cae12d8e
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Rename Obsolete to Archived in UI and tests
Commit: e03311131c4bff95df2462d4cc9c45d2d02a59de
https://github.com/zanata/zanata-server/commit/e03311131c4bff95df2462d4cc9c45d2d02a59de
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Merge pull request #758 from zanata/fix-some-texts
Rename Obsolete to Archived in UI and tests
Commit: f7988dee4db5826e93cb4b6af09a4af8dd0777b6
https://github.com/zanata/zanata-server/commit/f7988dee4db5826e93cb4b6af09a4af8dd0777b6
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Upgrade RichFaces to 4.5.4.Final
Commit: 0c26461fc1f790e1d1e683c4df291059121c105a
https://github.com/zanata/zanata-server/commit/0c26461fc1f790e1d1e683c4df291059121c105a
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release server-3.6.2
Commit: cf1a1f016caaf7d62070c4d6d82e218d8190361d
https://github.com/zanata/zanata-server/commit/cf1a1f016caaf7d62070c4d6d82e218d8190361d
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-test-war/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 129ca6ebabb224ce9edfac4b5b69e54ca5cecab3
https://github.com/zanata/zanata-server/commit/129ca6ebabb224ce9edfac4b5b69e54ca5cecab3
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
Log Message:
-----------
Merge pull request #671 from zanata/remove-excess-wait
Remove excess waits for test page
Commit: 88faf70a20dbe4dd47bcdf3f8d794c02cc6de1f1
https://github.com/zanata/zanata-server/commit/88faf70a20dbe4dd47bcdf3f8d794c02cc6de1f1
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
M zanata-war/src/main/resources/pluralforms.properties
Log Message:
-----------
Merge pull request #641 from zanata/me-plural
add plural form for me-ME
Commit: c709d394b183c1aff92511185eec3df412789e8c
https://github.com/zanata/zanata-server/commit/c709d394b183c1aff92511185eec3df412789e8c
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/CorePage.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
Log Message:
-----------
Merge pull request #676 from zanata/check-test-for-error-page
Check errors when a test page is created/returned
Commit: 762490d783ee8ffa8599abf03b39f44a36f93a3a
https://github.com/zanata/zanata-server/commit/762490d783ee8ffa8599abf03b39f44a36f93a3a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Conflicts:
functional-test/pom.xml
pom.xml
zanata-model/pom.xml
zanata-test-war/pom.xml
zanata-war/pom.xml
Commit: 2080dfcfff684f52385c2eb9f27c7d34f7affc15
https://github.com/zanata/zanata-server/commit/2080dfcfff684f52385c2eb9f27c7d34f7affc15
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-02 (Thu, 02 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Remove unwanted RichFaces dependencies
Commit: 8ef4f08abe8d036c142ef1410f39286262efbdf0
https://github.com/zanata/zanata-server/commit/8ef4f08abe8d036c142ef1410f39286262efbdf0
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-07 (Tue, 07 Apr 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Add release note for rhbz1165939
Commit: c0b7f4c0db97926ee8196dd4d6874b8d32d2093c
https://github.com/zanata/zanata-server/commit/c0b7f4c0db97926ee8196dd4d6874b8d32d2093c
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-07 (Tue, 07 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge pull request #764 from zanata/fix-rf-deps
Remove unwanted RichFaces dependencies
Commit: 307b8908e53676bb5b164bd8c1d88f0acc56a631
https://github.com/zanata/zanata-server/commit/307b8908e53676bb5b164bd8c1d88f0acc56a631
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-07 (Tue, 07 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
pom.xml
Commit: 176cf021a4d7c13da0b05f0092236ef866cb2535
https://github.com/zanata/zanata-server/commit/176cf021a4d7c13da0b05f0092236ef866cb2535
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-07 (Tue, 07 Apr 2015)
Changed paths:
M pom.xml
M zanata.xml
Log Message:
-----------
Update zanata-maven-plugin to 3.6.0; update version to release
Commit: f857aaadaca09efd379ff741d23277cd584236d3
https://github.com/zanata/zanata-server/commit/f857aaadaca09efd379ff741d23277cd584236d3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-07 (Tue, 07 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: 7f67211741f3f13c2d8ffdb10d79b41e31d4499c
https://github.com/zanata/zanata-server/commit/7f67211741f3f13c2d8ffdb10d79b41e31d4499c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-08 (Wed, 08 Apr 2015)
Changed paths:
M zanata-war/src/main/resources/messages_bg.properties
M zanata-war/src/main/resources/messages_br.properties
M zanata-war/src/main/resources/messages_cs.properties
M zanata-war/src/main/resources/messages_de.properties
M zanata-war/src/main/resources/messages_en_GB.properties
M zanata-war/src/main/resources/messages_eo.properties
M zanata-war/src/main/resources/messages_es_ES.properties
M zanata-war/src/main/resources/messages_fr.properties
M zanata-war/src/main/resources/messages_gu.properties
M zanata-war/src/main/resources/messages_hu.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_ko.properties
M zanata-war/src/main/resources/messages_nl.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
M zanata-war/src/main/resources/messages_ru.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
Log Message:
-----------
Fetch latest translations from translate.zanata.org (release)
Commit: 80d40591b9204a6e8e446eb1758f4c92e6e3ba4e
https://github.com/zanata/zanata-server/commit/80d40591b9204a6e8e446eb1758f4c92e6e3ba4e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-08 (Wed, 08 Apr 2015)
Changed paths:
M zanata-war/src/main/resources/messages_bg.properties
M zanata-war/src/main/resources/messages_br.properties
M zanata-war/src/main/resources/messages_cs.properties
M zanata-war/src/main/resources/messages_de.properties
M zanata-war/src/main/resources/messages_en_GB.properties
M zanata-war/src/main/resources/messages_eo.properties
M zanata-war/src/main/resources/messages_es_ES.properties
M zanata-war/src/main/resources/messages_fr.properties
M zanata-war/src/main/resources/messages_gu.properties
M zanata-war/src/main/resources/messages_hu.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_ko.properties
M zanata-war/src/main/resources/messages_nl.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
M zanata-war/src/main/resources/messages_ru.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: d96793c2bad174bf6812ca4777c107bec138964b
https://github.com/zanata/zanata-server/commit/d96793c2bad174bf6812ca4777c107bec138964b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-08 (Wed, 08 Apr 2015)
Changed paths:
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Replace single quotes (swallowed by MessageFormat) with double quotes
Commit: 59c5be5f67a63dac7b3dcd18dce47c6d8c1b1d8d
https://github.com/zanata/zanata-server/commit/59c5be5f67a63dac7b3dcd18dce47c6d8c1b1d8d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-08 (Wed, 08 Apr 2015)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
Log Message:
-----------
Remove .url. keys to avoid confusing l10n-maven-plugin:validate
Commit: 512f620de51ba01058f19207e46f1a0288be5897
https://github.com/zanata/zanata-server/commit/512f620de51ba01058f19207e46f1a0288be5897
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-08 (Wed, 08 Apr 2015)
Changed paths:
A docs/.gitattributes
Log Message:
-----------
Set merge=union for release-notes.md in .gitattributes
Commit: 419b6ee142fb7cd0ec77fc3f4b63a093a83da0f8
https://github.com/zanata/zanata-server/commit/419b6ee142fb7cd0ec77fc3f4b63a093a83da0f8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-08 (Wed, 08 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Rerun failing integration tests up to three times
Commit: 889ebe7bc256db3e57069cd2a38bee8ac57ff9fd
https://github.com/zanata/zanata-server/commit/889ebe7bc256db3e57069cd2a38bee8ac57ff9fd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-09 (Thu, 09 Apr 2015)
Changed paths:
A functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
Log Message:
-----------
Add deliberately flaky test
Commit: c40c2ddbb773456f98817cc0a4e332e51583e5b5
https://github.com/zanata/zanata-server/commit/c40c2ddbb773456f98817cc0a4e332e51583e5b5
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-09 (Thu, 09 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Add Undertow modules from WildFly 9 for WildFly tests
Commit: 435fa361dc103fe1f4436141fd9ee4f32fdee12e
https://github.com/zanata/zanata-server/commit/435fa361dc103fe1f4436141fd9ee4f32fdee12e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-09 (Thu, 09 Apr 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
Log Message:
-----------
Handle missing/empty proxy header
Commit: 82d7892cff874b54cb0fc2365bbdca76921bd4ff
https://github.com/zanata/zanata-server/commit/82d7892cff874b54cb0fc2365bbdca76921bd4ff
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-09 (Thu, 09 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
A functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
A functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
M zanata-war/src/main/webapp/profile/home.xhtml
Log Message:
-----------
Add person search tests
Commit: 4cb4b3766a4aa8a4a5b4e507d3158595c542b33d
https://github.com/zanata/zanata-server/commit/4cb4b3766a4aa8a4a5b4e507d3158595c542b33d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-10 (Fri, 10 Apr 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
Log Message:
-----------
Merge pull request #771 from zanata/handle-missing-proxy-header
Handle missing/empty proxy header
Commit: 4e098e3236de8c691bb4ace2eade7094c5c84a46
https://github.com/zanata/zanata-server/commit/4e098e3236de8c691bb4ace2eade7094c5c84a46
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M functional-test/pom.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
Log Message:
-----------
Merge pull request #756 from zanata/mariadb-fix
rhbz1048293 Fix liquibase changeset to be compatible with mysql/mariadb version > 5.5
Commit: 5e9decdc0f7ec424618175060203f24f19acdf95
https://github.com/zanata/zanata-server/commit/5e9decdc0f7ec424618175060203f24f19acdf95
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Commit: d7725721fdda7516748ef094c89b967703236518
https://github.com/zanata/zanata-server/commit/d7725721fdda7516748ef094c89b967703236518
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
Log Message:
-----------
Ensure tables use InnoDB engine on MySQL
Commit: 86d1ae0665888e5f83dbc91f4e27b7cca7af5288
https://github.com/zanata/zanata-server/commit/86d1ae0665888e5f83dbc91f4e27b7cca7af5288
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-15 (Wed, 15 Apr 2015)
Changed paths:
A docs/.gitattributes
Log Message:
-----------
Merge pull request #769 from zanata/merge-release-notes
Set merge=union for release-notes.md in .gitattributes
Commit: c63409a760de7f59cd1e7489f4067357bab09fad
https://github.com/zanata/zanata-server/commit/c63409a760de7f59cd1e7489f4067357bab09fad
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-15 (Wed, 15 Apr 2015)
Changed paths:
A docs/.gitattributes
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Commit: 8e11a04e0e42e00520bcb501d68211d7f86667ce
https://github.com/zanata/zanata-server/commit/8e11a04e0e42e00520bcb501d68211d7f86667ce
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-16 (Thu, 16 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge pull request #768 from zanata/add-undertow-module
Add Undertow modules for WildFly tests
Commit: 06db1090b75be199498b29a6eea075851d4d9c73
https://github.com/zanata/zanata-server/commit/06db1090b75be199498b29a6eea075851d4d9c73
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-16 (Thu, 16 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: e3ffc75a09875eb20b697ae315b742ae2d072e30
https://github.com/zanata/zanata-server/commit/e3ffc75a09875eb20b697ae315b742ae2d072e30
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-16 (Thu, 16 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Revert "Add Undertow modules from WildFly 9 for WildFly tests"
This reverts commit c40c2ddbb773456f98817cc0a4e332e51583e5b5.
Commit: d102ee2e4250400ad30412b4ec19e44593283b77
https://github.com/zanata/zanata-server/commit/d102ee2e4250400ad30412b4ec19e44593283b77
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-16 (Thu, 16 Apr 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: 0462274451010f89f129f87cb6c725655acbcd6f
https://github.com/zanata/zanata-server/commit/0462274451010f89f129f87cb6c725655acbcd6f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-16 (Thu, 16 Apr 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-war/pom.xml
Log Message:
-----------
Separate wildfly client version from server version
Commit: 81581f0162e012a61c754cb4ca96167aff0e1c16
https://github.com/zanata/zanata-server/commit/81581f0162e012a61c754cb4ca96167aff0e1c16
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-17 (Fri, 17 Apr 2015)
Changed paths:
A zanata-war/src/main/java/liquibase/sqlgenerator/ext/CreateTableGeneratorInnoDB.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
Log Message:
-----------
Add Liquibase extension to ensure InnoDB engine for new tables
Commit: 292493d61bcd8068af132d0532a680c2b4205b84
https://github.com/zanata/zanata-server/commit/292493d61bcd8068af132d0532a680c2b4205b84
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-17 (Fri, 17 Apr 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Update release notes
Commit: 0f36c37da09b92b9268e2c0871d235a61642de89
https://github.com/zanata/zanata-server/commit/0f36c37da09b92b9268e2c0871d235a61642de89
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-17 (Fri, 17 Apr 2015)
Changed paths:
A zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
M zanata-war/src/main/resources/db/db.changelog.xml
Log Message:
-----------
Check that all tables are InnoDB on every start
Commit: 0c3dad8bb3d9b44d86eaa928c6bb111b70692839
https://github.com/zanata/zanata-server/commit/0c3dad8bb3d9b44d86eaa928c6bb111b70692839
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-17 (Fri, 17 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/CorePage.java
Log Message:
-----------
Skip checking of critical errors (too slow due to implicit wait)
Commit: 9c3d0e65ab3f69d91e991ebcbfc4edae72fba380
https://github.com/zanata/zanata-server/commit/9c3d0e65ab3f69d91e991ebcbfc4edae72fba380
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-17 (Fri, 17 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/CorePage.java
Log Message:
-----------
Merge pull request #777 from zanata/skip-check-crit
Skip checking of critical errors (too slow due to implicit wait)
Commit: 7fa70afcaadf4f4da28e8e60f8894f9b7eacd53d
https://github.com/zanata/zanata-server/commit/7fa70afcaadf4f4da28e8e60f8894f9b7eacd53d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-20 (Mon, 20 Apr 2015)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
Log Message:
-----------
Merge pull request #767 from zanata/clean-for-l10n-validate
Clean for l10n validate
Commit: 83fc0e8a59f13b7d495eab808427031267a48cb7
https://github.com/zanata/zanata-server/commit/83fc0e8a59f13b7d495eab808427031267a48cb7
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-20 (Mon, 20 Apr 2015)
Changed paths:
M zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
Log Message:
-----------
Add meaningful error message when precondition fails
Commit: bae3c77b6fa4f12e5233ff3190e76a2865c5be36
https://github.com/zanata/zanata-server/commit/bae3c77b6fa4f12e5233ff3190e76a2865c5be36
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-20 (Mon, 20 Apr 2015)
Changed paths:
M docs/release-notes.md
M pom.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
A zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
Log Message:
-----------
Move zanata-assets as JAR and as dependency from zanata-server
https://bugzilla.redhat.com/show_bug.cgi?id=1207423
Squashed commit of the following:
commit 400b523966d085c6f346e95e56144225e6b37e8f
Merge: 6a59b8a 9c3d0e6
Author: Alex Eng <aeng at redhat.com>
Date: Mon Apr 20 10:18:40 2015 +1000
Merge branch 'integration/master' into zanata-assets-jar
commit 6a59b8a892d82d287a3b81a733f279f212252eb2
Author: Alex Eng <aeng at redhat.com>
Date: Fri Apr 17 07:08:34 2015 +1000
Change overriding of to system properties
commit 9e90103ad33c4e09d6c3f015ec76885429f430c2
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 16 16:52:15 2015 +1000
Update release notes, add bean for assets['resource']
commit 253579d009fbf37a340cb72bf74a2aef68278d51
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 14 13:05:10 2015 +1000
Add jars/assets as prefix for zanata-assets resource
commit 5070aa69dc2cd99121f11a673a25eb33027e68fb
Merge: f28152e 4b1baa5
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 1 12:39:50 2015 +1000
Merge branch 'integration/master' into zanata-assets-jar
Conflicts:
zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
commit f28152e856930f7dd69eb1ee76a62e4042c017a4
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 31 08:45:05 2015 +1000
Refactor assets url to be configurable in standalone.xml
commit 9194662feb68e33626b0ed4d65a542b81faedfbe
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 30 15:00:59 2015 +1000
Add release notes and comments for zanata-assets-jar changes
commit 5a3f613ef1ad3250f2525dfe6279e5c957d83173
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 30 13:23:31 2015 +1000
Remove webAssets config, add urlrewrite for .seam extension of resource file
commit f1e12dd8f35f246a7c1bc9f65ec7f4391bb1662d
Author: Alex Eng <aeng at redhat.com>
Date: Fri Mar 27 15:51:39 2015 +1000
Migrate to zanata-assets.jar reference
Commit: 63708bdf5095584ea4add217386013fcfb5b4a4a
https://github.com/zanata/zanata-server/commit/63708bdf5095584ea4add217386013fcfb5b4a4a
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-20 (Mon, 20 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
Log Message:
-----------
Wait for page loaders to be finished before proceeding
Requires the class 'is-active' to be present in the web element,
as the loader is always present and visible.
Commit: a50f201e005f0f87592619f10ce24a22fffaa0f4
https://github.com/zanata/zanata-server/commit/a50f201e005f0f87592619f10ce24a22fffaa0f4
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
Log Message:
-----------
Merge pull request #779 from zanata/wait-for-loaders
Wait for page loaders to be finished before proceeding
Commit: 0158851c7cada52fbad2bdcc15ff49d230c14387
https://github.com/zanata/zanata-server/commit/0158851c7cada52fbad2bdcc15ff49d230c14387
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
A functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
A functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
M zanata-war/src/main/webapp/profile/home.xhtml
Log Message:
-----------
Merge pull request #766 from zanata/person-search-test
Add person search tests
Commit: 8b3cc44a71879fe89252ffdaff680842da5506af
https://github.com/zanata/zanata-server/commit/8b3cc44a71879fe89252ffdaff680842da5506af
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
Log Message:
-----------
Wait for page loaders to be finished before proceeding
Requires the class 'is-active' to be present in the web element,
as the loader is always present and visible.
Conflicts:
functional-test/src/main/java/org/zanata/page/AbstractPage.java
Commit: 2be83b0dbf47af1a5673e8f6c37236412c12412c
https://github.com/zanata/zanata-server/commit/2be83b0dbf47af1a5673e8f6c37236412c12412c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
functional-test/src/main/java/org/zanata/page/AbstractPage.java
Commit: 3448525629c793028c96e9f1243f477b8be04f1f
https://github.com/zanata/zanata-server/commit/3448525629c793028c96e9f1243f477b8be04f1f
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M docs/release-notes.md
Log Message:
-----------
Merge pull request #762 from zanata/add-release-note-rhbz1165939
Add release note for rhbz1165939
Commit: db9cdde5518f934d7f7bc9d6e505caf82a7be933
https://github.com/zanata/zanata-server/commit/db9cdde5518f934d7f7bc9d6e505caf82a7be933
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M pom.xml
A zanata-liquibase/pom.xml
A zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
M zanata-war/pom.xml
R zanata-war/src/main/java/liquibase/sqlgenerator/ext/CreateTableGeneratorInnoDB.java
Log Message:
-----------
Move Liquibase extension to separate jar to ensure activation
Commit: 6ae447ec30f4ed65dd62e991e4b36682822719b7
https://github.com/zanata/zanata-server/commit/6ae447ec30f4ed65dd62e991e4b36682822719b7
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
Log Message:
-----------
Update to EAP 6.4
Commit: a0152f0726f0fca4d41482f30db67339a36c9564
https://github.com/zanata/zanata-server/commit/a0152f0726f0fca4d41482f30db67339a36c9564
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
Log Message:
-----------
Fix 'restore default' for editor
https://bugzilla.redhat.com/show_bug.cgi?id=895881
Squashed commit of the following:
commit 7d1f1669cda9248612cf26b3de67cccf0656f2fd
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 21 20:04:17 2015 +1000
Restore default for reference locale
commit 826a53eb60af5825ffe147c97b68111f1068c120
Merge: 2e32f1e 3448525
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 21 19:37:16 2015 +1000
Merge branch 'integration/master' into rhbz895881
commit 2e32f1e687c08116f783e33c4149d428d6b6da72
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 14 16:18:27 2015 +1000
Fix 'restore default' for editor
https://bugzilla.redhat.com/show_bug.cgi?id=895881
Commit: a9cd6cf0df2d8e7079afaba43389dd1666631d35
https://github.com/zanata/zanata-server/commit/a9cd6cf0df2d8e7079afaba43389dd1666631d35
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Enable errors for connection leaks during tests
Commit: 0d0b865ad57dc171f80537274b4f8a120099a2ea
https://github.com/zanata/zanata-server/commit/0d0b865ad57dc171f80537274b4f8a120099a2ea
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
Log Message:
-----------
Enable connection leak detection and prevention
Commit: d23eb531216b73a9397f2a3b3282d0b1ceebae5f
https://github.com/zanata/zanata-server/commit/d23eb531216b73a9397f2a3b3282d0b1ceebae5f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
Log Message:
-----------
Merge pull request #780 from zanata/eap64
Update to EAP 6.4
Commit: 70e53a4fdd93ad39914b27b6a58fcb668ffff7d9
https://github.com/zanata/zanata-server/commit/70e53a4fdd93ad39914b27b6a58fcb668ffff7d9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Conflicts:
functional-test/pom.xml
Commit: f4267c26d0de00aa9019b42f7c97bd48d2f5b52d
https://github.com/zanata/zanata-server/commit/f4267c26d0de00aa9019b42f7c97bd48d2f5b52d
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M docs/release-notes.md
M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
R zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
A zanata-war/src/main/java/org/zanata/adapter/PropertiesAdapter.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
R zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
M zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
R zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
R zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
Log Message:
-----------
Update request to join group/language page
https://bugzilla.redhat.com/show_bug.cgi?id=1207426
Squashed commit of the following:
commit 79184b7cbf4189a8cae9311c7bbbc15ef5178eab
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 22 09:37:22 2015 +1000
Disable contact coordinator button is empty message
commit 276e1ba5a250ef13bb9b4930e12ef3c93d9039ab
Merge: d177563 3448525
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 21 20:43:39 2015 +1000
Merge branch 'integration/master' into update-join-language-page
commit d177563e8718b17cd672c522264eede92b14c8d0
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 21 20:43:18 2015 +1000
Add 'No versions' indicator for request join group, fix checkbox for request join language, fix contact coordinator 'Send' button
commit 76951a6934fa4535be4872a1780d504317f337aa
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 21 15:35:41 2015 +1000
Add release notes
commit c28e17f602eb1b30cbf3cbbd622cf3f91dae1581
Author: Alex Eng <aeng at redhat.com>
Date: Mon Apr 13 16:23:35 2015 +1000
Refactor sendEmailAction
commit 6beb3d8fde8206cdda9481fd8d6bca93ea2595fe
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 7 16:45:38 2015 +1000
Fix button disabled when non-selected in version group request
commit 512768810e6c42aea2f396ec8416434b867f6151
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 7 10:12:56 2015 +1000
Use absolute path reference in JSF
commit 2a82c12fd7e58673b3c0c4c83dba9c33cd841020
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 7 10:09:12 2015 +1000
Revert messages properties
commit 2d600e01471f767556263323f648389b70ffb118
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 7 09:29:07 2015 +1000
Remove unused method
commit 84d86fa4face258c64ef11f0de8779bd625dd13f
Merge: 7395b78 307b890
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 7 08:46:54 2015 +1000
Merge branch 'integration/master' into update-join-language-page
commit 7395b78fa11358bfa30aebdf108a05cb5ff99195
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 2 15:26:16 2015 +1000
Fix functional test
commit be9c2247076094ad9e8e708943d7221dbc7f3bbb
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 2 08:57:35 2015 +1000
Refactor, add comments in version-group join method
commit 5b3f90934591ddc56cf711c1b130aad370ece743
Merge: bbe42df e033111
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 2 08:08:00 2015 +1000
Merge branch 'integration/master' into update-join-language-page
commit bbe42dfc7c144605d95bfa18d320f75457678d0e
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 1 15:07:43 2015 +1000
fix checkstyle
commit 65eeb018051446ebfd2654b971719f3452042a50
Merge: f76ad23 4b1baa5
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 1 12:48:51 2015 +1000
Merge branch 'integration/master' into update-join-language-page
Conflicts:
zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
commit f76ad237e491af0b3a5906ea1bbf10bdd1fada17
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 31 14:47:30 2015 +1000
remove old request_join for version group
commit 3b47b6f9d307d7d5598f5876a216e23e9823f74e
Merge: 447ec2b e9d0b2c
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 31 10:44:58 2015 +1000
Merge branch 'integration/master' into update-join-language-page
commit 447ec2b6cb3235ba18e6be23e8385e44aacf2cd9
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 26 13:43:34 2015 +1000
WIP: Get checkbox rerender send buttons
commit 24cd0af46d1cfafae92a4de2b4e38c8a98e5b6c1
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 26 13:01:57 2015 +1000
Rename selectableProject to selectableVersion
commit ccee996ab97c09b497c5c52fe3c1b2f17010b28b
Merge: b155f2e 9fd2486
Author: Alex Eng <aeng at redhat.com>
Date: Thu Mar 26 10:17:47 2015 +1000
Merge branch 'integration/master' into update-join-language-page
commit b155f2e22d8a8afc1da4442ff5fb126799588ae6
Author: Alex Eng <aeng at redhat.com>
Date: Wed Mar 18 16:07:31 2015 +1000
Initial build for version group request
commit a99814cf806cd6682635a267b8a5f5dc18cf4b85
Merge: dad7852 bacdfcd
Author: Alex Eng <aeng at redhat.com>
Date: Wed Mar 18 13:39:53 2015 +1000
Merge branch 'integration/master' into update-join-language-page
commit dad7852e37e4664353e867760b1f12c454595ea1
Author: Alex Eng <aeng at redhat.com>
Date: Wed Mar 18 13:27:53 2015 +1000
WIP: converting join group to model
commit c489b57919e9c5c95d08d7a3dd7baca07685f4de
Author: Alex Eng <aeng at redhat.com>
Date: Wed Mar 18 09:59:43 2015 +1000
Implement modal dialog for request to join language page
commit 9b7048807e21641e9921109393a42b53eaa7b371
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 17 15:44:31 2015 +1000
Clear selected roles when cancel
commit a9d3eac95abcf2b37e55ee0350f5a5475ad1bb6f
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 17 13:14:23 2015 +1000
Create request join and update role dialog
commit 1719dfbf5f8c1485822eeb59174d9d8596e43f3e
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 17 09:00:33 2015 +1000
Refactor contact admin and coordinator dialog
commit 139982095d4f1aa12ed1913debd2fc0f2e894645
Merge: 32679e4 649a824
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 17 06:52:41 2015 +1000
Merge remote-tracking branch 'origin' into update-join-language-page
commit 32679e45ff296d3f0a75e84512c75751e7368fd4
Author: Alex Eng <aeng at redhat.com>
Date: Tue Mar 3 15:35:28 2015 +1000
Update join language page
Commit: c5130c055d950c5d70755a9438951e20139a2d5e
https://github.com/zanata/zanata-server/commit/c5130c055d950c5d70755a9438951e20139a2d5e
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-23 (Thu, 23 Apr 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
Log Message:
-----------
Fix checkstyle failure
Commit: 87412537b68cfdfc697485aeaec943786d10f73c
https://github.com/zanata/zanata-server/commit/87412537b68cfdfc697485aeaec943786d10f73c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-23 (Thu, 23 Apr 2015)
Changed paths:
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Merge pull request #781 from zanata/prevent-connection-leaks
Prevent connection leaks
Commit: 1b0a64bca512c2d1960712d780d62bc7e68b4ea4
https://github.com/zanata/zanata-server/commit/1b0a64bca512c2d1960712d780d62bc7e68b4ea4
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-23 (Thu, 23 Apr 2015)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-war/pom.xml
Log Message:
-----------
Merge pull request #775 from zanata/separate-wildfly-client-version
Separate wildfly client version from server version
Commit: 7a5769ae7e113d2eb1118a5cf2a4b984f721bc99
https://github.com/zanata/zanata-server/commit/7a5769ae7e113d2eb1118a5cf2a4b984f721bc99
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-23 (Thu, 23 Apr 2015)
Changed paths:
M functional-test/pom.xml
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M pom.xml
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-war/pom.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Conflicts:
functional-test/pom.xml
Commit: 300a693efa9727b7ac95eb2a27f834425db76698
https://github.com/zanata/zanata-server/commit/300a693efa9727b7ac95eb2a27f834425db76698
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-24 (Fri, 24 Apr 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
Log Message:
-----------
Update the copyright year displayed to 2008-$currentYear
Commit: c69d8ecaa1682274534a437e4f4ccb2b308152ef
https://github.com/zanata/zanata-server/commit/c69d8ecaa1682274534a437e4f4ccb2b308152ef
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)
Changed paths:
A zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
Log Message:
-----------
Add Liquibase extension which logs changes before executing
Commit: 10c2989766526348d8e9103ba35bf0782af0f62e
https://github.com/zanata/zanata-server/commit/10c2989766526348d8e9103ba35bf0782af0f62e
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-04-28 (Tue, 28 Apr 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
Log Message:
-----------
rhbz1205512 - run validation button on document list page will be
disabled if no validation to run
Commit: 23e51d6809ecf66fdd1161952c6e8fdb8adcefed
https://github.com/zanata/zanata-server/commit/23e51d6809ecf66fdd1161952c6e8fdb8adcefed
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-28 (Tue, 28 Apr 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
Log Message:
-----------
Merge pull request #765 from zanata/update-copyright-2015
Update the copyright year to current year
Commit: 4c493547d5cb12fd0f607201917afc669757674e
https://github.com/zanata/zanata-server/commit/4c493547d5cb12fd0f607201917afc669757674e
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-04-28 (Tue, 28 Apr 2015)
Changed paths:
M functional-test/pom.xml
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M functional-test/src/test/resources/log4j.xml
M pom.xml
M zanata-model/pom.xml
A zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
A zanata-model/src/test/java/org/zanata/model/validator/UrlValidatorTest.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
M zanata-war/src/main/java/org/zanata/action/validator/EmailListValidator.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptcha.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponse.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponseValidator.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
M zanata-war/src/main/resources/messages_nl.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
A zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
M zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
A zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/EmailQueueMessageReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/ExpiryLetterQueueReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandlerTest.java
A zanata-war/src/test/java/org/zanata/notification/MessageUnwrapperTest.java
A zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java
M zanata-war/src/test/java/org/zanata/rest/ResourceRequest.java
R zanata-war/src/test/java/org/zanata/rest/compat/AccountCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/compat/CompatibilityBase.java
R zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java
R zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
R zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
R zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectsServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
R zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/VersionRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/CopyTransRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRawRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectsRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestTest.java
A zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
A zanata-war/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
M zanata-war/src/test/java/org/zanata/util/RawRestTestUtils.java
R zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Squashed commit of the following (PR642):
https://github.com/zanata/zanata-server/pull/642
commit f2c2b7b66ddad082eb27535c1d108d0a52fe94b8
Merge: dfae212 7a5769a
Author: Patrick Huang <pahuang at redhat.com>
Date: Tue Apr 28 11:02:02 2015 +1000
Merge branch 'master' into jersey-boys
commit dfae212b45954d0e4f344f11f44af14a68d601f4
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Apr 23 15:25:23 2015 +1000
accept json in server configuration REST service and fix tests
commit 973a93a447e080e3af93ff731d60775c4580f31d
Merge: 5c0d9d7 a0152f0
Author: Patrick Huang <pahuang at redhat.com>
Date: Wed Apr 22 14:36:47 2015 +1000
Merge branch 'master' into jersey-boys
Conflicts:
zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
zanata-war/src/test/java/org/zanata/RestTest.java
commit 5c0d9d7b65bdc54668a8bccca180467634cc26bb
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Mar 26 20:49:07 2015 +1000
fix functional test
commit 2e9fdccda67cb3f0b1e2c8f8d5794c3aac85a86d
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Mar 26 17:16:20 2015 +1000
fix functional test
commit 10e3748640bdce7c8e1aee08136befcbd42bfae7
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Mar 26 14:12:50 2015 +1000
add json tests
commit 6131e6b2adb6eb44ee819667bac361787556b3a2
Author: Patrick Huang <pahuang at redhat.com>
Date: Thu Mar 26 13:04:48 2015 +1000
include exception in log
commit 27991b2c379215269a47a4f7296648625d882731
Author: Patrick Huang <pahuang at redhat.com>
Date: Fri Mar 20 14:13:27 2015 +1000
remove dependency of zanata client and tighten dup finder config
commit 3296a08687318c7cab3e22548cd2441129f80789
Author: Patrick Huang <pahuang at redhat.com>
Date: Fri Jan 23 14:45:35 2015 +1000
increase test coverage
commit 00da2a6f4d1d7615bbb4d3ce95187e688f153de1
Author: Patrick Huang <pahuang at redhat.com>
Date: Fri Jan 16 08:47:50 2015 +1000
rhbz1124630 - convert proxy based REST tests to raw REST tests
commit d1cdaca6396cac8344108c69f22099337cad1ec1
Author: Patrick Huang <pahuang at redhat.com>
Date: Mon Dec 1 14:21:22 2014 +1000
rhbz1124630 - move client interface to server to avoid massive change in testing
Commit: 774be1165637f0aa506167f575ead8d6c4786f3c
https://github.com/zanata/zanata-server/commit/774be1165637f0aa506167f575ead8d6c4786f3c
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-04-28 (Tue, 28 Apr 2015)
Changed paths:
M docs/release-notes.md
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
Log Message:
-----------
Merge pull request #783 from zanata/rhbz1205512
rhbz1205512 - run validation button on document list page wont be disabled
Commit: 78a8240949cd7ae44dcd641e2f2214ac828774aa
https://github.com/zanata/zanata-server/commit/78a8240949cd7ae44dcd641e2f2214ac828774aa
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-04-29 (Wed, 29 Apr 2015)
Changed paths:
M docs/release-notes.md
M zanata-model/src/main/java/org/zanata/model/HAccount.java
M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
A zanata-model/src/main/java/org/zanata/model/HasUserFriendlyToString.java
M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
Log Message:
-----------
rhbz903964 - produce better error message when permission check failed
Commit: 9caaf667632c3cf6bc94680e8b8a8c466721b96d
https://github.com/zanata/zanata-server/commit/9caaf667632c3cf6bc94680e8b8a8c466721b96d
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-04-29 (Wed, 29 Apr 2015)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
Log Message:
-----------
fix tests after changing 401 to 403
Commit: 8bcefbc9fc883f53ed1c93f28d439df5594c19ef
https://github.com/zanata/zanata-server/commit/8bcefbc9fc883f53ed1c93f28d439df5594c19ef
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-29 (Wed, 29 Apr 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
Log Message:
-----------
Ignore failing tests due to loader issue (RHBZ1216304)
Commit: 72738ba50e7e6a5e24be753d40d418e3a0183b08
https://github.com/zanata/zanata-server/commit/72738ba50e7e6a5e24be753d40d418e3a0183b08
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-29 (Wed, 29 Apr 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: 479dc2dc3dc1ee543c816c7c182bb46ab06b1661
https://github.com/zanata/zanata-server/commit/479dc2dc3dc1ee543c816c7c182bb46ab06b1661
Author: Patrick Huang <pahuang at redhat.com>
Date: 2015-04-29 (Wed, 29 Apr 2015)
Changed paths:
M docs/release-notes.md
M zanata-model/src/main/java/org/zanata/model/HAccount.java
M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
A zanata-model/src/main/java/org/zanata/model/HasUserFriendlyToString.java
M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
Log Message:
-----------
Merge pull request #787 from zanata/rhbz903964-better-error-msg
rhbz903964 - produce better error message when permission check failed
Commit: a8ff08485d86a7c23989d1ea1f083a62a5f643c6
https://github.com/zanata/zanata-server/commit/a8ff08485d86a7c23989d1ea1f083a62a5f643c6
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-30 (Thu, 30 Apr 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
Log Message:
-----------
Fix REST permission test after response changes
Commit: 83bed11e1d4fbbe0f8165805799a4da4a8b6041c
https://github.com/zanata/zanata-server/commit/83bed11e1d4fbbe0f8165805799a4da4a8b6041c
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-30 (Thu, 30 Apr 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
Log Message:
-----------
Merge pull request #788 from zanata/fix-rest-permission-test
Fix REST permission test after response changes
Commit: be9e73bb227d4b2b8e88ce4a7ea0b480b78c1116
https://github.com/zanata/zanata-server/commit/be9e73bb227d4b2b8e88ce4a7ea0b480b78c1116
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-30 (Thu, 30 Apr 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
Log Message:
-----------
Add server logging for failure responses
Commit: a78d48a60f106e294986d15c5a5ec8e00f38da24
https://github.com/zanata/zanata-server/commit/a78d48a60f106e294986d15c5a5ec8e00f38da24
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-30 (Thu, 30 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/CorePage.java
Log Message:
-----------
Page defocus waits for page silence before proceeding.
Commit: d95ac519a887995819d481bc1463482f280b8c64
https://github.com/zanata/zanata-server/commit/d95ac519a887995819d481bc1463482f280b8c64
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-30 (Thu, 30 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/CorePage.java
Log Message:
-----------
Merge pull request #790 from zanata/fix-defocus-wait
Page defocus waits for page silence before proceeding.
Commit: 3f5db95a5eb8eb84371f9d852a8ce3a4d2a0f961
https://github.com/zanata/zanata-server/commit/3f5db95a5eb8eb84371f9d852a8ce3a4d2a0f961
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-04-30 (Thu, 30 Apr 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/CorePage.java
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
functional-test/src/main/java/org/zanata/page/CorePage.java
Commit: bb1bb593b5116ce8fd6dc7d18863d066c9488556
https://github.com/zanata/zanata-server/commit/bb1bb593b5116ce8fd6dc7d18863d066c9488556
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-04-30 (Thu, 30 Apr 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
Log Message:
-----------
Merge pull request #789 from zanata/logging-for-failures
Add server logging for failure responses
Commit: b9b4c7ad3f6ada9a4da0620620ccd9a2296e0b05
https://github.com/zanata/zanata-server/commit/b9b4c7ad3f6ada9a4da0620620ccd9a2296e0b05
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-04 (Mon, 04 May 2015)
Changed paths:
M docs/release-notes.md
M pom.xml
A zanata-liquibase/pom.xml
A zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
A zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
M zanata-war/pom.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
A zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
M zanata-war/src/main/resources/db/db.changelog.xml
Log Message:
-----------
Merge branch 'ensure-innodb' into ensure-innodb-on-37
Conflicts:
zanata-war/pom.xml
zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
Commit: 2dbc02f4f547fc2405bd798639bad23c7d08f785
https://github.com/zanata/zanata-server/commit/2dbc02f4f547fc2405bd798639bad23c7d08f785
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-05-04 (Mon, 04 May 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
Log Message:
-----------
Remove excess waits for test page
Commit: 40de2126fb944e12cfc34d71b9f68c6b15918a24
https://github.com/zanata/zanata-server/commit/40de2126fb944e12cfc34d71b9f68c6b15918a24
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-05-04 (Mon, 04 May 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
Log Message:
-----------
Test time extension to 3m/10m
Commit: 0f062494c39e4b809f42584c9220dd650f328088
https://github.com/zanata/zanata-server/commit/0f062494c39e4b809f42584c9220dd650f328088
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
functional-test/src/main/java/org/zanata/page/AbstractPage.java
Commit: 0e0bae6f1f33bc193b1000a902324e602eb1808f
https://github.com/zanata/zanata-server/commit/0e0bae6f1f33bc193b1000a902324e602eb1808f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Update to zanata assets 6.1.1
Commit: 444cb0dc18f026f092735bc8e6b47c187ab6dda0
https://github.com/zanata/zanata-server/commit/444cb0dc18f026f092735bc8e6b47c187ab6dda0
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Upgrade failsafe to SNAPSHOT which fixes SUREFIRE-1152
Commit: b7321254cf3addb8cbf4599ee9e1877788027800
https://github.com/zanata/zanata-server/commit/b7321254cf3addb8cbf4599ee9e1877788027800
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
Log Message:
-----------
Unignore tests for RHBZ1216304
Commit: 289042cd1466337e7b992c5cd9c7fe64b39f6bf2
https://github.com/zanata/zanata-server/commit/289042cd1466337e7b992c5cd9c7fe64b39f6bf2
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
Log Message:
-----------
Ignore intermittently failing REST rate limit test
Commit: 4900b5e16e55295a1d5fb1788329bbc886250e3b
https://github.com/zanata/zanata-server/commit/4900b5e16e55295a1d5fb1788329bbc886250e3b
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
Log Message:
-----------
Merge pull request #793 from zanata/ignore-ratelimit-test
Ignore intermittently failing REST rate limit test
Commit: c36663118b0fb358c8b1cd048014e14788dd6c5c
https://github.com/zanata/zanata-server/commit/c36663118b0fb358c8b1cd048014e14788dd6c5c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M docs/release-notes.md
M pom.xml
A zanata-liquibase/pom.xml
A zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
A zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
M zanata-war/pom.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
A zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
M zanata-war/src/main/resources/db/db.changelog.xml
Log Message:
-----------
Merge pull request #791 from zanata/ensure-innodb-on-37
Ensure innodb on 3.7
Commit: 80d58ffa09a74c15af01163b32fdebcb920c9130
https://github.com/zanata/zanata-server/commit/80d58ffa09a74c15af01163b32fdebcb920c9130
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M docs/release-notes.md
M pom.xml
A zanata-liquibase/pom.xml
A zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
A zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
M zanata-war/pom.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
A zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
M zanata-war/src/main/resources/db/db.changelog.xml
Log Message:
-----------
Merge pull request #773 from zanata/ensure-innodb
Ensure use of InnoDB engine on MySQL
Commit: ab66f42d53c5634993b92cf3609e4e71649eb09f
https://github.com/zanata/zanata-server/commit/ab66f42d53c5634993b92cf3609e4e71649eb09f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Conflicts:
functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
Commit: 9201cfbb64b32692c801cb9dfedca6a6db20b19f
https://github.com/zanata/zanata-server/commit/9201cfbb64b32692c801cb9dfedca6a6db20b19f
Author: Alex Eng <aeng at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
A docs/images/account-activated.png
A docs/images/account-resend-activation.png
A docs/images/account-settings-email.png
A docs/images/account-settings-languages.png
A docs/images/account-settings-password.png
A docs/images/account-signup-openid-details.png
A docs/images/admin-contact-link.png
A docs/images/admin-contact.png
A docs/images/admin-menu-access.png
A docs/images/admin-sections.png
A docs/images/copy-trans-access.png
A docs/images/copy-trans-dialog.png
A docs/images/copy-trans-newversion.png
A docs/images/copy-trans-permissive.png
A docs/images/copy-trans-strict.png
A docs/images/copy-version-access.png
A docs/images/copy-version-access2.png
A docs/images/copy-version.png
A docs/images/create-group-completed.png
A docs/images/create-group.png
M docs/images/create-project-completed.png
M docs/images/create-project.png
R docs/images/create-version-master.png
R docs/images/create-version.png
A docs/images/editor-approve-button.png
A docs/images/editor-approved.png
A docs/images/editor-doc-list-settings.png
A docs/images/editor-doc-list-validations.png
A docs/images/editor-doc-list.png
A docs/images/editor-filter-translated.png
A docs/images/editor-history-button.png
A docs/images/editor-open-menu.png
A docs/images/editor-overview.png
A docs/images/editor-readonly-indicator.png
A docs/images/editor-reject-dialog.png
A docs/images/editor-rejected-history.png
A docs/images/editor-rejected-with-comment.png
A docs/images/editor-settings.png
A docs/images/editor-translated-strings.png
A docs/images/editor-validations.png
A docs/images/editor-views-icon.png
A docs/images/glossary-csv.png
A docs/images/glossary-upload-windows-po.png
A docs/images/glossary-upload-windows.png
A docs/images/glossary-upload.png
A docs/images/group-general-settings.png
A docs/images/group-languages-settings.png
A docs/images/group-maintainer-settings.png
A docs/images/group-projects-remove.png
A docs/images/group-projects-settings.png
A docs/images/group-request-join-dialog.png
A docs/images/group-request-join.png
A docs/images/group-settings-button.png
A docs/images/group-view-languages.png
A docs/images/language-add-member.png
A docs/images/language-contact-coordinator.png
A docs/images/language-contact-menu.png
A docs/images/language-leave-team.png
A docs/images/language-members-tab.png
A docs/images/language-request-join-menu.png
A docs/images/language-request-join.png
A docs/images/merge-trans-access.png
A docs/images/merge-trans-dialog.png
M docs/images/project-about-settings.png
M docs/images/project-general-settings.png
M docs/images/project-languages-add.png
M docs/images/project-languages-remove.png
M docs/images/project-languages-settings.png
M docs/images/project-permissions-settings.png
M docs/images/project-settings-button.png
M docs/images/project-translation-settings.png
A docs/images/project-user-search.png
M docs/images/project-view-versions.png
A docs/images/project-webhooks-settings-2.png
A docs/images/project-webhooks-settings.png
A docs/images/upload-new-source-doc.png
A docs/images/upload-source-doc-dialog.png
A docs/images/upload-source-doc-from-settings.png
A docs/images/upload-source-doc.png
A docs/images/upload-translation-doc-dialog.png
A docs/images/upload-translation-doc.png
M docs/images/user-dashboard-create-version.png
A docs/images/user-dashboard-versions.png
A docs/images/user-dashboard-view.png
A docs/images/user-dashboard.png
A docs/images/user-profile.png
A docs/images/version-create-new.png
A docs/images/version-create.png
A docs/images/version-documents-settings.png
A docs/images/version-download-translations-all-dialog.png
A docs/images/version-download-translations-all.png
A docs/images/version-download-translations.png
A docs/images/version-general-settings.png
A docs/images/version-languages-settings.png
M docs/images/version-merge-trans-cancel.png
M docs/images/version-merge-trans-dialog.png
M docs/images/version-merge-trans-progress.png
M docs/images/version-more-action-menu.png
A docs/images/version-settings-button.png
A docs/images/version-translation-settings.png
M docs/images/version-view-languages.png
A docs/images/webtrans-access.png
M docs/index.md
R docs/user-guide/Opening-a-Translation-Project.md
A docs/user-guide/account/account-activate.md
A docs/user-guide/account/account-resend-activation.md
A docs/user-guide/account/account-settings.md
A docs/user-guide/account/account-sign-up.md
A docs/user-guide/account/user-dashboard.md
A docs/user-guide/account/user-profile.md
A docs/user-guide/admin/admin-overview.md
A docs/user-guide/admin/contact-admin.md
A docs/user-guide/api/api.md
R docs/user-guide/client-command-hook.md
R docs/user-guide/client-configuration.md
A docs/user-guide/client/client.md
R docs/user-guide/contributing-translations.md
A docs/user-guide/drupal/drupal.md
A docs/user-guide/editor/documents-view.md
A docs/user-guide/editor/editor-view.md
A docs/user-guide/editor/keyboard-shortcuts.md
A docs/user-guide/editor/overview.md
A docs/user-guide/editor/translation-history.md
A docs/user-guide/glossary/delete-glossaries.md
A docs/user-guide/glossary/edit-glossaries.md
A docs/user-guide/glossary/glossary-roles-permissions.md
A docs/user-guide/glossary/upload-glossaries.md
A docs/user-guide/groups/create-group.md
A docs/user-guide/groups/group-settings.md
A docs/user-guide/groups/group-view.md
R docs/user-guide/joining-a-language-team.md
R docs/user-guide/keyboard-shortcuts.md
A docs/user-guide/languages/add-team-member.md
A docs/user-guide/languages/language-team.md
A docs/user-guide/languages/modify-role.md
R docs/user-guide/merge-translations.md
A docs/user-guide/project-maintainer-guide.md
R docs/user-guide/project-types.md
M docs/user-guide/projects/create-project.md
R docs/user-guide/projects/create-version.md
A docs/user-guide/projects/gettext-example.md
A docs/user-guide/projects/import-projects.md
A docs/user-guide/projects/podir-example.md
M docs/user-guide/projects/project-settings.md
A docs/user-guide/projects/project-types.md
M docs/user-guide/projects/project-view.md
R docs/user-guide/projects/upload-strings.md
A docs/user-guide/projects/validations.md
A docs/user-guide/review/add-reviewer.md
A docs/user-guide/review/overview.md
A docs/user-guide/review/review-enable.md
A docs/user-guide/review/translation-review.md
A docs/user-guide/translation-reuse/copy-trans.md
A docs/user-guide/translation-reuse/copy-version.md
A docs/user-guide/translation-reuse/merge-trans.md
A docs/user-guide/translator-guide.md
R docs/user-guide/translators-new-account.md
R docs/user-guide/user-profile.md
A docs/user-guide/versions/create-version.md
A docs/user-guide/versions/download-translations.md
A docs/user-guide/versions/merge-translations.md
A docs/user-guide/versions/request-to-join-group.md
A docs/user-guide/versions/upload-strings.md
A docs/user-guide/versions/version-settings.md
M mkdocs.yml
Log Message:
-----------
Move documentation to readthedocs
https://bugzilla.redhat.com/show_bug.cgi?id=1204982
Squashed commit of the following:
commit 97d705bc5afabfe5265923caeb05cadf01973959
Author: Alex Eng <aeng at redhat.com>
Date: Tue May 5 14:08:47 2015 +1000
run png crush on png images
commit 1da5a0a94ce6b67b1b8295350dd537cf155f26d9
Author: Alex Eng <aeng at redhat.com>
Date: Tue May 5 13:44:54 2015 +1000
Add Editor view details
commit aab34744e0d5832651c2c475fe0b98900abf2668
Merge: e6f7391 ab66f42
Author: Alex Eng <aeng at redhat.com>
Date: Tue May 5 13:13:10 2015 +1000
Merge branch 'integration/master' into rhbz1204982
commit e6f7391d50640e411b7e65a7c7bfd5f25d875d48
Author: Alex Eng <aeng at redhat.com>
Date: Tue May 5 11:09:59 2015 +1000
Convert .png to .gif
commit 184ba1f741c90225a12e64af2813ab4839311975
Author: Damian Jansen <djansen at redhat.com>
Date: Tue May 5 09:41:49 2015 +1000
Spellcheck docs
commit c8e1969aabdc75631d2e5a8322727aab49e9643f
Author: Alex Eng <aeng at redhat.com>
Date: Tue May 5 07:21:44 2015 +1000
Add user guide
commit 5cc09f300a61f01ca298c6b7f0872dc0bd544627
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 30 15:51:23 2015 +1000
Migrade docs and manual from zanata.org/help
commit ed33d9b2e2b47702f67c7f49549e1d5c0085cbd9
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 28 16:06:35 2015 +1000
Add contact us in index page
commit 5a2aac30a1211f0a8b6fe2370cc9a0f0c59d8436
Merge: aeb9476 80260ce
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 28 15:12:03 2015 +1000
Merge branch 'rhbz1204982' of github.com:zanata/zanata-server into rhbz1204982
commit aeb947683698dfa76345bfa781e723999588c14d
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 28 15:11:49 2015 +1000
Add download translations section
commit 80260ce93f013332bf2c150926fe0bf649a8b5be
Author: Damian Jansen <djansen at redhat.com>
Date: Tue Apr 28 14:47:38 2015 +1000
Review and update some of the new documentation entries
commit 926a53167b60afbd2941cc194347837a55aedd99
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 28 14:07:43 2015 +1000
Restructure doc layout, add languages and groups section
commit e9ba9cc8adf393b988f71239c5ba6c7a0754b7fb
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 28 09:15:02 2015 +1000
Add documentation for account, projects and versions
commit 1318a54c102bc3676f56f4c12ef02744e7f75e3e
Author: Alex Eng <aeng at redhat.com>
Date: Mon Apr 27 15:27:14 2015 +1000
Add Account section
Commit: b0e4e38b92132ee09650377a04e32efabbcb734e
https://github.com/zanata/zanata-server/commit/b0e4e38b92132ee09650377a04e32efabbcb734e
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-05-05 (Tue, 05 May 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
Log Message:
-----------
Remove slow findElements wait from waitForPageSilence
Commit: eaa215b2df20bc33eddf87ba2eadff6132a4180a
https://github.com/zanata/zanata-server/commit/eaa215b2df20bc33eddf87ba2eadff6132a4180a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-06 (Wed, 06 May 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M zanata-war/pom.xml
Log Message:
-----------
Merge pull request #782 from zanata/assets611
Update to zanata assets 6.1.1
Commit: 85e6ed66d757f0f9c30147a47f2f9357185f7923
https://github.com/zanata/zanata-server/commit/85e6ed66d757f0f9c30147a47f2f9357185f7923
Author: Alex Eng <aeng at redhat.com>
Date: 2015-05-06 (Wed, 06 May 2015)
Changed paths:
A docs/images/role-assignment-access.png
A docs/images/role-assignment-delete.png
A docs/images/role-assignment-new-access.png
A docs/images/role-assignment-new-form.png
A docs/images/role-assignment-project.png
A docs/images/role-assignment-view.png
M docs/user-guide/admin/admin-overview.md
A docs/user-guide/admin/role-assignment-rules.md
M mkdocs.yml
Log Message:
-----------
Add admin role assignment feature documentation
Squashed commit of the following:
commit cfe609645f559ebf6cf575a481b75cca4cbb77ff
Author: Alex Eng <aeng at redhat.com>
Date: Tue May 5 16:15:30 2015 +1000
Add admin role assignment doc
Commit: 7b514b8f7887cfa3671dc9053ed02a5e9cf8d2be
https://github.com/zanata/zanata-server/commit/7b514b8f7887cfa3671dc9053ed02a5e9cf8d2be
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-06 (Wed, 06 May 2015)
Changed paths:
A functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/retry-flaky-tests' into integration/master
Conflicts:
pom.xml
Commit: 7d04d5b64dce984a2bfb1d8f00b79ff019dbce76
https://github.com/zanata/zanata-server/commit/7d04d5b64dce984a2bfb1d8f00b79ff019dbce76
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-06 (Wed, 06 May 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Conflicts:
zanata-war/pom.xml
Commit: a701f80df7abebf0432541f2994ee24d4a506648
https://github.com/zanata/zanata-server/commit/a701f80df7abebf0432541f2994ee24d4a506648
Author: Alex Eng <aeng at redhat.com>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
M docs/index.md
M docs/user-guide/projects/import-projects.md
M docs/user-guide/projects/podir-example.md
M docs/user-guide/projects/project-types.md
M mkdocs.yml
Log Message:
-----------
Update index page of idoc, update missing podir example page
Commit: 600c225efd3f07589c75562babcc2a4840abdeb5
https://github.com/zanata/zanata-server/commit/600c225efd3f07589c75562babcc2a4840abdeb5
Author: Alex Eng <aeng at redhat.com>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
R docs/configuration/authentication.md
R docs/configuration/document-storage-directory.md
R docs/configuration/email.md
R docs/configuration/infinispan.md
R docs/configuration/installation.md
R docs/configuration/jms-messaging.md
M docs/index.md
A docs/user-guide/system-admin/configuration/authentication.md
A docs/user-guide/system-admin/configuration/document-storage-directory.md
A docs/user-guide/system-admin/configuration/email.md
A docs/user-guide/system-admin/configuration/infinispan.md
A docs/user-guide/system-admin/configuration/installation.md
A docs/user-guide/system-admin/configuration/jms-messaging.md
M mkdocs.yml
Log Message:
-----------
Move 'configuration' to 'system-admin' section
Commit: 49662a318693cd9c0d7eaeef1c7a121419738caa
https://github.com/zanata/zanata-server/commit/49662a318693cd9c0d7eaeef1c7a121419738caa
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Enable apache snapshots for surefire/failsafe
Commit: a66bd763ec867e2cb1c38d844e05b19ded32fb3e
https://github.com/zanata/zanata-server/commit/a66bd763ec867e2cb1c38d844e05b19ded32fb3e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
M docs/user-guide/client/client.md
Log Message:
-----------
Update link to Zanata client documentation
Commit: cf51cac707e8868994f31f3e62d94a5f14407076
https://github.com/zanata/zanata-server/commit/cf51cac707e8868994f31f3e62d94a5f14407076
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
M pom.xml
Log Message:
-----------
Merge pull request #798 from zanata/enable-apache-snapshots
Enable apache snapshots for surefire/failsafe
Commit: a5b7b9e70bfe1431b317c060bae1edb4bb8d9fae
https://github.com/zanata/zanata-server/commit/a5b7b9e70bfe1431b317c060bae1edb4bb8d9fae
Author: Alex Eng <aeng at redhat.com>
Date: 2015-05-07 (Thu, 07 May 2015)
Changed paths:
R docs/configuration/authentication.md
R docs/configuration/document-storage-directory.md
R docs/configuration/email.md
R docs/configuration/infinispan.md
R docs/configuration/installation.md
R docs/configuration/jms-messaging.md
M docs/index.md
M docs/user-guide/projects/import-projects.md
M docs/user-guide/projects/podir-example.md
M docs/user-guide/projects/project-types.md
A docs/user-guide/system-admin/configuration/authentication.md
A docs/user-guide/system-admin/configuration/document-storage-directory.md
A docs/user-guide/system-admin/configuration/email.md
A docs/user-guide/system-admin/configuration/infinispan.md
A docs/user-guide/system-admin/configuration/installation.md
A docs/user-guide/system-admin/configuration/jms-messaging.md
M mkdocs.yml
Log Message:
-----------
Merge pull request #797 from zanata/update-doc-index
Update index page of doc
Commit: d8234eb57b947f72d6f70fd96837c13a87bca9ec
https://github.com/zanata/zanata-server/commit/d8234eb57b947f72d6f70fd96837c13a87bca9ec
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-05-08 (Fri, 08 May 2015)
Changed paths:
R CHANGELOG.md
A docs/.gitattributes
R docs/configuration/authentication.md
R docs/configuration/document-storage-directory.md
R docs/configuration/email.md
R docs/configuration/infinispan.md
R docs/configuration/jms-messaging.md
A docs/images/account-activated.png
A docs/images/account-resend-activation.png
A docs/images/account-settings-email.png
A docs/images/account-settings-languages.png
A docs/images/account-settings-password.png
A docs/images/account-signup-openid-details.png
A docs/images/admin-contact-link.png
A docs/images/admin-contact.png
A docs/images/admin-menu-access.png
A docs/images/admin-sections.png
A docs/images/copy-trans-access.png
A docs/images/copy-trans-dialog.png
A docs/images/copy-trans-newversion.png
A docs/images/copy-trans-permissive.png
A docs/images/copy-trans-strict.png
A docs/images/copy-version-access.png
A docs/images/copy-version-access2.png
A docs/images/copy-version.png
A docs/images/create-group-completed.png
A docs/images/create-group.png
M docs/images/create-project-completed.png
M docs/images/create-project.png
R docs/images/create-version-master.png
R docs/images/create-version.png
A docs/images/editor-approve-button.png
A docs/images/editor-approved.png
A docs/images/editor-doc-list-settings.png
A docs/images/editor-doc-list-validations.png
A docs/images/editor-doc-list.png
A docs/images/editor-filter-translated.png
A docs/images/editor-history-button.png
A docs/images/editor-open-menu.png
A docs/images/editor-overview.png
A docs/images/editor-readonly-indicator.png
A docs/images/editor-reject-dialog.png
A docs/images/editor-rejected-history.png
A docs/images/editor-rejected-with-comment.png
A docs/images/editor-settings.png
A docs/images/editor-translated-strings.png
A docs/images/editor-validations.png
A docs/images/editor-views-icon.png
A docs/images/glossary-csv.png
A docs/images/glossary-upload-windows-po.png
A docs/images/glossary-upload-windows.png
A docs/images/glossary-upload.png
A docs/images/group-general-settings.png
A docs/images/group-languages-settings.png
A docs/images/group-maintainer-settings.png
A docs/images/group-projects-remove.png
A docs/images/group-projects-settings.png
A docs/images/group-request-join-dialog.png
A docs/images/group-request-join.png
A docs/images/group-settings-button.png
A docs/images/group-view-languages.png
A docs/images/language-add-member.png
A docs/images/language-contact-coordinator.png
A docs/images/language-contact-menu.png
A docs/images/language-leave-team.png
A docs/images/language-members-tab.png
A docs/images/language-request-join-menu.png
A docs/images/language-request-join.png
A docs/images/merge-trans-access.png
A docs/images/merge-trans-dialog.png
M docs/images/project-about-settings.png
M docs/images/project-general-settings.png
M docs/images/project-languages-add.png
M docs/images/project-languages-remove.png
M docs/images/project-languages-settings.png
M docs/images/project-permissions-settings.png
M docs/images/project-settings-button.png
M docs/images/project-translation-settings.png
A docs/images/project-user-search.png
A docs/images/project-view-versions.png
A docs/images/project-webhooks-settings-2.png
A docs/images/project-webhooks-settings.png
A docs/images/role-assignment-access.png
A docs/images/role-assignment-delete.png
A docs/images/role-assignment-new-access.png
A docs/images/role-assignment-new-form.png
A docs/images/role-assignment-project.png
A docs/images/role-assignment-view.png
A docs/images/upload-new-source-doc.png
A docs/images/upload-source-doc-dialog.png
A docs/images/upload-source-doc-from-settings.png
A docs/images/upload-source-doc.png
A docs/images/upload-translation-doc-dialog.png
A docs/images/upload-translation-doc.png
M docs/images/user-dashboard-create-version.png
A docs/images/user-dashboard-versions.png
A docs/images/user-dashboard-view.png
A docs/images/user-dashboard.png
A docs/images/user-profile.png
A docs/images/version-create-new.png
A docs/images/version-create.png
A docs/images/version-documents-settings.png
A docs/images/version-download-translations-all-dialog.png
A docs/images/version-download-translations-all.png
A docs/images/version-download-translations.png
A docs/images/version-general-settings.png
A docs/images/version-languages-settings.png
A docs/images/version-merge-trans-cancel.png
A docs/images/version-merge-trans-dialog.png
A docs/images/version-merge-trans-progress.png
A docs/images/version-more-action-menu.png
A docs/images/version-settings-button.png
A docs/images/version-translation-settings.png
A docs/images/version-view-languages.png
A docs/images/webtrans-access.png
M docs/index.md
M docs/release-notes.md
R docs/user-guide/Opening-a-Translation-Project.md
A docs/user-guide/account/account-activate.md
A docs/user-guide/account/account-resend-activation.md
A docs/user-guide/account/account-settings.md
A docs/user-guide/account/account-sign-up.md
A docs/user-guide/account/user-dashboard.md
A docs/user-guide/account/user-profile.md
A docs/user-guide/admin/admin-overview.md
A docs/user-guide/admin/contact-admin.md
A docs/user-guide/admin/role-assignment-rules.md
A docs/user-guide/api/api.md
R docs/user-guide/client-configuration.md
A docs/user-guide/client/client.md
R docs/user-guide/contributing-translations.md
A docs/user-guide/drupal/drupal.md
A docs/user-guide/editor/documents-view.md
A docs/user-guide/editor/editor-view.md
A docs/user-guide/editor/keyboard-shortcuts.md
A docs/user-guide/editor/overview.md
A docs/user-guide/editor/translation-history.md
A docs/user-guide/glossary/delete-glossaries.md
A docs/user-guide/glossary/edit-glossaries.md
A docs/user-guide/glossary/glossary-roles-permissions.md
A docs/user-guide/glossary/upload-glossaries.md
A docs/user-guide/groups/create-group.md
A docs/user-guide/groups/group-settings.md
A docs/user-guide/groups/group-view.md
R docs/user-guide/joining-a-language-team.md
R docs/user-guide/keyboard-shortcuts.md
A docs/user-guide/languages/add-team-member.md
A docs/user-guide/languages/language-team.md
A docs/user-guide/languages/modify-role.md
A docs/user-guide/project-maintainer-guide.md
R docs/user-guide/project-types.md
M docs/user-guide/projects/create-project.md
R docs/user-guide/projects/create-version.md
A docs/user-guide/projects/gettext-example.md
A docs/user-guide/projects/import-projects.md
A docs/user-guide/projects/podir-example.md
M docs/user-guide/projects/project-settings.md
A docs/user-guide/projects/project-types.md
A docs/user-guide/projects/project-view.md
R docs/user-guide/projects/upload-strings.md
A docs/user-guide/projects/validations.md
A docs/user-guide/review/add-reviewer.md
A docs/user-guide/review/overview.md
A docs/user-guide/review/review-enable.md
A docs/user-guide/review/translation-review.md
A docs/user-guide/system-admin/configuration/authentication.md
A docs/user-guide/system-admin/configuration/document-storage-directory.md
A docs/user-guide/system-admin/configuration/email.md
A docs/user-guide/system-admin/configuration/infinispan.md
A docs/user-guide/system-admin/configuration/installation.md
A docs/user-guide/system-admin/configuration/jms-messaging.md
A docs/user-guide/translation-reuse/copy-trans.md
A docs/user-guide/translation-reuse/copy-version.md
A docs/user-guide/translation-reuse/merge-trans.md
A docs/user-guide/translator-guide.md
R docs/user-guide/translators-new-account.md
A docs/user-guide/versions/create-version.md
A docs/user-guide/versions/download-translations.md
A docs/user-guide/versions/merge-translations.md
A docs/user-guide/versions/request-to-join-group.md
A docs/user-guide/versions/upload-strings.md
A docs/user-guide/versions/version-settings.md
A docs/user-guide/versions/version-view.md
M etc/scripts/cargowait.sh
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/CorePage.java
A functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
M functional-test/src/main/java/org/zanata/util/LanguageList.java
M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
A functional-test/src/test/java/org/zanata/feature/misc/FlakyTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
A functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
M functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
M functional-test/src/test/resources/log4j.xml
M mkdocs.yml
M pom.xml
A zanata-liquibase/pom.xml
A zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
A zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/model/HAccount.java
M zanata-model/src/main/java/org/zanata/model/HAccountRole.java
M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
A zanata-model/src/main/java/org/zanata/model/HasUserFriendlyToString.java
A zanata-model/src/test/java/org/zanata/model/validator/SlugValidatorTest.java
A zanata-model/src/test/java/org/zanata/model/validator/UrlValidatorTest.java
M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
A zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
M zanata-war/src/main/java/org/zanata/ZanataInit.java
M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
A zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
R zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
A zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
R zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
M zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
M zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
M zanata-war/src/main/java/org/zanata/action/validator/EmailListValidator.java
M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
A zanata-war/src/main/java/org/zanata/adapter/PropertiesAdapter.java
M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
R zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
M zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
A zanata-war/src/main/java/org/zanata/events/Logout.java
A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
A zanata-war/src/main/java/org/zanata/limits/RateLimiterToken.java
M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
M zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
R zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
A zanata-war/src/main/java/org/zanata/rest/InvalidApiKeyUtil.java
M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
M zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/GravatarService.java
A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
A zanata-war/src/main/java/org/zanata/ui/CopyAction.java
M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
A zanata-war/src/main/java/org/zanata/util/Event.java
A zanata-war/src/main/java/org/zanata/util/HttpUtil.java
A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptcha.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponse.java
R zanata-war/src/main/java/org/zanata/validation/PatchedCaptchaResponseValidator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
A zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
M zanata-war/src/main/resources/db/db.changelog.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_bg.properties
M zanata-war/src/main/resources/messages_br.properties
M zanata-war/src/main/resources/messages_cs.properties
M zanata-war/src/main/resources/messages_de.properties
M zanata-war/src/main/resources/messages_en_GB.properties
M zanata-war/src/main/resources/messages_eo.properties
M zanata-war/src/main/resources/messages_es_ES.properties
M zanata-war/src/main/resources/messages_fr.properties
M zanata-war/src/main/resources/messages_gu.properties
M zanata-war/src/main/resources/messages_hu.properties
M zanata-war/src/main/resources/messages_it.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_ko.properties
M zanata-war/src/main/resources/messages_nl.properties
M zanata-war/src/main/resources/messages_pt_BR.properties
M zanata-war/src/main/resources/messages_ru.properties
M zanata-war/src/main/resources/messages_tr.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
R zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/resources/pluralforms.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
R zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
A zanata-war/src/main/webapp/profile/home.xhtml
A zanata-war/src/main/webapp/profile/js/bundle.min.js
M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
R zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/ArquillianTest.java
M zanata-war/src/test/java/org/zanata/RestTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
A zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
M zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
M zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
A zanata-war/src/test/java/org/zanata/notification/DeadLetterQueueReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/EmailQueueMessageReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/ExpiryLetterQueueReceiverTest.java
A zanata-war/src/test/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandlerTest.java
A zanata-war/src/test/java/org/zanata/notification/MessageUnwrapperTest.java
A zanata-war/src/test/java/org/zanata/notification/NotificationManagerTest.java
M zanata-war/src/test/java/org/zanata/rest/ResourceRequest.java
M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
R zanata-war/src/test/java/org/zanata/rest/compat/AccountCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/compat/CompatibilityBase.java
R zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java
R zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
R zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/ProjectVersionServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/StatisticsServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/TextFlowServiceTest.java
A zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
R zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
R zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ProjectsServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
R zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
R zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
R zanata-war/src/test/java/org/zanata/rest/service/VersionRestTest.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/AsyncResourceRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/CopyTransRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRawRestITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRawRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectsRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationResourceRestTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
A zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
A zanata-war/src/test/java/org/zanata/util/EssentialDataCreatorTest.java
A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java
A zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java
M zanata-war/src/test/java/org/zanata/util/RawRestTestUtils.java
R zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into remove-seam-text
Conflicts:
zanata-war/src/main/java/org/zanata/action/ProjectHome.java
zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
Compare: https://github.com/zanata/zanata-server/compare/bce0a07210e7...d8234eb57b94
More information about the zanata-commits
mailing list