[zanata/zanata-server] e19ec8: Create entities for Translation memory.
GitHub
noreply at github.com
Thu Aug 8 04:14:39 UTC 2013
Branch: refs/heads/master
Home: https://github.com/zanata/zanata-server
Commit: e19ec834e9faaf9a037716631d1387835ca715a1
https://github.com/zanata/zanata-server/commit/e19ec834e9faaf9a037716631d1387835ca715a1
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)
Changed paths:
A zanata-model/src/main/java/org/zanata/model/HasSlug.java
A zanata-model/src/main/java/org/zanata/model/SlugContainer.java
A zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
A zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
A zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
A zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/db/db.changelog.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
A zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Create entities for Translation memory.
Also add a mixin-like strategy for hibernate entities.
Commit: 872bf9d0c74fe00148d26d8f70fddcd01afd9505
https://github.com/zanata/zanata-server/commit/872bf9d0c74fe00148d26d8f70fddcd01afd9505
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)
Changed paths:
M functional-test/pom.xml
R functional-test/src/test/resources/as7module/zanata/module.xml
M functional-test/src/test/resources/conf/standalone.xml
R functional-test/src/test/resources/conf/zanata.properties
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateDataToHCredentials.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
A zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
M zanata-war/src/main/java/org/zanata/security/ZanataCentralLoginModule.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
R zanata-war/src/main/java/org/zanata/util/ZanataBasicConfig.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.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/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
A zanata-war/src/test/java/org/zanata/rest/service/VirusScannerTest.java
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata into tm-import
Commit: d8b47890eab1f7b09bada0b67a18a6a1d089e155
https://github.com/zanata/zanata-server/commit/d8b47890eab1f7b09bada0b67a18a6a1d089e155
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
R zanata-model/src/main/java/org/zanata/model/HasSlug.java
A zanata-model/src/main/java/org/zanata/model/HasStatus.java
R zanata-model/src/main/java/org/zanata/model/SlugContainer.java
M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
Log Message:
-----------
Finish TransMemory object mappings.
Move the entity status outside the SlugEntityBase entity and into the specific classes that use it. Add an interface HasStatus in its place.
Commit: 20b8d7afe2a7d09561d79f24cd19fef3a1c60ec0
https://github.com/zanata/zanata-server/commit/20b8d7afe2a7d09561d79f24cd19fef3a1c60ec0
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
A zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
A zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
A zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Initial revision of a TMX parser.
Commit: d54d12d821b3d00600fae6d542927ef4fc5cb177
https://github.com/zanata/zanata-server/commit/d54d12d821b3d00600fae6d542927ef4fc5cb177
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
Log Message:
-----------
Add metadata to the Translation Memory entities.
Commit: 5317a11c0465fa365a88fb103824311142d5bc45
https://github.com/zanata/zanata-server/commit/5317a11c0465fa365a88fb103824311142d5bc45
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-09 (Tue, 09 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
Log Message:
-----------
Fix SlugEntityBaseTest
Commit: 02bbea7391b2188ae1ad9749671ffeb97f09c441
https://github.com/zanata/zanata-server/commit/02bbea7391b2188ae1ad9749671ffeb97f09c441
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-09 (Tue, 09 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Commit: 102325c4cb24b8189a728376a6abfc28036726fd
https://github.com/zanata/zanata-server/commit/102325c4cb24b8189a728376a6abfc28036726fd
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2013-07-09 (Tue, 09 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
Log Message:
-----------
Add plain text content field to Trans unit variants/
This is to make sure we can store and index a plain text version of the possibly formatted tmx segment string.
Commit: 4313e1ebd607ee59897f8ea16d57ea332fb905ba
https://github.com/zanata/zanata-server/commit/4313e1ebd607ee59897f8ea16d57ea332fb905ba
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
A zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
R zanata-war/src/test/resources/org/zanata/tmx14.dtd
Log Message:
-----------
Move TMX DTD
Commit: 452292d588b55dba6f66e8b80e8604c44337f6df
https://github.com/zanata/zanata-server/commit/452292d588b55dba6f66e8b80e8604c44337f6df
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
Changed paths:
M pom.xml
M zanata-war/pom.xml
Log Message:
-----------
Update to latest parent pom and add xom dependency
Commit: 08e23c34622bcee76dec10313663e9fc3cabcd89
https://github.com/zanata/zanata-server/commit/08e23c34622bcee76dec10313663e9fc3cabcd89
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
Log Message:
-----------
Allow creationDate and lastChanged to be set explicitly
Commit: 0da99d6b5e7aa80c1f3ecddaf5eadb4ee780982c
https://github.com/zanata/zanata-server/commit/0da99d6b5e7aa80c1f3ecddaf5eadb4ee780982c
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
A zanata-war/src/main/webapp/tm/create.xhtml
A zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Add Rest service and draft web pages to upload translation memories.
Commit: 8e2de9642b527fe60829a40f7a861e77dcd1ed48
https://github.com/zanata/zanata-server/commit/8e2de9642b527fe60829a40f7a861e77dcd1ed48
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/tm-import' into tm-import
Conflicts:
zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
Commit: 4329ae39717748e9de6890ee1b7d508d43baab92
https://github.com/zanata/zanata-server/commit/4329ae39717748e9de6890ee1b7d508d43baab92
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
Log Message:
-----------
Use lombok's @Data instead of @Setter and @Getter.
Reduce the size of our entity code even further.
Commit: 869f0c3630eb7543a033fd654a7feeba1a739a17
https://github.com/zanata/zanata-server/commit/869f0c3630eb7543a033fd654a7feeba1a739a17
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M pom.xml
A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/pom.xml
A zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
R zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Switch TMXParser to ElementBuilder; Change TM metadata to use Json
Commit: cf34ad4c102e9a29f141675880e0af761f41735b
https://github.com/zanata/zanata-server/commit/cf34ad4c102e9a29f141675880e0af761f41735b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/messages.properties
A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
A zanata-war/src/main/webapp/tm/create.xhtml
A zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Conflicts:
zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
Commit: 475e13cf75aa9b24c1a5cea83fb87f60f0b09817
https://github.com/zanata/zanata-server/commit/475e13cf75aa9b24c1a5cea83fb87f60f0b09817
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/pom.xml
A zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
R zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
A zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
R zanata-war/src/test/resources/org/zanata/tmx14.dtd
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Conflicts:
zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
Commit: b91f789236997c759fd88f81c8ee8168ed18f771
https://github.com/zanata/zanata-server/commit/b91f789236997c759fd88f81c8ee8168ed18f771
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
Log Message:
-----------
Correct tests and change UI messages.
Commit: d12578e212b8c492405a12c84d538d30da7b43b2
https://github.com/zanata/zanata-server/commit/d12578e212b8c492405a12c84d538d30da7b43b2
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
Log Message:
-----------
Fix compilation error
Commit: 9760474a27ecec86f6fedacf7b0d425762212c1d
https://github.com/zanata/zanata-server/commit/9760474a27ecec86f6fedacf7b0d425762212c1d
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
A zanata-war/src/main/java/org/zanata/tmx/TransUnitPersister.java
Log Message:
-----------
Extract TransUnitPersister
Commit: 63695e26e3ee9d165180817f87ef4b29c7943663
https://github.com/zanata/zanata-server/commit/63695e26e3ee9d165180817f87ef4b29c7943663
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
R zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Finish TM persistence from an imported file.
Rename Trans Memory rest service to include the word 'Resource' (in line with our other rest services).
Commit: 683faa22cb1a4007aae0b43840dc83914f9be776
https://github.com/zanata/zanata-server/commit/683faa22cb1a4007aae0b43840dc83914f9be776
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths:
M zanata-model/pom.xml
A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
R zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
R zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
M zanata-war/src/main/java/org/zanata/tmx/TransUnitPersister.java
Log Message:
-----------
Move all knowledge of the storage model for TMX attributes into TMXMetadataHelper
Commit: 83ad8d9a456e71e80d5c015a387adb1ed7dbaa7e
https://github.com/zanata/zanata-server/commit/83ad8d9a456e71e80d5c015a387adb1ed7dbaa7e
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M zanata-model/pom.xml
A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
R zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
R zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
A zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
A zanata-war/src/test/resources/tmx/invalid-tmx-no-discernible-srclang.xml
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Conflicts:
zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
Commit: 3c24f9848af4fe836d3d4adc680a1afee6942cf4
https://github.com/zanata/zanata-server/commit/3c24f9848af4fe836d3d4adc680a1afee6942cf4
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
Log Message:
-----------
TMX Upload working from web.
Also refactor the hibernate mappings for some of the TM related entities.
Commit: 7348ca386da321325700f8192508c53982b6ea63
https://github.com/zanata/zanata-server/commit/7348ca386da321325700f8192508c53982b6ea63
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/dashboard/home.xhtml
Log Message:
-----------
work in progress: dashboard
Commit: 934fc68bc7998e2b177c66ad7e2fb87d59210178
https://github.com/zanata/zanata-server/commit/934fc68bc7998e2b177c66ad7e2fb87d59210178
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
A zanata-war/src/main/webapp/WEB-INF/layout/templateV3.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
Log Message:
-----------
Work in progress: creating new template for dashboard
Commit: 7892bbddeb9549d54eac3a8839a3ba98c736d12a
https://github.com/zanata/zanata-server/commit/7892bbddeb9549d54eac3a8839a3ba98c736d12a
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/templateV3.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
Log Message:
-----------
Work in progress
Commit: cb3811cbd2df35f7897f88bbc9b855509d75eb95
https://github.com/zanata/zanata-server/commit/cb3811cbd2df35f7897f88bbc9b855509d75eb95
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Refactor TM model.
Trans unit variants are now independent for each Translation unit.
Block the UI while an upload is going on.
Add a "clear" option to clear all the contents of a Translation memory.
Commit: 64b72e8d6fb9df000bc483f9e6f92b5693275faa
https://github.com/zanata/zanata-server/commit/64b72e8d6fb9df000bc483f9e6f92b5693275faa
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_ja.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/WEB-INF/layout/menu.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/templateV3.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/template_v1.xhtml
A zanata-war/src/main/webapp/WEB-INF/menu/banner.xhtml
A zanata-war/src/main/webapp/WEB-INF/menu/left_menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/menu/right_menu.xhtml
M zanata-war/src/main/webapp/account/logout.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
Log Message:
-----------
Work in progress: dashboard - activities
Commit: e134a5f44313f323c267173a7553f7a445166c72
https://github.com/zanata/zanata-server/commit/e134a5f44313f323c267173a7553f7a445166c72
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
A zanata-war/src/test/resources/tmx/default-valid-tm.tmx
A zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx
Log Message:
-----------
Merge existing TUs when importing a TMX file.
This means that existing TUs will be replaced with new ones as long as their unique id is the same. Otherwise, the new TUs will just get appended to the existing ones.
Add smaller tmx test files.
Commit: f223bce8b1646926cf6412aef281fa7fa99922dd
https://github.com/zanata/zanata-server/commit/f223bce8b1646926cf6412aef281fa7fa99922dd
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
A zanata-war/src/main/webapp/WEB-INF/layout/piwik.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/template_v1.xhtml
M zanata-war/src/main/webapp/WEB-INF/menu/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/menu/left_menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/menu/right_menu.xhtml
Log Message:
-----------
Work in progress: extract piwik, assign id for links
Commit: f564263443753f47e5a37de63fec6eb23b27f9bb
https://github.com/zanata/zanata-server/commit/f564263443753f47e5a37de63fec6eb23b27f9bb
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/template_v1.xhtml
Log Message:
-----------
Change fav icon
Commit: dfa54e6c78b8c42c40d2e4622437b0236c1474b7
https://github.com/zanata/zanata-server/commit/dfa54e6c78b8c42c40d2e4622437b0236c1474b7
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/piwik.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/template_v1.xhtml
R zanata-war/src/main/webapp/WEB-INF/menu/banner.xhtml
R zanata-war/src/main/webapp/WEB-INF/menu/left_menu.xhtml
R zanata-war/src/main/webapp/WEB-INF/menu/right_menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
Log Message:
-----------
Move templates files into template folder
Commit: c1a6b3d0f47f363b83a73072a235985e431836e0
https://github.com/zanata/zanata-server/commit/c1a6b3d0f47f363b83a73072a235985e431836e0
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/login_input.xhtml
M zanata-war/src/main/webapp/account/logout.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/processmanager.xhtml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
M zanata-war/src/main/webapp/admin/rolerules.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/admin/stats.xhtml
M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/edit.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/source_files.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/add_identity.xhtml
M zanata-war/src/main/webapp/profile/edit.xhtml
M zanata-war/src/main/webapp/profile/identities.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/edit.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/search.xhtml
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Move templates files into template folder
Commit: dd62c7af818d97d6fa21e80c31f1df5828ef8495
https://github.com/zanata/zanata-server/commit/dd62c7af818d97d6fa21e80c31f1df5828ef8495
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
Log Message:
-----------
Work in progress: new css
Commit: ca3d002a694d4f58014b1bbf1fae7d8cd27aee95
https://github.com/zanata/zanata-server/commit/ca3d002a694d4f58014b1bbf1fae7d8cd27aee95
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.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/dashboard/home.xhtml
Log Message:
-----------
Work in progress: dashboard
Commit: 115aa79e6cadb0f6af29f63aa7fd59ded7fd8785
https://github.com/zanata/zanata-server/commit/115aa79e6cadb0f6af29f63aa7fd59ded7fd8785
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
A zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
Log Message:
-----------
Work in progress: dashboard-maintainedProjects
Commit: 250c8c030f65c4cf2ee54cbf0a8c171619a06d2a
https://github.com/zanata/zanata-server/commit/250c8c030f65c4cf2ee54cbf0a8c171619a06d2a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kcmmemory.png
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Add security to new Translation Memory Rest services.
Fix some UI issues.
Commit: 4d1bc992d652d66eff9114319420b80a89d4c743
https://github.com/zanata/zanata-server/commit/4d1bc992d652d66eff9114319420b80a89d4c743
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
Log Message:
-----------
Implement redirection to dashboard when logged in, maintained projects in dashboard, and new css template for all pages
Commit: d2e2c56efe15d3b45c039010996cf009579d0cee
https://github.com/zanata/zanata-server/commit/d2e2c56efe15d3b45c039010996cf009579d0cee
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
Log Message:
-----------
Change favicon
Commit: fc53a02a1fb953e488086c3f20e765b70d2a8288
https://github.com/zanata/zanata-server/commit/fc53a02a1fb953e488086c3f20e765b70d2a8288
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
R zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
Log Message:
-----------
Work in progress: new style for editor
Commit: 7573ad7b39eeb5fab7422a95f77f8610f0db7a1f
https://github.com/zanata/zanata-server/commit/7573ad7b39eeb5fab7422a95f77f8610f0db7a1f
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
M zanata-war/pom.xml
R zanata-war/src/etc/jboss-service-snippet.xml
A zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
A zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
A zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentDataProvider.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistorySelectionModel.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
R zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ContentStateRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ListItemWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UnorderedListWidget.java
R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentDisplay.java
R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.java
R zanata-war/src/main/java/org/zanata/webtrans/client/view/ReviewCommentView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
R zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ComparableByDate.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsAction.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetReviewCommentsResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationHistoryResult.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ReviewCommentPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparatorTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetReviewCommentsHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Conflicts:
zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
Commit: 21e18195a1cd04c5341c391558898a96f158888f
https://github.com/zanata/zanata-server/commit/21e18195a1cd04c5341c391558898a96f158888f
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
Log Message:
-----------
Add in missing tag for application xhtml
Commit: a3b82381da490891e9b0fc87eac97a8fec878dc1
https://github.com/zanata/zanata-server/commit/a3b82381da490891e9b0fc87eac97a8fec878dc1
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
Log Message:
-----------
link color etc in standard.css
Commit: 3ee0e5f200fa345c11a792e225356c2839caa4a9
https://github.com/zanata/zanata-server/commit/3ee0e5f200fa345c11a792e225356c2839caa4a9
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
Log Message:
-----------
Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard
# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
Add in missing tag for application xhtml
Commit: e3e51e6bee8fa18b50a417b283af99d43a374bca
https://github.com/zanata/zanata-server/commit/e3e51e6bee8fa18b50a417b283af99d43a374bca
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
Log Message:
-----------
Fix up dropdown in dashboard, include jquery and javascript for menu
Commit: 150d9a280793e4c6c984f585a319323c17982691
https://github.com/zanata/zanata-server/commit/150d9a280793e4c6c984f585a319323c17982691
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
Log Message:
-----------
Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard
# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
Fix up dropdown in dashboard, include jquery and javascript for menu
Commit: f8eb6a9b0d4cb18567927d3fb7fa54eea910d1d3
https://github.com/zanata/zanata-server/commit/f8eb6a9b0d4cb18567927d3fb7fa54eea910d1d3
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
Log Message:
-----------
Remove zanata.css
Commit: e26a10dbf3de3e541eab304dc2c75b35dfe5a731
https://github.com/zanata/zanata-server/commit/e26a10dbf3de3e541eab304dc2c75b35dfe5a731
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M pom.xml
Log Message:
-----------
Exclude xml-apis
Commit: f018dcd8747e749b19b38b925860a523f070b45f
https://github.com/zanata/zanata-server/commit/f018dcd8747e749b19b38b925860a523f070b45f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-21 (Sun, 21 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Fix path for TMX DTD
Commit: 851f5ee9439ca2ea238b549499690801ad301ba3
https://github.com/zanata/zanata-server/commit/851f5ee9439ca2ea238b549499690801ad301ba3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Partially implement getTranslationMemory (WIP)
Commit: bc60a13a78414aa18be8d2b25f802b25c999fdaf
https://github.com/zanata/zanata-server/commit/bc60a13a78414aa18be8d2b25f802b25c999fdaf
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M functional-test/pom.xml
M functional-test/sample-projects/glossary/pom.xml
M functional-test/sample-projects/plural/pom.xml
M functional-test/src/main/java/org/zanata/page/HomePage.java
M functional-test/src/main/java/org/zanata/page/SignInPage.java
M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
A functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
A functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
A functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
A functional-test/src/test/java/org/zanata/feature/DetailedTest.java
A functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
A functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
M functional-test/src/test/resources/create_translator_user.sql
M functional-test/src/test/resources/setup.properties
M pom.xml
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
M zanata-model/src/main/java/org/zanata/model/SourceContents.java
M zanata-war/eclipse/eclipse-code-formatter-profile.xml
M zanata-war/pom.xml
R zanata-war/src/etc/jboss-service-snippet.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
A zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.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/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
A zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
A zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
A zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
A zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
A zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
A zanata-war/src/main/java/org/zanata/database/StreamingResultSetSQLException.java
A zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
A zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
A zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
A zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
A zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
A zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
M zanata-war/src/main/java/org/zanata/service/EmailService.java
M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
M zanata-war/src/main/java/org/zanata/service/SecurityService.java
M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
A zanata-war/src/main/java/org/zanata/util/NullCloseable.java
M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEvent.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEventHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistorySelectionModel.java
R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
R zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ContentStateRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ListItemWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UnorderedListWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.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/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.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/RunDocValidationHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ComparableByDate.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewCommentId.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationHistoryResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
R zanata-war/src/main/resources-dev/components.properties
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_ja.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/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/resources/security.drl
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.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/register.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
R zanata-war/src/main/webapp/language/request_to_join.xhtml
A zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/resources/css/zanata.css
M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
R zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
A zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
A zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
R zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
R zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
R zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
R zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparatorTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml
Log Message:
-----------
Merge remote branch 'origin/master' into tm-import
Conflicts:
pom.xml
zanata-model/pom.xml
zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
zanata-war/src/main/webapp/WEB-INF/pages.xml
zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
Commit: 4a8aaf1ef46e94c306b4a3fb46fb3a4e1171ea18
https://github.com/zanata/zanata-server/commit/4a8aaf1ef46e94c306b4a3fb46fb3a4e1171ea18
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
Log Message:
-----------
Fix compilation problem
Commit: e612c087a6a6a802ede79ea199a7361259821cc3
https://github.com/zanata/zanata-server/commit/e612c087a6a6a802ede79ea199a7361259821cc3
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
Log Message:
-----------
Cache projectVersion and project
Commit: 3b436b36094f17e8fc676fa9bdacf4ca1e18b0ab
https://github.com/zanata/zanata-server/commit/3b436b36094f17e8fc676fa9bdacf4ca1e18b0ab
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
A zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Split ExportTUStrategy into three classes; implement ExportTransUnitStrategy
Commit: 8353af8dfed430b29941ec235b3b0667a52cc0ae
https://github.com/zanata/zanata-server/commit/8353af8dfed430b29941ec235b3b0667a52cc0ae
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
Log Message:
-----------
Fixing usericon in header
Commit: 01032e7ac47f36a7e5c177bb8d64e3fdc010cc67
https://github.com/zanata/zanata-server/commit/01032e7ac47f36a7e5c177bb8d64e3fdc010cc67
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
Log Message:
-----------
handle no maintained project list
Commit: 4b0a381397076130e144aa50979e4bdf078e0052
https://github.com/zanata/zanata-server/commit/4b0a381397076130e144aa50979e4bdf078e0052
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
Log Message:
-----------
implement readonly, obsolete on dashboard
Commit: 53e80e078948089a5f6d56f0d8e43e807c1b2646
https://github.com/zanata/zanata-server/commit/53e80e078948089a5f6d56f0d8e43e807c1b2646
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.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/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
M zanata-war/src/test/resources/arquillian/components.properties
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Conflicts:
zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
Commit: 9759967e1d30daa2309b4f587a2c7266113f4333
https://github.com/zanata/zanata-server/commit/9759967e1d30daa2309b4f587a2c7266113f4333
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
Log Message:
-----------
Add Search Indexing to Translation Unit variants.
Also fix the removal of TM contents. Have manually remove each TU from the trans memory because the hibernate relationship is being managed on the TU side. This causes orphan removal to effectively not work.
Commit: def26df606855e22bcd799e759f4f518b4624ac3
https://github.com/zanata/zanata-server/commit/def26df606855e22bcd799e759f4f518b4624ac3
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
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/left_menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
Log Message:
-----------
Add id's to menus for active links to be tracked
Commit: e884845772179ca027448c84b24bfb2a363c7c55
https://github.com/zanata/zanata-server/commit/e884845772179ca027448c84b24bfb2a363c7c55
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
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/left_menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
Log Message:
-----------
Why did I put hashes on them?
Commit: 8cfa49a8d5755f605f6a19249b327574b88ec065
https://github.com/zanata/zanata-server/commit/8cfa49a8d5755f605f6a19249b327574b88ec065
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
Log Message:
-----------
Add admin,glossary link
Commit: 48b730487e662a88101709118c57b23e07d38913
https://github.com/zanata/zanata-server/commit/48b730487e662a88101709118c57b23e07d38913
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-24 (Wed, 24 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
A zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
A zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
A zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Split ExportTUStrategy into three classes; implement ExportTransUnitStrategy
Commit: 8180b76c41bc70f8c236fe2e217e2668ac1e22b3
https://github.com/zanata/zanata-server/commit/8180b76c41bc70f8c236fe2e217e2668ac1e22b3
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
R zanata-war/src/main/webapp/resources/css/zanata.css
Log Message:
-----------
A bunch of css (interna; gwt) changes to fix the editor UI.
Commit: c060f7a42a4074d1900ba0d201b50bc19f92637a
https://github.com/zanata/zanata-server/commit/c060f7a42a4074d1900ba0d201b50bc19f92637a
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
Log Message:
-----------
Merge branches 'dashboard' and 'dashboard' of https://github.com/zanata/zanata-server into dashboard
# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
Add admin,glossary link
# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
Add admin,glossary link
Commit: bac8e2d60d08989bae6815b718c9fddf31683b69
https://github.com/zanata/zanata-server/commit/bac8e2d60d08989bae6815b718c9fddf31683b69
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
A functional-test/src/main/java/org/zanata/page/BasePage.java
R functional-test/src/main/java/org/zanata/page/HomePage.java
R functional-test/src/main/java/org/zanata/page/SignInPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
A zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/HasEntityType.java
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
A zanata-war/src/main/java/org/zanata/service/ActivityService.java
A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/util/DateUtil.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Commit: e1d99748d82eca577368036283ddcec6c0cf7847
https://github.com/zanata/zanata-server/commit/e1d99748d82eca577368036283ddcec6c0cf7847
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
A zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/service/ActivityService.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
R zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/login_input.xhtml
M zanata-war/src/main/webapp/account/logout.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/processmanager.xhtml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
M zanata-war/src/main/webapp/admin/rolerules.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/admin/stats.xhtml
M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
A zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
R zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/edit.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/source_files.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/add_identity.xhtml
M zanata-war/src/main/webapp/profile/edit.xhtml
M zanata-war/src/main/webapp/profile/identities.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/edit.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/search.xhtml
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
Log Message:
-----------
Work in progress:
Rename template.xhtml to template_old.xhtml, template_v1.xhtml to template.xhtml. Preparing activities column in dashboard with message builder.
Commit: 6678d08c0d49d7ba9eb357e89933d3f4585a3fe1
https://github.com/zanata/zanata-server/commit/6678d08c0d49d7ba9eb357e89933d3f4585a3fe1
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
Log Message:
-----------
Work in progress: implementing activity in dashboard
Commit: 2cd4c4b734c53bc8c85e2313b8a1553c6ce92d3c
https://github.com/zanata/zanata-server/commit/2cd4c4b734c53bc8c85e2313b8a1553c6ce92d3c
Author: Patrick Huang <pahuang at redhat.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
A zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/HasEntityType.java
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/service/ActivityService.java
A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/util/DateUtil.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Revert "Revert "Merge pull request #72 from zanata/activityLog""
This reverts commit 73b0323fbe7acd1accccfae7e67e6a75ad92910f.
Commit: 4c9005bad88c06dd0a18baeed722e5311f73af75
https://github.com/zanata/zanata-server/commit/4c9005bad88c06dd0a18baeed722e5311f73af75
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
Log Message:
-----------
Ui fixes, mostly colour
Commit: 08a33c87f10b7fede51b0cd10d80dc941a5b4a8c
https://github.com/zanata/zanata-server/commit/08a33c87f10b7fede51b0cd10d80dc941a5b4a8c
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
A functional-test/src/main/java/org/zanata/page/BasePage.java
R functional-test/src/main/java/org/zanata/page/HomePage.java
R functional-test/src/main/java/org/zanata/page/SignInPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
A zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/HasEntityType.java
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
M zanata-war/pom.xml
A zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
A zanata-war/src/main/java/org/zanata/service/ActivityService.java
A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/util/DateUtil.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
R zanata-war/src/main/webapp/WEB-INF/template/template_v1.xhtml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/login_input.xhtml
M zanata-war/src/main/webapp/account/logout.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/processmanager.xhtml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
M zanata-war/src/main/webapp/admin/rolerules.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/admin/stats.xhtml
M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
A zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
R zanata-war/src/main/webapp/dashboard/maintainedProjectTab.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/edit.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/source_files.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/add_identity.xhtml
M zanata-war/src/main/webapp/profile/edit.xhtml
M zanata-war/src/main/webapp/profile/identities.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/edit.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/search.xhtml
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard
# By Alex Eng (17) and others
# Via Alex Eng (5) and others
* 'dashboard' of https://github.com/zanata/zanata-server: (22 commits)
Work in progress: implementing activity in dashboard
Work in progress: Rename template.xhtml to template_old.xhtml, template_v1.xhtml to template.xhtml. Preparing activities column in dashboard with message builder.
- remove getByID to findById in HTextFlowTargetDAO - change DatabaseOperation to DELETE_ALL when clear table in ActivityServiceImplTest - change field name from action to actionType, person_id to actor_id - change all parameter to use primitive long
Refactor field names in activity and data type for id
Increase Test Heirarchy and add Security and Homepage edit tests
minor
Change throwed exception to ZanataServiceException type
refactor field names
Add no args constructor in Activity
ModelEntity refactoring for generic activity
Work in progress: user activity
Work in progress
Work in progress: generic activity log
Refactor Indexing Strategies for better performance.
fix unit test
Implement rollup records in hourly
Add TextFlowTarget indexer that eagerly fetches all indexable properties.
rhbz987235 - fix implicit hibernate flush causes double entries in history
Implement HPersonActivity: https://bugzilla.redhat.com/show_bug.cgi?id=981064
Work in progress: user activities
...
Commit: 213601bb37a96275a92bee4de8e55436d17b9fb9
https://github.com/zanata/zanata-server/commit/213601bb37a96275a92bee4de8e55436d17b9fb9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
M zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
A zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
A zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
A zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
Log Message:
-----------
Add TransMemoryStreamingDAO
Commit: d558c4b2b0bc904ea9921fea99834564690a0a33
https://github.com/zanata/zanata-server/commit/d558c4b2b0bc904ea9921fea99834564690a0a33
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Conflicts:
zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Commit: f67864459769a602f9cbc62d4a09cc947927f263
https://github.com/zanata/zanata-server/commit/f67864459769a602f9cbc62d4a09cc947927f263
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
Log Message:
-----------
Excise lombok.val
Commit: 89b50be3c49f0a9166711aa8e462f15b6557e146
https://github.com/zanata/zanata-server/commit/89b50be3c49f0a9166711aa8e462f15b6557e146
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexer.java
Log Message:
-----------
Add TextFlowTarget indexer that eagerly fetches all indexable properties.
Commit: 2975176136adeb25f63535b9d5f1eafba510fb69
https://github.com/zanata/zanata-server/commit/2975176136adeb25f63535b9d5f1eafba510fb69
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
R zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexer.java
A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
Log Message:
-----------
Refactor Indexing Strategies for better performance.
Create an indexing strategy that performs less database queries and is able to index TextFlow targets faster.
Commit: 94762fbc0c4f0f4ea06d8b59f3b52ef836950189
https://github.com/zanata/zanata-server/commit/94762fbc0c4f0f4ea06d8b59f3b52ef836950189
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
Log Message:
-----------
Get rid of Text Flow indexing altogether.
Now using text flow target indexing for TM searches.
Also, a bit of formatting applied to persistence.xml
Commit: c0abe09837ed1bea15bc2cd9030b7e0aebbc2cb7
https://github.com/zanata/zanata-server/commit/c0abe09837ed1bea15bc2cd9030b7e0aebbc2cb7
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
Log Message:
-----------
Change TM search query to return items in both HTextFlowTarget and TMTranslationUnit.
Commit: e9b52d6e7471a6eef0ba724a6452746fe98a704d
https://github.com/zanata/zanata-server/commit/e9b52d6e7471a6eef0ba724a6452746fe98a704d
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
Log Message:
-----------
Add TMTranslationUnits to the indexable entities in the Search admin page.
Commit: d7172fde3cadab2eccf7deefcbe165ba95abf35c
https://github.com/zanata/zanata-server/commit/d7172fde3cadab2eccf7deefcbe165ba95abf35c
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
Log Message:
-----------
Refactor content state enum into Match type.
This is because the matches can now be classified by their source (internal, imported TM) as well.
Also refactor a few bits of code that are no longer necessary.
Commit: 4eea3ef2029c6ec59c1db8888b7025d8a9bd0baf
https://github.com/zanata/zanata-server/commit/4eea3ef2029c6ec59c1db8888b7025d8a9bd0baf
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Add UI elements for TM results returned from imported TMs.
Replace the "Info" button with a comma-separated list of TM names.
Do not show a content state color for the target text, since TM translation units don't have such a property.
Commit: 49a5fcf9d2c4699f96db9866ae7f928b26f44247
https://github.com/zanata/zanata-server/commit/49a5fcf9d2c4699f96db9866ae7f928b26f44247
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
R zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
A zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
M zanata-war/src/test/resources/tmx/default-valid-tm.tmx
M zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx
Log Message:
-----------
Fix broken tests
Commit: fb364db28717e8550dff1fda6f5e1c1d1bad7271
https://github.com/zanata/zanata-server/commit/fb364db28717e8550dff1fda6f5e1c1d1bad7271
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
A functional-test/src/main/java/org/zanata/page/BasePage.java
R functional-test/src/main/java/org/zanata/page/HomePage.java
R functional-test/src/main/java/org/zanata/page/SignInPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.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/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
M zanata-war/src/test/resources/arquillian/components.properties
Log Message:
-----------
Merge remote branch 'origin/master' into tm-import
Conflicts:
zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
Commit: b2e94a2b035f144a8f4e438158c8e176aac5ba06
https://github.com/zanata/zanata-server/commit/b2e94a2b035f144a8f4e438158c8e176aac5ba06
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
A zanata-war/src/main/java/org/zanata/util/PrettyDate.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
Work in progress: activities in dashboard
Commit: 58e9fedbc0c9ba01990cb3fd2fe9bb941b4e5092
https://github.com/zanata/zanata-server/commit/58e9fedbc0c9ba01990cb3fd2fe9bb941b4e5092
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Log Message:
-----------
Merge branch 'activityLog' into dashboard
Commit: 28b17efa48e3f4f93a6e19f8c8bb280e4ff76b5a
https://github.com/zanata/zanata-server/commit/28b17efa48e3f4f93a6e19f8c8bb280e4ff76b5a
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Conflicts:
zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
Commit: a6625227aca13933bcdd1082ae8a56977c5fea9c
https://github.com/zanata/zanata-server/commit/a6625227aca13933bcdd1082ae8a56977c5fea9c
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
R zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
Log Message:
-----------
Work in progress: dashboard activity
Commit: 4579297f16584480878a0e2f8d52ec35d2cd3ff3
https://github.com/zanata/zanata-server/commit/4579297f16584480878a0e2f8d52ec35d2cd3ff3
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/webapp/dashboard/activity.xhtml
Log Message:
-----------
Move url methods into urlUtil
Commit: def7b6aba43f419cf9009c8d7e56a2615c8a2250
https://github.com/zanata/zanata-server/commit/def7b6aba43f419cf9009c8d7e56a2615c8a2250
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
A zanata-model/src/main/java/org/zanata/model/HasEntityStatus.java
R zanata-model/src/main/java/org/zanata/model/HasStatus.java
Log Message:
-----------
Rename HasStatus to HasEntityStatus.
Commit: 109f2b4440cca82a9210b4551bb0d885352c3c38
https://github.com/zanata/zanata-server/commit/109f2b4440cca82a9210b4551bb0d885352c3c38
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
R zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
R zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
Log Message:
-----------
Refactor names in translation memory entities.
Commit: 0a983c83085ef409f09b8fd51b1b233395d816f2
https://github.com/zanata/zanata-server/commit/0a983c83085ef409f09b8fd51b1b233395d816f2
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
R zanata-war/src/main/java/org/zanata/action/ActivityMessageBuilder.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
A zanata-war/src/main/java/org/zanata/util/PrettyDate.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
Log Message:
-----------
Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard
# By David Mason (14) and others
# Via Alex Eng (3) and others
* 'dashboard' of https://github.com/zanata/zanata-server:
Move url methods into urlUtil
Work in progress: dashboard activity
Work in progress: activities in dashboard
Revert "Revert "Merge pull request #72 from zanata/activityLog""
Revert "Merge pull request #72 from zanata/activityLog"
rhbz980658 use fileId instead of contentLocation to refer to raw file lookup key
rhbz980658 update TODO comment
rhbz980658 change component name of FileSystemPersistService
rhbz980658 update TODO comment
rhbz980658 change jndi property name for document storage directory
rhbz980658 remove remaining blob-based implementation for raw file persistence
rhbz980658 drop (empty) temporary blob table
rhbz980658 migrate raw documents to file system
rhbz980658 add and use file system persist service
remove accidentally added imports
rhbz980658 add jndi property for document file storage location
rhbz980658 implement blob access from temporary table
rhbz980658 move blob content field out of HRawDocument
rhbz980658 add contentLocation to HRawDocument in preparation for content migration
Commit: e02ff427cdf59344719a35b9a96c6464f3283730
https://github.com/zanata/zanata-server/commit/e02ff427cdf59344719a35b9a96c6464f3283730
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
Log Message:
-----------
Include register link to ui
Commit: 80d30b49741eb6ba9b68c8f6df462376623ad3c5
https://github.com/zanata/zanata-server/commit/80d30b49741eb6ba9b68c8f6df462376623ad3c5
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
Log Message:
-----------
Merge branch 'dashboard' of github.com:zanata/zanata-server into dashboard
Commit: 34b664cc635eb21062258d1b751265f9fc520ece
https://github.com/zanata/zanata-server/commit/34b664cc635eb21062258d1b751265f9fc520ece
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
Log Message:
-----------
Fix project version url
Commit: 492a4147f281b8bc83d160086d58e3ac043e284f
https://github.com/zanata/zanata-server/commit/492a4147f281b8bc83d160086d58e3ac043e284f
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
Log Message:
-----------
Language code fixes and table renaming.
Commit: ffd501c644c686025452d8cc8cceb1d323b43691
https://github.com/zanata/zanata-server/commit/ffd501c644c686025452d8cc8cceb1d323b43691
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
A zanata-war/src/main/java/org/zanata/rest/service/ExportTMXTransUnitStrategy.java
R zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
Log Message:
-----------
Rename ExportTransUnitStrategy -> ExportTMXTransUnitStrategy
Commit: 921cf46a18b2b0042c509533f89fa2e0b0e3ff5b
https://github.com/zanata/zanata-server/commit/921cf46a18b2b0042c509533f89fa2e0b0e3ff5b
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
A zanata-war/src/main/java/org/zanata/rest/service/ExportTMXTransUnitStrategy.java
R zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Conflicts:
zanata-war/src/main/java/org/zanata/rest/service/ExportTMXTransUnitStrategy.java
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
Commit: d7d94d175d489a604d53e7e19b7c794067a3f113
https://github.com/zanata/zanata-server/commit/d7d94d175d489a604d53e7e19b7c794067a3f113
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
Log Message:
-----------
Fix broken test
Commit: 2ebf7276695871621e9db030ffcdb82009e87156
https://github.com/zanata/zanata-server/commit/2ebf7276695871621e9db030ffcdb82009e87156
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
Log Message:
-----------
Fix jsf head tag
Commit: 1193a6a6b32fdd499239523ecbbb1789e8c38d19
https://github.com/zanata/zanata-server/commit/1193a6a6b32fdd499239523ecbbb1789e8c38d19
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
A zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
Update TM merge to support option for imported TMs.
Commit: 1302a59526505bad5d91144079760365910a12e8
https://github.com/zanata/zanata-server/commit/1302a59526505bad5d91144079760365910a12e8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
Log Message:
-----------
Update based on review comments
Commit: 484300a5946337e331fb730d30df04b4d03d057c
https://github.com/zanata/zanata-server/commit/484300a5946337e331fb730d30df04b4d03d057c
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
Moved standard.css to application css in assets, Fixed some tags in dashboard template
Commit: 787ecff645aa68b9272199a66b8c22e778ff0cf9
https://github.com/zanata/zanata-server/commit/787ecff645aa68b9272199a66b8c22e778ff0cf9
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
Log Message:
-----------
Code review updates.
Commit: 2e5a884772470a94c93042ecc7bec2f472d780c4
https://github.com/zanata/zanata-server/commit/2e5a884772470a94c93042ecc7bec2f472d780c4
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Commit: 464b7d4e2c8e91ff9ace8a31272d6b386d014f50
https://github.com/zanata/zanata-server/commit/464b7d4e2c8e91ff9ace8a31272d6b386d014f50
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/service/ActivityService.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
Implement load more activities button
Commit: a4c30823e9f5bb9c2804e3de154992db03baeb64
https://github.com/zanata/zanata-server/commit/a4c30823e9f5bb9c2804e3de154992db03baeb64
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
Merge branch 'dashboard' of github.com:zanata/zanata-server into dashboard
Conflicts:
zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Commit: 2d425b03e77a25c44f8504eeb924f0114d8eb315
https://github.com/zanata/zanata-server/commit/2d425b03e77a25c44f8504eeb924f0114d8eb315
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
Log Message:
-----------
Refactor the writing of TMX metadata to the DB.
Commit: faf3d5840e94490e3549f7ee988951fd0fa9ad68
https://github.com/zanata/zanata-server/commit/faf3d5840e94490e3549f7ee988951fd0fa9ad68
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
A zanata-war/src/main/java/org/zanata/exception/EntityMissingException.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
Log Message:
-----------
Use Optional instead of @Nullable
Commit: d3f7714c45df6ffdfb24075f741bac0c2b0fb4a0
https://github.com/zanata/zanata-server/commit/d3f7714c45df6ffdfb24075f741bac0c2b0fb4a0
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
More updates from code review.
Commit: 3f58fae6e57236032487faa8a228591be88a9c63
https://github.com/zanata/zanata-server/commit/3f58fae6e57236032487faa8a228591be88a9c63
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
Log Message:
-----------
Update based on review comments
Commit: 1d197fc096fcbc56ea799ea56ddc76c122670ae3
https://github.com/zanata/zanata-server/commit/1d197fc096fcbc56ea799ea56ddc76c122670ae3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Conflicts:
zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
Commit: 7460c3356ae5860c2213c10580b62ea46a22ddd9
https://github.com/zanata/zanata-server/commit/7460c3356ae5860c2213c10580b62ea46a22ddd9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
Update based on review comments
Commit: f005bf2fac42a0443ffd1e267b54a649fe644305
https://github.com/zanata/zanata-server/commit/f005bf2fac42a0443ffd1e267b54a649fe644305
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
A zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/webapp/dashboard/activity.xhtml
Log Message:
-----------
Refactor dashboard action to activity action
Commit: 9b614d7c80dd49eb44328b986cebc39e7632b47c
https://github.com/zanata/zanata-server/commit/9b614d7c80dd49eb44328b986cebc39e7632b47c
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
Add loading icon when load more activities
Commit: c3f50592f42ee44d4d68559cb858ad01472ca267
https://github.com/zanata/zanata-server/commit/c3f50592f42ee44d4d68559cb858ad01472ca267
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
Log Message:
-----------
Rename variable in activity action class
Commit: cbdddcdc34238ad785392bd77ecb21571862113f
https://github.com/zanata/zanata-server/commit/cbdddcdc34238ad785392bd77ecb21571862113f
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M CHANGELOG.md
M functional-test/src/main/java/org/zanata/page/BasePage.java
A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp/account/changepassword.xhtml
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Commit: f4a69be11ba4921126b2e8b84da86f3d44103a35
https://github.com/zanata/zanata-server/commit/f4a69be11ba4921126b2e8b84da86f3d44103a35
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/webapp/dashboard/activity.xhtml
Log Message:
-----------
Change loading animation for load more activities, update code based on review comments
Commit: 9747c7cd1a99b0d5ee0dc93b30a4f1db2385bf50
https://github.com/zanata/zanata-server/commit/9747c7cd1a99b0d5ee0dc93b30a4f1db2385bf50
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
M zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Update based on review comments
Commit: 3641a82e999d3f6dd877f3f09fa1233d08536a90
https://github.com/zanata/zanata-server/commit/3641a82e999d3f6dd877f3f09fa1233d08536a90
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
R zanata-war/src/main/webapp/WEB-INF/template/template_old.xhtml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/login_input.xhtml
M zanata-war/src/main/webapp/account/logout.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/processmanager.xhtml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
M zanata-war/src/main/webapp/admin/rolerules.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/admin/stats.xhtml
M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
M zanata-war/src/main/webapp/dashboard/home.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/edit.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/source_files.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/add_identity.xhtml
M zanata-war/src/main/webapp/profile/edit.xhtml
M zanata-war/src/main/webapp/profile/identities.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/edit.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/search.xhtml
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
Log Message:
-----------
Update code based on review
Commit: 7a4a4d1d3be724bb6a490fce360e7a0708a4b593
https://github.com/zanata/zanata-server/commit/7a4a4d1d3be724bb6a490fce360e7a0708a4b593
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
Change load activity to 5 initially, change version icon
Commit: 3d9b0f6acb7c326a78ca7983ca46ba6f485b91a8
https://github.com/zanata/zanata-server/commit/3d9b0f6acb7c326a78ca7983ca46ba6f485b91a8
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
R zanata-model/src/main/java/org/zanata/model/HasEntityType.java
A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/service/ActivityService.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
refactor code based on review comments
Commit: 88a8d4aaa52883048bdb93e849c3c806e6f7bb4f
https://github.com/zanata/zanata-server/commit/88a8d4aaa52883048bdb93e849c3c806e6f7bb4f
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
Log Message:
-----------
refactor code based on review comments
Commit: 716f4060077cef9f0bb85c3f6212f7856bf1c7b0
https://github.com/zanata/zanata-server/commit/716f4060077cef9f0bb85c3f6212f7856bf1c7b0
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
refactor code based on review comments
Commit: ab1e9b9e8d4c2b7ffd4c0e17e65c181c7a75b375
https://github.com/zanata/zanata-server/commit/ab1e9b9e8d4c2b7ffd4c0e17e65c181c7a75b375
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
Log Message:
-----------
Fix editor translation colors
Commit: e9231c9bdc897077ebfab7862c27e6b30c6c68ec
https://github.com/zanata/zanata-server/commit/e9231c9bdc897077ebfab7862c27e6b30c6c68ec
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
R zanata-model/src/main/java/org/zanata/model/HasEntityType.java
A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/java/org/zanata/service/ActivityService.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard
# By Alex Eng
# Via Alex Eng
* 'dashboard' of https://github.com/zanata/zanata-server:
refactor code based on review comments
refactor code based on review comments
refactor code based on review comments
Commit: 4985db54fcde9d3e8f17c2318dfe57ccf707c013
https://github.com/zanata/zanata-server/commit/4985db54fcde9d3e8f17c2318dfe57ccf707c013
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
Log Message:
-----------
refactor code based on review comments
Commit: 90d5c0ae753cc691d7f9d0664202be97e4a6778a
https://github.com/zanata/zanata-server/commit/90d5c0ae753cc691d7f9d0664202be97e4a6778a
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
Log Message:
-----------
Merge branch 'dashboard' of github.com:zanata/zanata-server into dashboard
Commit: e5906a9f6e5a7efef1773978e158bcb6e2222db7
https://github.com/zanata/zanata-server/commit/e5906a9f6e5a7efef1773978e158bcb6e2222db7
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
M functional-test/src/test/resources/conf/standalone.xml
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Commit: 67b925f7ed7abb635b948ec84b41fab86800efdf
https://github.com/zanata/zanata-server/commit/67b925f7ed7abb635b948ec84b41fab86800efdf
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
A zanata-model/src/main/java/org/zanata/util/TMXUtils.java
R zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
R zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/ExportTMXStrategy.java
R zanata-war/src/main/java/org/zanata/rest/service/ExportTMXTransUnitStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/MultiLangTMXWriter.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
A zanata-war/src/main/java/org/zanata/rest/service/TranslationsExportTMXStrategy.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
Log Message:
-----------
Improve TMX metadata handling
Commit: 68ff8a2927e32e4359c2116f0ff538cae8f97d56
https://github.com/zanata/zanata-server/commit/68ff8a2927e32e4359c2116f0ff538cae8f97d56
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/service/ActivityService.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/util/PrettyDate.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
Log Message:
-----------
refactor code based on review comments
Commit: 81b17b0fc7c633498dcf303497a501b2a3217d6a
https://github.com/zanata/zanata-server/commit/81b17b0fc7c633498dcf303497a501b2a3217d6a
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
Log Message:
-----------
More history css changes. Removing css variable… this is not Sass.
Commit: c2a9e55842a60f98300c52800af534ff7559d3a4
https://github.com/zanata/zanata-server/commit/c2a9e55842a60f98300c52800af534ff7559d3a4
Author: Luke Brooker <mail at lukebrooker.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
M functional-test/src/test/resources/conf/standalone.xml
M zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/service/ActivityService.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/util/PrettyDate.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/dashboard/activity.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
Log Message:
-----------
Merge branch 'dashboard' of https://github.com/zanata/zanata-server into dashboard
# By Patrick Huang (3) and Alex Eng (2)
# Via Alex Eng (3) and Carlos Munoz (1)
* 'dashboard' of https://github.com/zanata/zanata-server:
refactor code based on review comments
refactor code based on review comments
rename methods and add javadoc
fix functional cargo deployment after file storage changelog change
fix ConcurrentModificationException triggered by jsf
Commit: d2516a043eba6ae30490d590d6b798dbb1136a51
https://github.com/zanata/zanata-server/commit/d2516a043eba6ae30490d590d6b798dbb1136a51
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
Log Message:
-----------
Add unit test to validate the order of the MAtchType enumeration is kept.
Commit: 272363f58ffcf9f857cbe73d077a79e01065bfe0
https://github.com/zanata/zanata-server/commit/272363f58ffcf9f857cbe73d077a79e01065bfe0
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
Add Trans memory merge tests.
Commit: ce7411a1923a70df6e861713152c8e03dc512e15
https://github.com/zanata/zanata-server/commit/ce7411a1923a70df6e861713152c8e03dc512e15
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-model/src/main/java/org/zanata/util/TMXUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
Log Message:
-----------
Remove namespace when persisting node and prop elements
Commit: 781ee848c60eebc44209c50428afb83656ae309e
https://github.com/zanata/zanata-server/commit/781ee848c60eebc44209c50428afb83656ae309e
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
Log Message:
-----------
functional test fix
Commit: 9e1c8423228d087dd28641c55e2fd69ee5c7947c
https://github.com/zanata/zanata-server/commit/9e1c8423228d087dd28641c55e2fd69ee5c7947c
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx
Log Message:
-----------
Add TMXParser tests that account for metadata.
Commit: e4db9485b130d1f6202a572a9cff90073aaae4be
https://github.com/zanata/zanata-server/commit/e4db9485b130d1f6202a572a9cff90073aaae4be
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-war/src/main/java/org/zanata/rest/service/ExportTMXStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationsExportTMXStrategy.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Change handling of attributes and elements in TMXMetadataHelper
Commit: 07c43838ec0bc3c90ef93ada1d4527e0f755585f
https://github.com/zanata/zanata-server/commit/07c43838ec0bc3c90ef93ada1d4527e0f755585f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx
Log Message:
-----------
Merge branch 'tm-import' of github.com:zanata/zanata into tm-import
Commit: a7ebbbdc8bbe49afc8d1a1d4e96e206eb7c117c2
https://github.com/zanata/zanata-server/commit/a7ebbbdc8bbe49afc8d1a1d4e96e206eb7c117c2
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Add metadata content verification in the TMX Parser test.
Commit: 44472758ad8e21246357f6ba2f42e0fc4f7888ff
https://github.com/zanata/zanata-server/commit/44472758ad8e21246357f6ba2f42e0fc4f7888ff
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
M zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx
Log Message:
-----------
Fix tmx metadata parser tests.
Commit: 3a61fb7c70d5c4f49fca4b6e2c0bb7074da08e12
https://github.com/zanata/zanata-server/commit/3a61fb7c70d5c4f49fca4b6e2c0bb7074da08e12
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Refactor test assertions.
Commit: b266064cab365e4cd04c806fbec46811170b436a
https://github.com/zanata/zanata-server/commit/b266064cab365e4cd04c806fbec46811170b436a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Fix failing TMX parser test.
Commit: 1eaca91663c73cfd64c1168701022bc78e8b8970
https://github.com/zanata/zanata-server/commit/1eaca91663c73cfd64c1168701022bc78e8b8970
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
M zanata-model/src/main/java/org/zanata/util/TMXUtils.java
M zanata-war/src/main/java/org/zanata/rest/service/ExportTMXStrategy.java
R zanata-war/src/main/java/org/zanata/rest/service/MultiLangTMXWriter.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationsExportTMXStrategy.java
A zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
A zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
Log Message:
-----------
Use XOM instead of Okapi to output TMX
Commit: 752e03ab9bd32624870f15e1101721d5caba4af9
https://github.com/zanata/zanata-server/commit/752e03ab9bd32624870f15e1101721d5caba4af9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
R zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
R zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
Log Message:
-----------
Remove unused TranslatedTextFlowFilter and associated caching
Commit: da7f772e1e7cd90d25b9454e3bc46fec45dbd5c7
https://github.com/zanata/zanata-server/commit/da7f772e1e7cd90d25b9454e3bc46fec45dbd5c7
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
M zanata-war/pom.xml
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Commit: 10c78f479b72b8c9e25a5e87373cbcd3c9a19650
https://github.com/zanata/zanata-server/commit/10c78f479b72b8c9e25a5e87373cbcd3c9a19650
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
R zanata-war/src/main/java/org/zanata/util/PrettyDate.java
Log Message:
-----------
fix functional test
Commit: 553f957adae4acd80a2fcde17d9c457e8443f03e
https://github.com/zanata/zanata-server/commit/553f957adae4acd80a2fcde17d9c457e8443f03e
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Conflicts:
functional-test/src/main/java/org/zanata/page/BasePage.java
functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
Commit: 66f13d1008724549def42abc9acd5555d8f2df70
https://github.com/zanata/zanata-server/commit/66f13d1008724549def42abc9acd5555d8f2df70
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/ITextFlow.java
A zanata-model/src/main/java/org/zanata/model/ITextFlowTarget.java
M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
R zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
R zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
R zanata-model/src/main/java/org/zanata/model/SourceContents.java
R zanata-model/src/main/java/org/zanata/model/TargetContents.java
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
A zanata-model/src/main/java/org/zanata/util/TMXConstants.java
R zanata-model/src/main/java/org/zanata/util/TMXUtils.java
R zanata-war/src/main/java/org/zanata/rest/service/ExportTMXStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/TMXExportStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
R zanata-war/src/main/java/org/zanata/rest/service/TransMemoryExportTMXStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
R zanata-war/src/main/java/org/zanata/rest/service/TranslationsExportTMXStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
R zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
A zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
R zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
A zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlow.java
A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlowTarget.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Update based on review comments
Commit: 6d46c7295393c2cb9c32607a3de48b8b2f79ae51
https://github.com/zanata/zanata-server/commit/6d46c7295393c2cb9c32607a3de48b8b2f79ae51
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
Log Message:
-----------
Fix functional test
Commit: 870d45694dfb660e9d69bb60a770ea9686fc6fa8
https://github.com/zanata/zanata-server/commit/870d45694dfb660e9d69bb60a770ea9686fc6fa8
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/webapp/dashboard/activity.xhtml
Log Message:
-----------
Update based on review comments
Commit: ce20b1e3f22a01964a9623cd7cc854cabb0f4345
https://github.com/zanata/zanata-server/commit/ce20b1e3f22a01964a9623cd7cc854cabb0f4345
Author: Alex Eng <aeng at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/dashboard/activity.xhtml
Log Message:
-----------
Add message when no activity loaded
Commit: 67e168c703f5e33a8f325c11dca4fd83fb4b33ac
https://github.com/zanata/zanata-server/commit/67e168c703f5e33a8f325c11dca4fd83fb4b33ac
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
Log Message:
-----------
Include XML declaration when exporting TMX, expand StreamSerializerTest
Commit: f7e53b9e07e357a2b2ff1be675af7d3b3b854bde
https://github.com/zanata/zanata-server/commit/f7e53b9e07e357a2b2ff1be675af7d3b3b854bde
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
Log Message:
-----------
Ensure that TranslationMemoryResourceService & TMXStreamingOutput co-operate to close CloseableIterators
Commit: dec159f80ab28f098070fccb4722862f4e5680e0
https://github.com/zanata/zanata-server/commit/dec159f80ab28f098070fccb4722862f4e5680e0
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
Log Message:
-----------
Update based on review comments
Commit: a4407891aa2cf5b0cd26b3a2877ba1d84fef647c
https://github.com/zanata/zanata-server/commit/a4407891aa2cf5b0cd26b3a2877ba1d84fef647c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
Log Message:
-----------
Extract methods for writing elements
Commit: fd29efa3eaf1127a4f226577699ad8e49b983239
https://github.com/zanata/zanata-server/commit/fd29efa3eaf1127a4f226577699ad8e49b983239
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
Log Message:
-----------
Update matchTypeEnumOrder test
Commit: 75b0116314953191c59649c4812f87c9dfe6b44b
https://github.com/zanata/zanata-server/commit/75b0116314953191c59649c4812f87c9dfe6b44b
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_ja.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/WEB-INF/layout/login_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/login_input.xhtml
Log Message:
-----------
Rename element id to be consistance with new text
Commit: ad905b21cb2337e68ba402c145fbe08d811e8c35
https://github.com/zanata/zanata-server/commit/ad905b21cb2337e68ba402c145fbe08d811e8c35
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Enable TMX upload as a synchronous rest service.
Commit: cc51b96c1be6f8138a2eb83f7cafecc68cce19cc
https://github.com/zanata/zanata-server/commit/cc51b96c1be6f8138a2eb83f7cafecc68cce19cc
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Add progress feedback to the asynchronous TM import resource.
Commit: c471da3527dbd4cdc623e9466e64ebf89a39bea6
https://github.com/zanata/zanata-server/commit/c471da3527dbd4cdc623e9466e64ebf89a39bea6
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
Create MergeOptions to hold a group of MergeOption
Commit: 9ce0095f7fa551cefe647277431346533ac1722f
https://github.com/zanata/zanata-server/commit/9ce0095f7fa551cefe647277431346533ac1722f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
Log Message:
-----------
Rename MergeOption to MergeRule
Commit: 5fce327ed0a8d4300471fc82fc33536362167232
https://github.com/zanata/zanata-server/commit/5fce327ed0a8d4300471fc82fc33536362167232
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
Log Message:
-----------
Fix build broken by mismatched version of api
Commit: 8307270c186163e85d276750afb78c193812f672
https://github.com/zanata/zanata-server/commit/8307270c186163e85d276750afb78c193812f672
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardRedirectTest.java
A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/DashboardRedirect.html
Log Message:
-----------
add dashboard redirect test
Commit: 860f62f3952f4223d2da4b2c18cbce13f7677f7e
https://github.com/zanata/zanata-server/commit/860f62f3952f4223d2da4b2c18cbce13f7677f7e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Clear Session after each batch; disable caching
Commit: e718b98aa347c20a4250af802dae653a4dd5a5f4
https://github.com/zanata/zanata-server/commit/e718b98aa347c20a4250af802dae653a4dd5a5f4
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardRedirectTest.java
A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
R functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/DashboardRedirect.html
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
Log Message:
-----------
Add functional test for dashboard activities and maintained project
Commit: 20b46ae28be919f3c8adb6e18aba59f678d5b74a
https://github.com/zanata/zanata-server/commit/20b46ae28be919f3c8adb6e18aba59f678d5b74a
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
Log Message:
-----------
Add id to maintainedProject list
Commit: 27bd89895a7bd14f8ff952606455d0ab1ed09cb8
https://github.com/zanata/zanata-server/commit/27bd89895a7bd14f8ff952606455d0ab1ed09cb8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M CHANGELOG.md
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
A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
M functional-test/src/test/resources/conf/standalone.xml
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp/account/changepassword.xhtml
Log Message:
-----------
Merge remote branch 'origin/master' into tm-import
Conflicts:
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
Commit: 0889029daaf53b67eace6892cb3d26b8cd2cdff1
https://github.com/zanata/zanata-server/commit/0889029daaf53b67eace6892cb3d26b8cd2cdff1
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/AbstractPage.java
M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
Log Message:
-----------
Merge branch 'integration/master' into dashboard
Conflicts:
functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
Commit: f3592a892017ae3a2bb0e4294cc8c01f44aa6788
https://github.com/zanata/zanata-server/commit/f3592a892017ae3a2bb0e4294cc8c01f44aa6788
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Switch back to a synchronous (but fully streamed) revision of the TM file upload service.
Commit: b2a8d8e5abdf2f95c8634e337517da0a8e6d064c
https://github.com/zanata/zanata-server/commit/b2a8d8e5abdf2f95c8634e337517da0a8e6d064c
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
A zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
A zanata-model/src/main/java/org/zanata/model/type/EntityType.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/ActivityAction.java
A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
A zanata-war/src/main/java/org/zanata/service/ActivityService.java
A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/login_input.xhtml
M zanata-war/src/main/webapp/account/logout.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/processmanager.xhtml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
M zanata-war/src/main/webapp/admin/rolerules.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/admin/stats.xhtml
M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
A zanata-war/src/main/webapp/dashboard/activity.xhtml
A zanata-war/src/main/webapp/dashboard/home.xhtml
A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/edit.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/source_files.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/add_identity.xhtml
M zanata-war/src/main/webapp/profile/edit.xhtml
M zanata-war/src/main/webapp/profile/identities.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/edit.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
R zanata-war/src/main/webapp/resources/css/zanata.css
M zanata-war/src/main/webapp/search.xhtml
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Merge branch 'dashboard' into tmx-dashboard
Conflicts:
zanata-model/src/main/java/org/zanata/model/HDocument.java
zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
Commit: 91d532e4650583d56ee130eb45f012329a866e9c
https://github.com/zanata/zanata-server/commit/91d532e4650583d56ee130eb45f012329a866e9c
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
Log Message:
-----------
Fix merger issue with dashboard
Commit: 84f47a60cc49ff02932b70c982120cc966a7a620
https://github.com/zanata/zanata-server/commit/84f47a60cc49ff02932b70c982120cc966a7a620
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Merge branch 'tm-import' into tmx-dashboard
Commit: 635cefff72756848afee91e3f33c2610a65970d9
https://github.com/zanata/zanata-server/commit/635cefff72756848afee91e3f33c2610a65970d9
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
Log Message:
-----------
Merge branch 'tmx-dashboard' of github.com:zanata/zanata into tmx-dashboard
Conflicts:
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
Commit: 75633b2162306f978367408540239b5860ecabe0
https://github.com/zanata/zanata-server/commit/75633b2162306f978367408540239b5860ecabe0
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
Log Message:
-----------
Change script.js to use jndi config url
Commit: 7c91740176890206661a08c807244c2649ed5188
https://github.com/zanata/zanata-server/commit/7c91740176890206661a08c807244c2649ed5188
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
Log Message:
-----------
Merge branch 'tmx-dashboard' of github.com:zanata/zanata into tmx-dashboard
Commit: 972139b1fac261cde8ed9b5ca5de6357b5afc0e8
https://github.com/zanata/zanata-server/commit/972139b1fac261cde8ed9b5ca5de6357b5afc0e8
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M zanata-war/src/main/webapp/tm/create.xhtml
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Change templates in Trans Memory pages to the new ones.
Commit: 366c3b032cb21b6cb432cb3ff15015bedc2b878c
https://github.com/zanata/zanata-server/commit/366c3b032cb21b6cb432cb3ff15015bedc2b878c
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
Log Message:
-----------
Refactor Metadata tables.
Metadata is now a single string in both the TU and TUVs.
Change the way the Translation Memory size is being calculated in the home page. It's now done using a query.
Add pages.xml entry for the Trans Memory admin home page.
Commit: 226c77809b317f4b11a27bcf7cce92f7900b762b
https://github.com/zanata/zanata-server/commit/226c77809b317f4b11a27bcf7cce92f7900b762b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
Log Message:
-----------
Fix handling of metadata
Commit: 2b8ad1acd535461271e06d103bcfc049404c160c
https://github.com/zanata/zanata-server/commit/2b8ad1acd535461271e06d103bcfc049404c160c
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
M functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
M zanata-war/src/main/webapp/dashboard/activity.xhtml
Log Message:
-----------
Add dashboard functional-test - load more activities action
Commit: f15ef3f9987341d2c5b44bea5b2bd04fcb20ab34
https://github.com/zanata/zanata-server/commit/f15ef3f9987341d2c5b44bea5b2bd04fcb20ab34
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/webapp/iteration/source_files.xhtml
Log Message:
-----------
Merge branch 'integration/master' into tmx-dashboard
Conflicts:
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
zanata-war/src/main/webapp/resources/css/zanata.css
Commit: bbe8f454b365ca29fd9b5ea5d68a245b596bace5
https://github.com/zanata/zanata-server/commit/bbe8f454b365ca29fd9b5ea5d68a245b596bace5
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
Log Message:
-----------
Check metadataType in setMetadata
Commit: 452dd75adff2fd2d3f4baa0c77365088d786cced
https://github.com/zanata/zanata-server/commit/452dd75adff2fd2d3f4baa0c77365088d786cced
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
Log Message:
-----------
Implement 'merging' of existing TUs when importing TMX files.
Commit: 5293647b41c5fde10adce203c2ccf01bb7f11afd
https://github.com/zanata/zanata-server/commit/5293647b41c5fde10adce203c2ccf01bb7f11afd
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
Log Message:
-----------
Fix issues when clearing a translation memory.
Commit: c6487a9e4a327c2aaa4d496e3e1ab692d986f360
https://github.com/zanata/zanata-server/commit/c6487a9e4a327c2aaa4d496e3e1ab692d986f360
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
Log Message:
-----------
Add JUnit annotations
Commit: cca3baaf5d6b774bfc85b3ca39bdae3afbb1d313
https://github.com/zanata/zanata-server/commit/cca3baaf5d6b774bfc85b3ca39bdae3afbb1d313
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml
Log Message:
-----------
Add DTD validation for TMX files
Commit: 0a5bddc7f24c5495e422035de208a2032f3f25b6
https://github.com/zanata/zanata-server/commit/0a5bddc7f24c5495e422035de208a2032f3f25b6
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
A functional-test/src/main/java/org/zanata/util/Checkbox.java
M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
A zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
A zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
A zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
A zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
Log Message:
-----------
Merge branch 'integration/master' into tmx-dashboard
Commit: 2d213a91e4d2466f4288bfeaa64dc7db1a246b83
https://github.com/zanata/zanata-server/commit/2d213a91e4d2466f4288bfeaa64dc7db1a246b83
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Add TMX export option in the TM home page.
Change verbiage in the TM home page.
Commit: 1d77175e6731fc5faf8970499bba4e6c3a3b3bb2
https://github.com/zanata/zanata-server/commit/1d77175e6731fc5faf8970499bba4e6c3a3b3bb2
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Add delete feature from translation memories.
Commit: 3144ebb49788373aa9dc4c5a6f3aff18deea8b44
https://github.com/zanata/zanata-server/commit/3144ebb49788373aa9dc4c5a6f3aff18deea8b44
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml
Log Message:
-----------
Merge branch 'tm-import' into tmx-dashboard
Commit: 0b7c5f18e86fa7dbd7f0cb6cee8b5b1807c6832c
https://github.com/zanata/zanata-server/commit/0b7c5f18e86fa7dbd7f0cb6cee8b5b1807c6832c
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/error.xhtml
Log Message:
-----------
Merge branch 'integration/master' into tmx-dashboard
Commit: 59e7e6da5a89c38299d35df95a59b0a99e54f0ca
https://github.com/zanata/zanata-server/commit/59e7e6da5a89c38299d35df95a59b0a99e54f0ca
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Add DOCTYPE when exporting TMX
Commit: 80a5665234b21db897082ffe803517ef06d5b949
https://github.com/zanata/zanata-server/commit/80a5665234b21db897082ffe803517ef06d5b949
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/error.xhtml
Log Message:
-----------
change error page text to reflect new menu
Commit: a9793ae5c4192f792fb0995727eb01d4b7f18053
https://github.com/zanata/zanata-server/commit/a9793ae5c4192f792fb0995727eb01d4b7f18053
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
Log Message:
-----------
Treat any tmx14.dtd as TMX 1.4
Commit: 3f5dff51eab9a7fdadb434d54427499eda635fc3
https://github.com/zanata/zanata-server/commit/3f5dff51eab9a7fdadb434d54427499eda635fc3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx
Log Message:
-----------
Handle underscore in locale names (probably invalid, but common in TMX files)
Commit: 79520dfaca8ea10c4ca13f305d83464a332e9c21
https://github.com/zanata/zanata-server/commit/79520dfaca8ea10c4ca13f305d83464a332e9c21
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
Log Message:
-----------
Retrict getTranslationMemory to admin
Commit: acfa6b755bdf9f23cdbdea9cd7f94b24d2fe4b88
https://github.com/zanata/zanata-server/commit/acfa6b755bdf9f23cdbdea9cd7f94b24d2fe4b88
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
Log Message:
-----------
Remove indexing of HTextFlow
Commit: f1085c4774ef5acb270079778d04c2d43195f482
https://github.com/zanata/zanata-server/commit/f1085c4774ef5acb270079778d04c2d43195f482
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
Log Message:
-----------
Refactor reindexing and strategy classes
Commit: 5cdf56cfe02883487e320090d5e9e8c88feeff88
https://github.com/zanata/zanata-server/commit/5cdf56cfe02883487e320090d5e9e8c88feeff88
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Remove println
Commit: 63080aedd8985d6daa6510b5fccf9087ba80541e
https://github.com/zanata/zanata-server/commit/63080aedd8985d6daa6510b5fccf9087ba80541e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
Log Message:
-----------
Check locales once
Commit: f98f7f59607976c6aaf84578cb8e40b84842b4a8
https://github.com/zanata/zanata-server/commit/f98f7f59607976c6aaf84578cb8e40b84842b4a8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Use TMXParseException when uploaded TMX is invalid
Commit: d6075e9d39bbca9c1d52b5d37c5b3a60616e3548
https://github.com/zanata/zanata-server/commit/d6075e9d39bbca9c1d52b5d37c5b3a60616e3548
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
Log Message:
-----------
Fix Application.xhtml to use JNDI for assets script, fix color overridden in editor options
Commit: 9281e298ddc5d8bdf830afc6dff1a842f00e0dd5
https://github.com/zanata/zanata-server/commit/9281e298ddc5d8bdf830afc6dff1a842f00e0dd5
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Test with multiple prop elements
Commit: 19c30e3bffab8c66447e9c84b968817693f9140f
https://github.com/zanata/zanata-server/commit/19c30e3bffab8c66447e9c84b968817693f9140f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
Log Message:
-----------
Change names for clarity
Commit: 6c06b160b33e8d69af641bfa53e368307d1fd70a
https://github.com/zanata/zanata-server/commit/6c06b160b33e8d69af641bfa53e368307d1fd70a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
Log Message:
-----------
Organise imports
Commit: 9a52b917166d099487a745f19daa31fdb0a538c3
https://github.com/zanata/zanata-server/commit/9a52b917166d099487a745f19daa31fdb0a538c3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
Log Message:
-----------
Add logging for TMX import/export
Commit: 62a46eb297a9cdfd00639e00bdfff3988f96aad8
https://github.com/zanata/zanata-server/commit/62a46eb297a9cdfd00639e00bdfff3988f96aad8
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
Log Message:
-----------
Add missing metadata to test data
Commit: fad363d244a91b0021e1d17aa71cc1639ea5fa9b
https://github.com/zanata/zanata-server/commit/fad363d244a91b0021e1d17aa71cc1639ea5fa9b
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
Log Message:
-----------
Merge branch 'integration/master' into tmx-dashboard
Commit: ebc197c10c5ed2c2d159b4a2ef5a5e85776e208b
https://github.com/zanata/zanata-server/commit/ebc197c10c5ed2c2d159b4a2ef5a5e85776e208b
Author: Alex Eng <aeng at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
A zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
Log Message:
-----------
Merge branch 'integration/master' into tmx-dashboard
Commit: b3a6db91f38ce241631aaab5e963e362c3e43733
https://github.com/zanata/zanata-server/commit/b3a6db91f38ce241631aaab5e963e362c3e43733
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
Log Message:
-----------
Remove reference to javaName
Commit: 4176808289b4e6cbe45a45adf5f4c7e5f898a702
https://github.com/zanata/zanata-server/commit/4176808289b4e6cbe45a45adf5f4c7e5f898a702
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
Log Message:
-----------
Rename a variable, and invert if statement condition.
Commit: 7691a6ac8902e54761f4d67c4f553bc005b9537e
https://github.com/zanata/zanata-server/commit/7691a6ac8902e54761f4d67c4f553bc005b9537e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-06 (Tue, 06 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
Log Message:
-----------
Fix broken test
Commit: 17b0fd7e8fd2c57c0fa9d12f6be55526c0e7d1e3
https://github.com/zanata/zanata-server/commit/17b0fd7e8fd2c57c0fa9d12f6be55526c0e7d1e3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
Log Message:
-----------
Change name to jobName
Commit: a4d80bda5d1d8d565ce8211de411600ab79f1af6
https://github.com/zanata/zanata-server/commit/a4d80bda5d1d8d565ce8211de411600ab79f1af6
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
Log Message:
-----------
Cleanup indexing classes a little
Rename clazz to entityType
Rename newScrollableResults to scrollableResults
Remove redundant Class parameter
Commit: 611992740f240d71ea8af997d97f6d5cd899a619
https://github.com/zanata/zanata-server/commit/611992740f240d71ea8af997d97f6d5cd899a619
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
Log Message:
-----------
Indent query string
Commit: 6d0141bff6f730c93c2050a89e5d3ac6c0d11e2c
https://github.com/zanata/zanata-server/commit/6d0141bff6f730c93c2050a89e5d3ac6c0d11e2c
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
Log Message:
-----------
Rename n to rowNum
Commit: 2e1b75b21653a8817d10ec88dd7a126f83f33366
https://github.com/zanata/zanata-server/commit/2e1b75b21653a8817d10ec88dd7a126f83f33366
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Update translation memory screen wording.
Commit: 9f0d4c0b88a8bb23de714cd65f0b52036f39f81b
https://github.com/zanata/zanata-server/commit/9f0d4c0b88a8bb23de714cd65f0b52036f39f81b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
Log Message:
-----------
Restore disabled assertion for creationid attribute.
Commit: 40fba3322f1a55836f08cea12c492f854793302e
https://github.com/zanata/zanata-server/commit/40fba3322f1a55836f08cea12c492f854793302e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Rename parseDubiousTMX()
Commit: 7c3c6dc5b95920bcdba7577649613b30795d16b0
https://github.com/zanata/zanata-server/commit/7c3c6dc5b95920bcdba7577649613b30795d16b0
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/tm/home.xhtml
Log Message:
-----------
Update based on review comments. (See below)
Update typo in one ofthe translation memory messages ('your').
Remove conditional display of clear button for translation memories.
Commit: 8f703ac4a16c795a43ea4930da0cf592506bcf06
https://github.com/zanata/zanata-server/commit/8f703ac4a16c795a43ea4930da0cf592506bcf06
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
M zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
M zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx
Log Message:
-----------
Merge branch 'tm-import' into tmx-dashboard
Conflicts:
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
Commit: ef22a4bc13e21ffe103fcbeec2632a3c045d1607
https://github.com/zanata/zanata-server/commit/ef22a4bc13e21ffe103fcbeec2632a3c045d1607
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M CHANGELOG.md
M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
A functional-test/src/main/java/org/zanata/util/Checkbox.java
M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.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/DocumentStatus.java
M zanata-war/src/main/resources/ehcache.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/iteration/source_files.xhtml
M zanata-war/src/main/webapp/resources/css/zanata.css
A zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
A zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
A zanata-war/src/test/java/org/zanata/file/SourceDocumentUploadTest.java
A zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
A zanata-war/src/test/java/org/zanata/service/impl/TranslationFileServiceImplTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into tm-import
Conflicts:
zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
Commit: be8c4da45c11675a748a5db39772488991ff222d
https://github.com/zanata/zanata-server/commit/be8c4da45c11675a748a5db39772488991ff222d
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M CHANGELOG.md
M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.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/DocumentStatus.java
M zanata-war/src/main/resources/ehcache.xml
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/iteration/source_files.xhtml
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
Log Message:
-----------
Merge branch 'tm-import' into tmx-dashboard
Commit: e9e64835654fae362330fd6d0ecbb56ef8573f4d
https://github.com/zanata/zanata-server/commit/e9e64835654fae362330fd6d0ecbb56ef8573f4d
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
Changed paths:
M functional-test/src/main/java/org/zanata/page/BasePage.java
M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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/test/java/org/zanata/feature/account/ChangePasswordTest.java
M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
M pom.xml
M zanata-model/pom.xml
M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
A zanata-model/src/main/java/org/zanata/model/Activity.java
M zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
M zanata-model/src/main/java/org/zanata/model/HDocument.java
M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M zanata-model/src/main/java/org/zanata/model/HProject.java
M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
A zanata-model/src/main/java/org/zanata/model/HasEntityStatus.java
A zanata-model/src/main/java/org/zanata/model/ITextFlow.java
A zanata-model/src/main/java/org/zanata/model/ITextFlowTarget.java
A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
R zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
R zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
R zanata-model/src/main/java/org/zanata/model/SourceContents.java
R zanata-model/src/main/java/org/zanata/model/TargetContents.java
A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
A zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
A zanata-model/src/main/java/org/zanata/util/TMXConstants.java
A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.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/ActivityAction.java
A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
A zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
A zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
A zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
A zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java
A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
A zanata-war/src/main/java/org/zanata/exception/EntityMissingException.java
A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/TMXExportStrategy.java
M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
R zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
A zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
A zanata-war/src/main/java/org/zanata/service/ActivityService.java
M zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
R zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
A zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
A zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
M zanata-war/src/main/java/org/zanata/util/DateUtil.java
M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
A zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kcmmemory.png
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/messages_ja.properties
M zanata-war/src/main/resources/messages_uk.properties
M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
A zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/account/activate.xhtml
M zanata-war/src/main/webapp/account/changepassword.xhtml
M zanata-war/src/main/webapp/account/inactive_account.xhtml
M zanata-war/src/main/webapp/account/login.xhtml
M zanata-war/src/main/webapp/account/login_input.xhtml
M zanata-war/src/main/webapp/account/logout.xhtml
M zanata-war/src/main/webapp/account/password_reset.xhtml
M zanata-war/src/main/webapp/account/password_reset_request.xhtml
M zanata-war/src/main/webapp/account/register.xhtml
M zanata-war/src/main/webapp/account/validate_email.xhtml
M zanata-war/src/main/webapp/admin/home.xhtml
M zanata-war/src/main/webapp/admin/languagemanager.xhtml
M zanata-war/src/main/webapp/admin/processmanager.xhtml
M zanata-war/src/main/webapp/admin/roledetail.xhtml
M zanata-war/src/main/webapp/admin/rolemanager.xhtml
M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
M zanata-war/src/main/webapp/admin/rolerules.xhtml
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
M zanata-war/src/main/webapp/admin/stats.xhtml
M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
M zanata-war/src/main/webapp/admin/userdetail.xhtml
M zanata-war/src/main/webapp/admin/usermanager.xhtml
A zanata-war/src/main/webapp/dashboard/activity.xhtml
A zanata-war/src/main/webapp/dashboard/home.xhtml
A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
M zanata-war/src/main/webapp/edit_home_content.xhtml
M zanata-war/src/main/webapp/edit_home_content_code.xhtml
M zanata-war/src/main/webapp/error.xhtml
M zanata-war/src/main/webapp/glossary/view.xhtml
M zanata-war/src/main/webapp/help/contact_admin.xhtml
M zanata-war/src/main/webapp/help/edit_help_content.xhtml
M zanata-war/src/main/webapp/help/view.xhtml
M zanata-war/src/main/webapp/home.xhtml
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/edit.xhtml
M zanata-war/src/main/webapp/iteration/files.xhtml
M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
M zanata-war/src/main/webapp/iteration/source_files.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
M zanata-war/src/main/webapp/language/home.xhtml
M zanata-war/src/main/webapp/language/language.xhtml
M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
M zanata-war/src/main/webapp/profile/add_identity.xhtml
M zanata-war/src/main/webapp/profile/edit.xhtml
M zanata-war/src/main/webapp/profile/identities.xhtml
M zanata-war/src/main/webapp/profile/merge_account.xhtml
M zanata-war/src/main/webapp/profile/view.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
M zanata-war/src/main/webapp/project/create_project.xhtml
M zanata-war/src/main/webapp/project/edit.xhtml
M zanata-war/src/main/webapp/project/home.xhtml
M zanata-war/src/main/webapp/project/homepage_edit.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
R zanata-war/src/main/webapp/resources/css/zanata.css
M zanata-war/src/main/webapp/search.xhtml
A zanata-war/src/main/webapp/tm/create.xhtml
A zanata-war/src/main/webapp/tm/home.xhtml
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
M zanata-war/src/main/webapp/version-group/edit.xhtml
M zanata-war/src/main/webapp/version-group/home.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/main/webapp/version-group/version_group.xhtml
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
A zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
A zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
A zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
A zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlow.java
A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlowTarget.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
R zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
A zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
A zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
M zanata-war/src/test/resources/META-INF/persistence.xml
M zanata-war/src/test/resources/arquillian/persistence.xml
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
R zanata-war/src/test/resources/org/zanata/tmx14.dtd
A zanata-war/src/test/resources/tmx/default-valid-tm.tmx
A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx
A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml
A zanata-war/src/test/resources/tmx/invalid-tmx-no-discernible-srclang.xml
A zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx
A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx
Log Message:
-----------
Merge pull request #101 from zanata/tmx-dashboard
Tmx Import & Dashboard
Compare: https://github.com/zanata/zanata-server/compare/99d2d483ccdb...e9e64835654f
More information about the zanata-commits
mailing list