This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from c89f5a5 refs #7148 : modification des requêtes pour les tableaux de synthèse new 8de82a1 refs #7154 : modification du rendu de la légende new 33becda refs #7154 : ajout des dates sur les activités de palangre new c3acac6 refs #7154 : ajout de ligne pour les activités autre que les opérations de pèche new ce0400b Merge branch 'feature/7154' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ce0400b5cd1031526c513ff14864c772c597044d Merge: c89f5a5 c3acac6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 28 14:22:47 2015 +0200 Merge branch 'feature/7154' into develop commit c3acac6c3713cef26c3013748349a0465695a219 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 28 14:15:41 2015 +0200 refs #7154 : ajout de ligne pour les activités autre que les opérations de pèche commit 33becdafc4f12744fa609818c9030f4fbcc988f5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 28 12:35:25 2015 +0200 refs #7154 : ajout des dates sur les activités de palangre commit 8de82a1ce010c1f063a4b4650bbd7278c607768f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 28 11:17:19 2015 +0200 refs #7154 : modification du rendu de la légende Summary of changes: .../entities/longline/TripLonglineDAOImpl.java | 37 +++--- .../observe/ui/util/tripMap/ObserveMapPane.java | 33 ++++- .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 7 +- .../ui/util/tripMap/TripMapContentBuilder.java | 103 ++++++++------- observe-swing/src/main/map/style.xml | 143 +++++++++++++++++++-- 5 files changed, 242 insertions(+), 81 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.