[zanata/zanata-server] e22728: Emulate CDI events with Seam Events
GitHub
noreply at github.com
Wed Apr 1 02:40:05 UTC 2015
Branch: refs/heads/zanata-assets-jar
Home: https://github.com/zanata/zanata-server
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: 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: 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: 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: 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: 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: 5070aa69dc2cd99121f11a673a25eb33027e68fb
https://github.com/zanata/zanata-server/commit/5070aa69dc2cd99121f11a673a25eb33027e68fb
Author: Alex Eng <aeng at redhat.com>
Date: 2015-04-01 (Wed, 01 Apr 2015)
Changed paths:
R CHANGELOG.md
M docs/configuration/installation.md
M docs/index.md
M docs/release-notes.md
A docs/user-guide/client-command-hook.md
M docs/user-guide/client-configuration.md
M docs/user-guide/project-types.md
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
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/HTextFlowTarget.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
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/LanguagesAction.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
M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.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/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
M zanata-war/src/main/java/org/zanata/notification/NotificationManager.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/ServerConfigurationService.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/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/ui/ActivityEntry.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
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/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/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-3.7.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/faces-config.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
M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.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/resources/zanata/activity-entry.xhtml
A zanata-war/src/main/webapp/resources/zanata/version-label.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/test/java/org/zanata/RestTest.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/TestFixture.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/TranslationsCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
A zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
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
A zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.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 branch 'integration/master' into zanata-assets-jar
Conflicts:
zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
Compare: https://github.com/zanata/zanata-server/compare/f28152e85693...5070aa69dc2c
More information about the zanata-commits
mailing list