[zanata/zanata-server] 4fa9e0: Rename Obsolete to Archived in UI and tests

[GitHub]

  Branch: refs/heads/update-join-language-page
  Home:   https://github.com/zanata/zanata-server
  Commit: 4fa9e013f9c8442233e5977852510898cae12d8e
      https://github.com/zanata/zanata-server/commit/4fa9e013f9c8442233e5977852510898cae12d8e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Rename Obsolete to Archived in UI and tests


  Commit: e03311131c4bff95df2462d4cc9c45d2d02a59de
      https://github.com/zanata/zanata-server/commit/e03311131c4bff95df2462d4cc9c45d2d02a59de
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #758 from zanata/fix-some-texts

Rename Obsolete to Archived in UI and tests


  Commit: 5b3f90934591ddc56cf711c1b130aad370ece743
      https://github.com/zanata/zanata-server/commit/5b3f90934591ddc56cf711c1b130aad370ece743
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge branch 'integration/master' into update-join-language-page


  Commit: 69ede067d201b3a4c4ba555e73602ce253cf85fe
      https://github.com/zanata/zanata-server/commit/69ede067d201b3a4c4ba555e73602ce253cf85fe
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java

  Log Message:
  -----------
  Refactor, add comments in version-group join method


Compare: https://github.com/zanata/zanata-server/compare/bbe42dfc7c14...69ede067d201