[zanata-commits] [zanata/zanata] 2362af: merged

noreply at github.com noreply at github.com
Tue Apr 19 02:57:05 UTC 2011 

Branch: refs/heads/master
Home:   https://github.com/zanata/zanata

Commit: 2362afcefea6ad2358f638032248a4fc6abf0121
    https://github.com/zanata/zanata/commit/2362afcefea6ad2358f638032248a4fc6abf0121
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   2011-04-12 (Tue, 12 Apr 2011)

Changed paths:
  M server/flies-model/src/main/java/net/openl10n/flies/model/HDocument.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/HLocale.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/HTextFlow.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/HTextFlowTarget.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/po/AbstractPoHeader.java
  M server/flies-war/src/main/java/net/openl10n/flies/rest/service/ResourceUtils.java

Log Message:
-----------
merged


Commit: ef5eefc4c3899eb5cf9a99c3a4f911c67114f969
    https://github.com/zanata/zanata/commit/ef5eefc4c3899eb5cf9a99c3a4f911c67114f969
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   2011-04-12 (Tue, 12 Apr 2011)

Changed paths:
  A server/flies-war/src/main/java/net/openl10n/flies/rest/service/MergeType.java
  M server/flies-war/src/main/java/net/openl10n/flies/rest/service/ResourceUtils.java
  M server/flies-war/src/main/java/net/openl10n/flies/rest/service/TranslationResourcesService.java
  M server/flies-war/src/test/java/net/openl10n/flies/rest/service/ResourceUtilsTest.java

Log Message:
-----------
Update issue 269
issue 269: generate comments from translation history on pull, and merging of comments on push


Commit: 88adcf3bc84dae70fea1c729bd6689b55c287649
    https://github.com/zanata/zanata/commit/88adcf3bc84dae70fea1c729bd6689b55c287649
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M server/flies-war/src/main/java/net/openl10n/flies/rest/service/ResourceUtils.java
  A server/flies-war/src/main/java/net/openl10n/flies/rest/service/TranslatorCredit.java
  M server/flies-war/src/test/java/net/openl10n/flies/rest/service/ResourceUtilsTest.java
  A server/flies-war/src/test/java/net/openl10n/flies/rest/service/TranslatorCreditTest.java

Log Message:
-----------
sort translator credits by year, then alphabetically  (Fixes issue 269)


Commit: b3251ea84be9f21204f374084409a567c8298feb
    https://github.com/zanata/zanata/commit/b3251ea84be9f21204f374084409a567c8298feb
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M server/flies-war/src/main/java/net/openl10n/flies/rest/service/ResourceUtils.java

Log Message:
-----------
fix NPE

Update issue 269
fix NPE


Commit: 45ecfe045df4e3fdbc90c9bc742457214b175131
    https://github.com/zanata/zanata/commit/45ecfe045df4e3fdbc90c9bc742457214b175131
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M server/flies-war/src/main/java/net/openl10n/flies/webtrans/client/TransUnitDetailsView.java
  M server/flies-war/src/main/java/net/openl10n/flies/webtrans/client/TransUnitDetailsView.ui.xml
  M server/flies-war/src/main/java/net/openl10n/flies/webtrans/server/rpc/GetTransUnitListHandler.java
  M server/flies-war/src/main/java/net/openl10n/flies/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/flies-war/src/main/java/net/openl10n/flies/webtrans/shared/model/TransUnit.java
  M server/flies-war/src/test/java/net/openl10n/flies/webtrans/client/rpc/DummyGetTransUnitCommand.java

Log Message:
-----------
rhbz#695968 initial implementation of showing last modified person and last modified time for textflowtarget


Commit: 35c1f6e8eb958687aeaa82f537b3cd153f1d83f1
    https://github.com/zanata/zanata/commit/35c1f6e8eb958687aeaa82f537b3cd153f1d83f1
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M client/flies-client-ant-po/src/main/java/net/openl10n/flies/client/ant/po/UploadPoTask.java
  M client/flies-client-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushCommand.java
  M client/flies-client-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushOptions.java
  M client/flies-client-commands/src/main/java/net/openl10n/flies/client/commands/PublicanPushOptionsImpl.java
  M client/flies-client-commands/src/test/java/net/openl10n/flies/client/commands/PublicanPushCommandTest.java
  M client/zanata-maven-plugin/src/main/java/net/openl10n/flies/maven/PublicanPushMojo.java
  M common/flies-common-api/src/main/java/net/openl10n/flies/rest/client/ITranslationResources.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/HDocument.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/HLocale.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/HTextFlow.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/HTextFlowTarget.java
  M server/flies-model/src/main/java/net/openl10n/flies/model/po/AbstractPoHeader.java
  A server/flies-war/src/main/java/net/openl10n/flies/rest/service/MergeType.java
  M server/flies-war/src/main/java/net/openl10n/flies/rest/service/ResourceUtils.java
  M server/flies-war/src/main/java/net/openl10n/flies/rest/service/TranslationResourcesService.java
  A server/flies-war/src/main/java/net/openl10n/flies/rest/service/TranslatorCredit.java
  M server/flies-war/src/test/java/net/openl10n/flies/rest/service/ResourceUtilsTest.java
  A server/flies-war/src/test/java/net/openl10n/flies/rest/service/TranslatorCreditTest.java

