[zanata/zanata-server] 464b7d: Implement load more activities button

[GitHub]

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


Compare: https://github.com/zanata/zanata-server/compare/484300a59463...a4c30823e9f5