[zanata/zanata-server] c1013a: Initialise SMTP server as late as possible
GitHub
noreply at github.com
Thu Feb 5 01:31:09 UTC 2015
Branch: refs/heads/rhbz1184299
Home: https://github.com/zanata/zanata-server
Commit: c1013ab796803b4d5a831b2ae0853b1f7398c1d0
https://github.com/zanata/zanata-server/commit/c1013ab796803b4d5a831b2ae0853b1f7398c1d0
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
Log Message:
-----------
Initialise SMTP server as late as possible
Otherwise it might be initialised in the Maven process rather
than the test process.
Commit: fbdf66756b86fe75c991bc48c52d5d7aa43fce6a
https://github.com/zanata/zanata-server/commit/fbdf66756b86fe75c991bc48c52d5d7aa43fce6a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
Log Message:
-----------
Count all outstanding AJAX requests
Commit: 478eae5c2c88d641b9ec8c9cc744200cdaf1532b
https://github.com/zanata/zanata-server/commit/478eae5c2c88d641b9ec8c9cc744200cdaf1532b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.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
Log Message:
-----------
Merge remote-tracking branch 'origin/fix-test-settings-tab' into functional-test-fixes
Commit: 49b364dc6c6fda846b69d8302621c2d915380f8e
https://github.com/zanata/zanata-server/commit/49b364dc6c6fda846b69d8302621c2d915380f8e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)
Changed paths:
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
Log Message:
-----------
Include descriptions in some timeout exceptions
Commit: 10969c060592cca3933ea982ae65dc5fa90b396f
https://github.com/zanata/zanata-server/commit/10969c060592cca3933ea982ae65dc5fa90b396f
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-01-23 (Fri, 23 Jan 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.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/projectversion/VersionBasePage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
Log Message:
-----------
Stabilise some tab related test functions
Commit: b11149002adf4e092d71b5136fecb721f42dab4e
https://github.com/zanata/zanata-server/commit/b11149002adf4e092d71b5136fecb721f42dab4e
Author: Damian Jansen <djansen at redhat.com>
Date: 2015-02-02 (Mon, 02 Feb 2015)
Changed paths:
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/projects/projectsettings/ProjectGeneralTab.java
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.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
Log Message:
-----------
Fix test element focus issues
In some cases, element.blur works more reliably than a page click
Commit: caee3adbe1e8e564743c97d7d2d44efa103f47b2
https://github.com/zanata/zanata-server/commit/caee3adbe1e8e564743c97d7d2d44efa103f47b2
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-02 (Mon, 02 Feb 2015)
Changed paths:
M functional-test/pom.xml
A functional-test/src/test/java/org/zanata/util/TestLogger.java
Log Message:
-----------
Add TestLogger so that we can see in the log which tests have run or failed
Commit: e81f45cb326ee4acde633edebba24a6285ecbb64
https://github.com/zanata/zanata-server/commit/e81f45cb326ee4acde633edebba24a6285ecbb64
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-02 (Mon, 02 Feb 2015)
Changed paths:
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/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
M functional-test/src/test/resources/conf/standalone.xml
M functional-test/src/test/resources/conf/standalone_wildfly.xml
A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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/app/index.html
Log Message:
-----------
Fix AJAX counter
Commit: 66636811a14783f7499cc31444369181169c8eaf
https://github.com/zanata/zanata-server/commit/66636811a14783f7499cc31444369181169c8eaf
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-02 (Mon, 02 Feb 2015)
Changed paths:
M functional-test/pom.xml
R functional-test/src/etc/wildflyModules.groovy
M pom.xml
M zanata-war/pom.xml
M zanata-war/src/test/resources/arquillian.xml
Log Message:
-----------
Fix and simplify config for Arquillian/functional tests
Default to BasicAcceptanceTestSuite, but add -DallFuncTests option,
also -DskipArqTests and -DskipFuncTests. Remove -Dfunctional-test.
Make -Dappserver=wildfly8 or -Dappserver=jbosseap6 container installation
logic consistent between zanata-war and functional-test modules.
Warn if required container properties not set.
Use same config (antrun) to install wildfly modules in both cases.
Ensure that build fails if no integration tests are found.
Generally reduce duplication of config where possible.
Commit: f9a01ff27bba2edac1ba1d8008cc1f4a72b85296
https://github.com/zanata/zanata-server/commit/f9a01ff27bba2edac1ba1d8008cc1f4a72b85296
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-02 (Mon, 02 Feb 2015)
Changed paths:
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
Log Message:
-----------
Attempt to fix intermittent test failure
Commit: 2c4f8ec240745b9ca7baac7b53168814e9e87046
https://github.com/zanata/zanata-server/commit/2c4f8ec240745b9ca7baac7b53168814e9e87046
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
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
Log Message:
-----------
Add JMS configuration to standalone.xml for Zanata overlay.
See: https://github.com/zanata/zanata-server/pull/679
Squashed commit of the following:
commit a420d1607d39d2b3c7d7c1d0efb10ed5e46a451f
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: Fri Jan 30 16:30:16 2015 +1000
Decrease the mysql driver version installed in the Zanata overlay.
commit f46fc54cb3c195363ee6d0e218e14f1a1111690a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: Fri Jan 30 15:45:15 2015 +1000
Add JMS configuration to standalone.xml
The necessary JMS configuration was missing from the overlay's standalone files.
Commit: 478d11e54247f93e456c0f94256dbc1ff1a3f22b
https://github.com/zanata/zanata-server/commit/478d11e54247f93e456c0f94256dbc1ff1a3f22b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M zanata-war/pom.xml
Log Message:
-----------
Fix warning from maven-dependency-plugin
Commit: 77455584f1a3e3e9ce0e50ded4cd64a93927fce9
https://github.com/zanata/zanata-server/commit/77455584f1a3e3e9ce0e50ded4cd64a93927fce9
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-war/pom.xml
A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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/app/index.html
M zanata-war/src/test/resources/arquillian.xml
Log Message:
-----------
Merge branch 'functional-test-fixes' into release
Commit: e4ad6db52d2036ea077d718deffb7e3df97864e3
https://github.com/zanata/zanata-server/commit/e4ad6db52d2036ea077d718deffb7e3df97864e3
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/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/projectversion/VersionBasePage.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/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-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-war/pom.xml
A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.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/app/index.html
M zanata-war/src/test/resources/arquillian.xml
Log Message:
-----------
Merge branch 'release' into integration/master
Conflicts:
zanata-war/pom.xml
Commit: a5790638aec3a4d4903f9a4c59801906af9a447d
https://github.com/zanata/zanata-server/commit/a5790638aec3a4d4903f9a4c59801906af9a447d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-04 (Wed, 04 Feb 2015)
Changed paths:
M pom.xml
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
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
Log Message:
-----------
Improve unit test coverage
Commit: b03c36c46ebc833875532747bc11af30f74ce3a1
https://github.com/zanata/zanata-server/commit/b03c36c46ebc833875532747bc11af30f74ce3a1
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-04 (Wed, 04 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
Log Message:
-----------
Add reason to Cobertura annotation
Commit: 6603f7cb6bd0bf5afed63c3a03b721cfd073ed48
https://github.com/zanata/zanata-server/commit/6603f7cb6bd0bf5afed63c3a03b721cfd073ed48
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-04 (Wed, 04 Feb 2015)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/resources/messages.properties
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/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
Log Message:
-----------
Fix reindex page and remove duplicate language page.
https://bugzilla.redhat.com/show_bug.cgi?id=1097464
Squashed commit of the following:
commit e31dc3331db8c77b6ca6e692fca77d7105c01ba5
Author: Alex Eng <aeng at redhat.com>
Date: Tue Feb 3 09:40:51 2015 +1000
remove duplicate language page
commit e5c47ab602ad26627efa5b85c4ec8a8db8f64b38
Author: Alex Eng <aeng at redhat.com>
Date: Mon Feb 2 17:14:39 2015 +1000
Fix reindex page: https://bugzilla.redhat.com/show_bug.cgi?id=1097464
Commit: b4b3c384afed9e220f996b648b0256bc4d2c6c92
https://github.com/zanata/zanata-server/commit/b4b3c384afed9e220f996b648b0256bc4d2c6c92
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2015-02-04 (Wed, 04 Feb 2015)
Changed paths:
M pom.xml
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
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
Log Message:
-----------
Merge pull request #682 from zanata/improve-coverage
Improve unit test coverage
Commit: 15bdc2efbdc65a9e06e54fdd5f6bae72f99e81b4
https://github.com/zanata/zanata-server/commit/15bdc2efbdc65a9e06e54fdd5f6bae72f99e81b4
Author: Alex Eng <aeng at redhat.com>
Date: 2015-02-05 (Thu, 05 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/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/projectversion/VersionBasePage.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/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-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-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
R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.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
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/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/index.html
M zanata-war/src/main/webapp/language/home.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 branch 'integration/master' into rhbz1184299
Conflicts:
zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
Compare: https://github.com/zanata/zanata-server/compare/ebd1d43ede7c...15bdc2efbdc6
More information about the zanata-commits
mailing list