Log Message:
-----------
merged


Commit: cbfab70a6a41753ecbacc81dc0744edead578853
    https://github.com/zanata/zanata/commit/cbfab70a6a41753ecbacc81dc0744edead578853
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M server/flies-war/src/main/webapp/WEB-INF/urlrewrite.xml

Log Message:
-----------
revert the last change


Commit: bcd85f361adc192045535c13d2a71bee997f9b7e
    https://github.com/zanata/zanata/commit/bcd85f361adc192045535c13d2a71bee997f9b7e
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  A server/flies-war/src/main/webapp/img/zanata.png
  M server/flies-war/src/main/webapp/stylesheet/flies.css
  M server/flies-war/src/main/webapp/stylesheet/tabs.css

Log Message:
-----------
apply style updates from junzhang at redhat.com


Commit: e464a0ad517c7f20b9bfa917622fe74c0d7d8381
    https://github.com/zanata/zanata/commit/e464a0ad517c7f20b9bfa917622fe74c0d7d8381
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M server/flies-war/src/main/webapp/WEB-INF/urlrewrite.xml

Log Message:
-----------
-- Merged


Commit: a36d6d340adf3b0e28f5d7eb3e7d7eb911440126
    https://github.com/zanata/zanata/commit/a36d6d340adf3b0e28f5d7eb3e7d7eb911440126
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M server/flies-war/src/main/webapp/WEB-INF/urlrewrite.xml

Log Message:
-----------
re commit the change


Commit: 45bff40a82e0c9719d61489152bd364c67a896f8
    https://github.com/zanata/zanata/commit/45bff40a82e0c9719d61489152bd364c67a896f8
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  A server/flies-war/src/main/webapp/img/zanata.png
  M server/flies-war/src/main/webapp/stylesheet/flies.css
  M server/flies-war/src/main/webapp/stylesheet/tabs.css

Log Message:
-----------
merged


Commit: 1bbf2a4128660ffb6501858575a2ee9d7d12b925
    https://github.com/zanata/zanata/commit/1bbf2a4128660ffb6501858575a2ee9d7d12b925
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M server/flies-war/src/main/webapp/WEB-INF/urlrewrite.xml

Log Message:
-----------
rhbz#691625 fix the bug for admin/home url rewrite


Commit: cb729c4a68c56e4363b2c11af0de02166f41dbc7
    https://github.com/zanata/zanata/commit/cb729c4a68c56e4363b2c11af0de02166f41dbc7
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-13 (Wed, 13 Apr 2011)

Changed paths:
  M server/flies-war/src/main/java/net/openl10n/flies/security/FedoraOpenId.java

Log Message:
-----------
rhbz#692011 add more log info


Commit: 6ffb3f69eb1354453270619f29b3f5813d5d3d0b
    https://github.com/zanata/zanata/commit/6ffb3f69eb1354453270619f29b3f5813d5d3d0b
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-15 (Fri, 15 Apr 2011)

Changed paths:
  M server/flies-war/src/main/java/net/openl10n/flies/security/FedoraOpenId.java
  M server/flies-war/src/main/java/net/openl10n/flies/security/SpNegoIdentity.java

Log Message:
-----------
tidy code


Commit: 4d6ede2689a1a85ae2bb746dde3f02ed6b628629
    https://github.com/zanata/zanata/commit/4d6ede2689a1a85ae2bb746dde3f02ed6b628629
Author: Helen Ding <hding at redhat.com>
Date:   2011-04-15 (Fri, 15 Apr 2011)

Changed paths:
  M server/flies-war/src/main/webapp/WEB-INF/pages.xml

Log Message:
-----------
tidy code


Compare: https://github.com/zanata/zanata/compare/ca63a8b...4d6ede2

More information about the zanata-commits mailing list