From 651db7f3207351f640fab73cef4717cccd60e521 Mon Sep 17 00:00:00 2001 From: Poum Date: Wed, 23 Dec 2015 22:55:48 +0100 Subject: [PATCH 1/3] Suppress an useless import avoid Java 6 build --- .../main/java/org/libreplan/web/logs/IssueLogCRUDController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java index a7151a613..9e912228b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java @@ -24,7 +24,6 @@ import static org.libreplan.web.I18nHelper._; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Objects; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.exceptions.InstanceNotFoundException; From e8a3e7bcdac677af0c958aab7086714f6b7639d6 Mon Sep 17 00:00:00 2001 From: Poum Date: Sun, 17 Jan 2016 21:47:00 +0100 Subject: [PATCH 2/3] Fix doc generation --- doc/tools/included.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tools/included.mk b/doc/tools/included.mk index aad5fa195..f9d3ad1e1 100644 --- a/doc/tools/included.mk +++ b/doc/tools/included.mk @@ -8,7 +8,7 @@ utildir := SELF_DIR # Adrian Perez, 2009-05-15 11:20 # -RST_HTML_FLAGS = --link-stylesheet --stylesheet-path=html/lsr.css +RST_HTML_FLAGS = --link-stylesheet --stylesheet=html/lsr.css RST_TEX_FLAGS = --documentclass=igaliabk --font-encoding=OT1 --output-encoding=utf-8 OUTPUT_BASE = output From 38742e73adbb674c9c2dea795559d849cf2e0168 Mon Sep 17 00:00:00 2001 From: Poum Date: Sun, 17 Jan 2016 21:51:53 +0100 Subject: [PATCH 3/3] Revert Java fix (already fixed) --- .../main/java/org/libreplan/web/logs/IssueLogCRUDController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java index 9e912228b..a7151a613 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java @@ -24,6 +24,7 @@ import static org.libreplan.web.I18nHelper._; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; import org.apache.commons.logging.LogFactory; import org.libreplan.business.common.exceptions.InstanceNotFoundException;