[zanata/zanata-server] f91a1c: Merge pull request #307 from zanata/angika-plurals
GitHub
noreply at github.com
Mon Jan 20 01:55:28 UTC 2014
Branch: refs/heads/integration/master
Home: https://github.com/zanata/zanata-server
Commit: f91a1c8d646e7c29bda02cd8fd4e6560001ee2a1
https://github.com/zanata/zanata-server/commit/f91a1c8d646e7c29bda02cd8fd4e6560001ee2a1
Author: Carlos Munoz <chavo16 at hotmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M zanata-war/src/main/resources/pluralforms.properties
Log Message:
-----------
Merge pull request #307 from zanata/angika-plurals
Add plural forms for Angika
Commit: d69f41c3c06404470c55efdf655fcfe1c78d116e
https://github.com/zanata/zanata-server/commit/d69f41c3c06404470c55efdf655fcfe1c78d116e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M .travis.yml
M pom.xml
M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Log Message:
-----------
Merge branch 'travis-jdk8' into release
Commit: 4d1db82f645658ef41778d8eec67bb0704759a7f
https://github.com/zanata/zanata-server/commit/4d1db82f645658ef41778d8eec67bb0704759a7f
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare release server-3.2.1
Commit: c398fb1d9f986545efcbb0283d9b937c1c9ac5e4
https://github.com/zanata/zanata-server/commit/c398fb1d9f986545efcbb0283d9b937c1c9ac5e4
Author: Zanata Build Server <jenkins at zanata.org>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M functional-test/pom.xml
M pom.xml
M zanata-model/pom.xml
M zanata-war/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Commit: d77c762ee0793e8a4d7e0415c78999f93153d786
https://github.com/zanata/zanata-server/commit/d77c762ee0793e8a4d7e0415c78999f93153d786
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-01-19 (Sun, 19 Jan 2014)
Changed paths:
M zanata-war/src/main/webapp/account/login.xhtml
Log Message:
-----------
HOT-FIX: Replace use of s:link with h:outputLink where a full url is required.
Using an s:link tag where full urls are required (as opposed to view ids) causes the component to throw an exception.
Commit: fce638bbc294fdb597195dda572309ddad6831e1
https://github.com/zanata/zanata-server/commit/fce638bbc294fdb597195dda572309ddad6831e1
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-01-19 (Sun, 19 Jan 2014)
Changed paths:
M zanata-war/src/main/webapp/account/login.xhtml
Log Message:
-----------
Merge pull request #342 from zanata/nukes-login-issue
HOT-FIX: Replace use of s:link with h:outputLink where a full url is required
Commit: 00fda0e868c94333809ffb12ea7bf9f0fd4b1d15
https://github.com/zanata/zanata-server/commit/00fda0e868c94333809ffb12ea7bf9f0fd4b1d15
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-01-19 (Sun, 19 Jan 2014)
Log Message:
-----------
Merge branch 'release' into integration/master
Commit: 2a91beddf3b499d7f38e9fb1cf7d205088898bd1
https://github.com/zanata/zanata-server/commit/2a91beddf3b499d7f38e9fb1cf7d205088898bd1
Author: Carlos A. Munoz <camunoz at redhat.com>
Date: 2014-01-19 (Sun, 19 Jan 2014)
Changed paths:
M zanata-war/src/main/webapp/account/login.xhtml
Log Message:
-----------
Merge remote-tracking branch 'origin/release' into integration/master
Conflicts:
functional-test/pom.xml
pom.xml
zanata-model/pom.xml
zanata-war/pom.xml
Compare: https://github.com/zanata/zanata-server/compare/74eee0b82125...2a91beddf3b4
More information about the zanata-commits
mailing list