[zanata/zanata-server] 81b17b: More history css changes. Removing css variable… t...

[GitHub]

  Branch: refs/heads/dashboard
  Home:   https://github.com/zanata/zanata-server
  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


Compare: https://github.com/zanata/zanata-server/compare/68ff8a2927e3...c2a9e55842a6