Author: fdesbois Date: 2010-03-09 18:10:25 +0100 (Tue, 09 Mar 2010) New Revision: 2917 Log: Add properties changed from 1.2.4 Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenProperty.java trunk/pollen-business/src/main/resources/pollen.properties Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenProperty.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenProperty.java 2010-03-09 17:07:37 UTC (rev 2916) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenProperty.java 2010-03-09 17:10:25 UTC (rev 2917) @@ -34,7 +34,9 @@ /** path for feed directory **/ FEED_DIR("feedDir"), /** path for uploaded images directory **/ - IMG_DIR("upImgDir"); + IMG_DIR("upImgDir"), + /** nb votes to display per page **/ + NB_VOTES_PER_PAGE("pollen.ui.nbVotesPerPage"); String key; Modified: trunk/pollen-business/src/main/resources/pollen.properties =================================================================== --- trunk/pollen-business/src/main/resources/pollen.properties 2010-03-09 17:07:37 UTC (rev 2916) +++ trunk/pollen-business/src/main/resources/pollen.properties 2010-03-09 17:10:25 UTC (rev 2917) @@ -38,13 +38,16 @@ upload.requestsize-max=10485760 ## Configuration de l'envoi d'emails automatiques -email_host=smtp.free.fr +email_host=smtp email_port=25 email_from=bot@pollen.org ## R\u00C3\u00A9pertoire des flux de syndication (Atom) feedDir=.pollen/feeds +## Nombre de votes a afficher par page +pollen.ui.nbVotesPerPage=100 + ## Adresse du site (utilis\u00C3\u00A9e pour les emails de rappel) siteUrl=