[zanata-commits] [zanata/zanata] 717722: Merge conflict from rhbz742111 to 1.4 branch
noreply at github.com
noreply at github.com
Wed Oct 5 08:04:16 UTC 2011
Branch: refs/heads/master
Home: https://github.com/zanata/zanata
Commit: 7177223ae357db198e27495d2db20ae2228de6f9
https://github.com/zanata/zanata/commit/7177223ae357db198e27495d2db20ae2228de6f9
Author: Alex Eng <aeng at redhat.com>
Date: 2011-10-02 (Sun, 02 Oct 2011)
Changed paths:
M server/zanata-war/src/main/resources/messages.properties
R server/zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
R server/zanata-war/src/main/webapp/WEB-INF/layout/project_view_inline.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
M server/zanata-war/src/main/webapp/language/home.xhtml
M server/zanata-war/src/main/webapp/profile/view.xhtml
M server/zanata-war/src/main/webapp/project/home.xhtml
M server/zanata-war/src/main/webapp/search.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
M server/zanata-war/src/main/webapp/stylesheet/zanata.css
Log Message:
-----------
Merge conflict from rhbz742111 to 1.4 branch
Commit: 823ed1a80b71390c3fb6e65de91f94a8499587d4
https://github.com/zanata/zanata/commit/823ed1a80b71390c3fb6e65de91f94a8499587d4
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-03 (Mon, 03 Oct 2011)
Changed paths:
M server/zanata-war/src/main/resources/messages.properties
R server/zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
R server/zanata-war/src/main/webapp/WEB-INF/layout/project_view_inline.xhtml
M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
M server/zanata-war/src/main/webapp/language/home.xhtml
M server/zanata-war/src/main/webapp/profile/view.xhtml
M server/zanata-war/src/main/webapp/project/home.xhtml
M server/zanata-war/src/main/webapp/search.xhtml
M server/zanata-war/src/main/webapp/stylesheet/theme.css
M server/zanata-war/src/main/webapp/stylesheet/zanata.css
Log Message:
-----------
Merge remote branch 'origin/1.4' into 1.4
Commit: 3d6fdb8c06ff5f007ec702651fc65708b13590c4
https://github.com/zanata/zanata/commit/3d6fdb8c06ff5f007ec702651fc65708b13590c4
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M server/zanata-war/pom.xml
Log Message:
-----------
Enable pretty GWT JavaScript when in draft mode
Commit: adbd503b8d5194ef33dd105895134b19c4f33d00
https://github.com/zanata/zanata/commit/adbd503b8d5194ef33dd105895134b19c4f33d00
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.java
R server/zanata-war/src/main/java/org/zanata/webtrans/client/FolderNode.java
R server/zanata-war/src/main/java/org/zanata/webtrans/client/Node.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
R server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectStatusCountHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AbstractWorkspaceAction.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCount.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCountResult.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEditingTranslationCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
R server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetProjectStatusCountCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java
Log Message:
-----------
WIP - reduce DocList memory usage
Commit: a597ed29ab8224bf7c9ce1803678243e51906ac1
https://github.com/zanata/zanata/commit/a597ed29ab8224bf7c9ce1803678243e51906ac1
Author: Alex Eng <aeng at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
R server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml
Log Message:
-----------
Removed documentNode as widget
Commit: 6d271921cf734283c2283b64062332f77e6e7db6
https://github.com/zanata/zanata/commit/6d271921cf734283c2283b64062332f77e6e7db6
Author: Alex Eng <aeng at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
Log Message:
-----------
Commit changed file
Commit: b4ec14bbd5d70bd7a90291935495efb11a2322cb
https://github.com/zanata/zanata/commit/b4ec14bbd5d70bd7a90291935495efb11a2322cb
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M .gitignore
M server/zanata-war/pom.xml
Log Message:
-----------
Add GWT output dirs to .gitignore and mvn clean
Commit: 4a6d936598dd788fe11ad24563baa86160d43133
https://github.com/zanata/zanata/commit/4a6d936598dd788fe11ad24563baa86160d43133
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
Log Message:
-----------
Return documents in a project iteration sorted by path, name
Commit: 288ab772dea4e168b72ea91bf728cf6933b69f73
https://github.com/zanata/zanata/commit/288ab772dea4e168b72ea91bf728cf6933b69f73
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/AppView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
Log Message:
-----------
Avoid registering each DocumentNode with the event bus
Commit: dc30139b47f0c69e0920ce7cc8d9e56e5baf5198
https://github.com/zanata/zanata/commit/dc30139b47f0c69e0920ce7cc8d9e56e5baf5198
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M .gitignore
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M server/zanata-war/pom.xml
M server/zanata-war/src/main/java/org/zanata/webtrans/client/AppView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.java
R server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml
R server/zanata-war/src/main/java/org/zanata/webtrans/client/FolderNode.java
R server/zanata-war/src/main/java/org/zanata/webtrans/client/Node.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
R server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectStatusCountHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AbstractWorkspaceAction.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCount.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCountResult.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEditingTranslationCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
R server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetProjectStatusCountCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java
Log Message:
-----------
Merge branch 'rhbz743179' into 1.4
Commit: 9f48ba2ccaf2bd8a9b4e5bb0b2ca07f6006b9648
https://github.com/zanata/zanata/commit/9f48ba2ccaf2bd8a9b4e5bb0b2ca07f6006b9648
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M client/pom.xml
M client/zanata-adapter-po/pom.xml
M client/zanata-adapter-properties/pom.xml
M client/zanata-adapter-xliff/pom.xml
M client/zanata-client-ant-po/pom.xml
M client/zanata-client-ant-properties/pom.xml
M client/zanata-client-commands/pom.xml
M client/zanata-maven-plugin/pom.xml
M common/pom.xml
M common/zanata-common-api/pom.xml
M common/zanata-common-util/pom.xml
M common/zanata-rest-client/pom.xml
M pom.xml
M server/pom.xml
M server/zanata-model/pom.xml
M server/zanata-war/pom.xml
M zanata-parent/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release zanata-1.4.1
Commit: 566146a8c9c1e36f8d342955d6f8079790733d17
https://github.com/zanata/zanata/commit/566146a8c9c1e36f8d342955d6f8079790733d17
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M client/pom.xml
M client/zanata-adapter-po/pom.xml
M client/zanata-adapter-properties/pom.xml
M client/zanata-adapter-xliff/pom.xml
M client/zanata-client-ant-po/pom.xml
M client/zanata-client-ant-properties/pom.xml
M client/zanata-client-commands/pom.xml
M client/zanata-maven-plugin/pom.xml
M common/pom.xml
M common/zanata-common-api/pom.xml
M common/zanata-common-util/pom.xml
M common/zanata-rest-client/pom.xml
M pom.xml
M server/pom.xml
M server/zanata-model/pom.xml
M server/zanata-war/pom.xml
M zanata-parent/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: 4e1d7a17d81782011f023ec055a19045a934a1ba
https://github.com/zanata/zanata/commit/4e1d7a17d81782011f023ec055a19045a934a1ba
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-04 (Tue, 04 Oct 2011)
Changed paths:
M CHANGELOG.md
Log Message:
-----------
Update changelog for Zanata 1.4.1
Commit: c0829ee16d231967873585b47d8dc9b7d49201de
https://github.com/zanata/zanata/commit/c0829ee16d231967873585b47d8dc9b7d49201de
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-05 (Wed, 05 Oct 2011)
Changed paths:
M .gitignore
M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M server/zanata-war/pom.xml
M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEvent.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.ui.xml
R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/FolderNode.java
R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/FolderNode.ui.xml
R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Node.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.ui.xml
M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
R server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectStatusCountHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AbstractWorkspaceAction.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCount.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCountResult.java
M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEditingTranslationCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
R server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetProjectStatusCountCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java
M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java
Log Message:
-----------
Merge branch 'rhbz743179'
Conflicts:
server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.ui.xml
server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/FolderNode.java
server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Node.java
server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
Commit: 161537f466314773c3e7572ca815864973b6046f
https://github.com/zanata/zanata/commit/161537f466314773c3e7572ca815864973b6046f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2011-10-05 (Wed, 05 Oct 2011)
Changed paths:
M CHANGELOG.md
Log Message:
-----------
Merge branch '1.4'
Conflicts:
client/pom.xml
client/zanata-adapter-po/pom.xml
client/zanata-adapter-properties/pom.xml
client/zanata-adapter-xliff/pom.xml
client/zanata-client-ant-po/pom.xml
client/zanata-client-ant-properties/pom.xml
client/zanata-client-commands/pom.xml
client/zanata-maven-plugin/pom.xml
common/pom.xml
common/zanata-common-api/pom.xml
common/zanata-common-util/pom.xml
common/zanata-rest-client/pom.xml
pom.xml
server/pom.xml
server/zanata-model/pom.xml
server/zanata-war/pom.xml
zanata-parent/pom.xml
Compare: https://github.com/zanata/zanata/compare/da158a0...161537f
More information about the zanata-commits
mailing list