[zanata/zanata-server] 473dee: Fix test failure
GitHub
noreply at github.com
Fri Jul 4 06:14:38 UTC 2014
Branch: refs/heads/rhbz1104015
Home: https://github.com/zanata/zanata-server
Commit: 473dee0abd699bc47465131dc88d0ea0206d0ee2
https://github.com/zanata/zanata-server/commit/473dee0abd699bc47465131dc88d0ea0206d0ee2
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
Log Message:
-----------
Fix test failure
Commit: fc476fe9dcdffda6c2f8fb936af8576198d12f28
https://github.com/zanata/zanata-server/commit/fc476fe9dcdffda6c2f8fb936af8576198d12f28
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Remove some unused messages
Commit: 7493d20825ac53c7ce26786c95e14cfe53fd73d7
https://github.com/zanata/zanata-server/commit/7493d20825ac53c7ce26786c95e14cfe53fd73d7
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/validator/NotDuplicateEmail.java
Log Message:
-----------
Fix property key
Commit: d4c0ab8fa1dd11ce74a90afa7adc345d1827b02f
https://github.com/zanata/zanata-server/commit/d4c0ab8fa1dd11ce74a90afa7adc345d1827b02f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
M zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
Log Message:
-----------
Alias zanataMessages to messages; implement Map
Commit: 38b4dd38b255185891a5959ef7a8226dbf5ac427
https://github.com/zanata/zanata-server/commit/38b4dd38b255185891a5959ef7a8226dbf5ac427
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/UserAction.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.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/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/create_user.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/search.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
Log Message:
-----------
Replace EL in messages.properties with positional parameters
Also switch ZanataMessages from Seam EL interpolation to
using java.text.MessageFormat.
Commit: 59f803e0ca6eac01304d1788c622f35144cbb5a9
https://github.com/zanata/zanata-server/commit/59f803e0ca6eac01304d1788c622f35144cbb5a9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
M zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
Log Message:
-----------
Move zanataMessages alias into ZanataMessages.Factory
Commit: 60e630b41d7ef7a9a5be08c7b3086f6b6173aa2b
https://github.com/zanata/zanata-server/commit/60e630b41d7ef7a9a5be08c7b3086f6b6173aa2b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.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/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.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/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.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
A zanata-war/src/main/java/org/zanata/i18n/Messages.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
R zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
R zanata-war/src/main/resources/messages_bg.properties
R zanata-war/src/main/resources/messages_de.properties
R zanata-war/src/main/resources/messages_en_GB.properties
R zanata-war/src/main/resources/messages_fr.properties
R zanata-war/src/main/resources/messages_gu.properties
R zanata-war/src/main/resources/messages_it.properties
R zanata-war/src/main/resources/messages_ja.properties
R zanata-war/src/main/resources/messages_ko.properties
R zanata-war/src/main/resources/messages_tr.properties
R zanata-war/src/main/resources/messages_uk.properties
R zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_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/dashboard/settings.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/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/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-group/edit_form.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/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-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
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/breadcrumbs.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/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
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/logout.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/account/validate_email.xhtml
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/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
M 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/dashboard/home.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M 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/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/create_user.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
M zanata-war/src/main/webapp/search.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/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Rename ZanataMessages to Messages, component name "msgs"
Commit: 486039396902d667cea240a397796d536a7cce78
https://github.com/zanata/zanata-server/commit/486039396902d667cea240a397796d536a7cce78
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/i18n/Messages.java
Log Message:
-----------
Update javadoc for Messages
Commit: cdff5422ffcb291689ea1ef79e01c1db80417e5b
https://github.com/zanata/zanata-server/commit/cdff5422ffcb291689ea1ef79e01c1db80417e5b
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.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/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.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/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.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/NotDuplicateEmail.java
A zanata-war/src/main/java/org/zanata/i18n/Messages.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
R zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/resources/messages_bg.properties
R zanata-war/src/main/resources/messages_de.properties
R zanata-war/src/main/resources/messages_en_GB.properties
R zanata-war/src/main/resources/messages_fr.properties
R zanata-war/src/main/resources/messages_gu.properties
R zanata-war/src/main/resources/messages_it.properties
R zanata-war/src/main/resources/messages_ja.properties
R zanata-war/src/main/resources/messages_ko.properties
R zanata-war/src/main/resources/messages_tr.properties
R zanata-war/src/main/resources/messages_uk.properties
R zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_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/dashboard/settings.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/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/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-group/edit_form.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/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-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
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/breadcrumbs.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/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
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/logout.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/account/validate_email.xhtml
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/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
M 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/dashboard/home.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M 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/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/create_user.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
M zanata-war/src/main/webapp/search.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/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M 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/arquillian/Deployments.java
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
Log Message:
-----------
Merge pull request #517 from zanata/zanata-messages
Zanata messages
Commit: 4ab73101f23a4656115d40988070064b71fb1006
https://github.com/zanata/zanata-server/commit/4ab73101f23a4656115d40988070064b71fb1006
Author: Alex Eng <aeng at redhat.com>
Date: 2014-07-04 (Fri, 04 Jul 2014)
Changed paths:
A ehcache.disk.store.dir/org.zanata.service.impl.VersionStateCacheImpl.versionStatisticCache.data
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.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/ProjectHomeAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.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/VersionGroupHome.java
M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.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/NotDuplicateEmail.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
A zanata-war/src/main/java/org/zanata/i18n/Messages.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
R zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
M zanata-war/src/main/resources/messages.properties
R zanata-war/src/main/resources/messages_bg.properties
R zanata-war/src/main/resources/messages_de.properties
R zanata-war/src/main/resources/messages_en_GB.properties
R zanata-war/src/main/resources/messages_fr.properties
R zanata-war/src/main/resources/messages_gu.properties
R zanata-war/src/main/resources/messages_it.properties
R zanata-war/src/main/resources/messages_ja.properties
R zanata-war/src/main/resources/messages_ko.properties
R zanata-war/src/main/resources/messages_tr.properties
R zanata-war/src/main/resources/messages_uk.properties
R zanata-war/src/main/resources/messages_zh_TW_Hant.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_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/dashboard/settings.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/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/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-group/edit_form.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/documents-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-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
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/breadcrumbs.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/template/template_nobanner.xhtml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
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/logout.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/account/validate_email.xhtml
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/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
M 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/dashboard/home.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M 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/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/create_user.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
M zanata-war/src/main/webapp/search.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/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M 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/arquillian/Deployments.java
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
Log Message:
-----------
Merge branch 'integration/master' into rhbz1104015
Conflicts:
zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
zanata-war/src/main/webapp/iteration/view.xhtml
zanata-war/src/main/webapp/project/add_iteration.xhtml
Compare: https://github.com/zanata/zanata-server/compare/4964f89e5ae8...4ab73101f23a
More information about the zanata-commits
mailing list