Merge branch 'develop' into ticket-57_develop

Eddy Young

2015-05-22 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66

 src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java

@@ -140,6 +140,17 @@
                  desc,
                        repository,
                  1)));
		
      add(new BookmarkablePageLink<Void>("maintenanceQuery", MyTicketsPage.class,
            queryParameters(
                  Lucene.type.matches(TicketModel.Type.Maintenance.name()),
                  milestoneParam,
                  statiiParam,
                  assignedToParam,
                  sortBy,
                  desc,
                        repository,
                  1)));

      add(new BookmarkablePageLink<Void>("resetQuery", MyTicketsPage.class,
            queryParameters(
@@ -234,6 +245,10 @@
      sortChoices.add(new TicketSort(getString("gb.sortLeastPatchsetRevisions"), Lucene.patchsets.name(), false));
      sortChoices.add(new TicketSort(getString("gb.sortMostVotes"), Lucene.votes.name(), true));
      sortChoices.add(new TicketSort(getString("gb.sortLeastVotes"), Lucene.votes.name(), false));
      sortChoices.add(new TicketSort(getString("gb.sortHighestPriority"), Lucene.priority.name(), true));
      sortChoices.add(new TicketSort(getString("gb.sortLowestPriority"), Lucene.priority.name(), false));
      sortChoices.add(new TicketSort(getString("gb.sortHighestSeverity"), Lucene.severity.name(), true));
      sortChoices.add(new TicketSort(getString("gb.sortLowestSeverity"), Lucene.severity.name(), false));

      TicketSort currentSort = sortChoices.get(0);
      for (TicketSort ts : sortChoices) {