[pollen] branch develop updated (05c1948 -> 7f2a165)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 05c1948 fix directory Mustache template adds 3ca0e13 add UI URL render adds ca68e84 add template email for new Account, new Poll, lost password adds fa6d20f UI can validate email adds e4fb282 improve template adds 10e74d5 no send notify when close poll adds 1ee42f4 move include sticky-inline-poll.js for use optimized cache adds 47a8f2d auto validate default users new cdf1f79 Merge branch 'feature/Notification' into develop new 7f2a165 Add INSTALL.txt, and update README.txt The 2 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 7f2a165aef57320b003b544f4fb488f9f103e8bf Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 14:45:36 2014 +0200 Add INSTALL.txt, and update README.txt commit cdf1f79a9cb39089027d372001f4ac580b5d0f65 Merge: 05c1948 47a8f2d Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 14:36:00 2014 +0200 Merge branch 'feature/Notification' into develop Summary of changes: .../README.txt => pollen-rest-api/INSTALL.txt | 15 +--- pollen-rest-api/src/main/resources/mapping | 2 +- .../src/main/resources/pollen-rest-api.properties | 6 ++ .../services/config/PollenServiceConfig.java | 27 ++++++++ .../services/config/PollenServiceConfigOption.java | 28 +++++++- .../services/service/NotificationService.java | 34 +++++----- .../services/service/PollenServiceSupport.java | 4 ++ .../services/service/PollenUIUrlRenderService.java | 77 +++++++++++++++++++++ .../pollen/services/service/PollenUserService.java | 47 ++++++++++--- .../services/service/mail/ChoiceAddedEmail.java | 2 +- .../services/service/mail/ChoiceDeletedEmail.java | 2 +- .../services/service/mail/ChoiceEditedEmail.java | 2 +- .../services/service/mail/CommentAddedEmail.java | 2 +- .../services/service/mail/CommentDeletedEmail.java | 2 +- .../services/service/mail/CommentEditedEmail.java | 2 +- .../pollen/services/service/mail/EmailService.java | 24 ++++++- .../services/service/mail/LostPasswordEmail.java | 17 ++++- .../service/mail/PollChoicePeriodEndedEmail.java | 2 +- .../service/mail/PollChoicePeriodStartedEmail.java | 2 +- .../services/service/mail/PollClosedEmail.java | 2 +- .../services/service/mail/PollCreatedEmail.java | 22 +++++- .../service/mail/PollVotePeriodEndedEmail.java | 2 +- .../service/mail/PollVotePeriodStartedEmail.java | 2 +- .../service/mail/PollVoteReminderEmail.java | 2 +- .../mail/RestrictedPollInvitationEmail.java | 2 +- .../service/mail/UserAccountCreatedEmail.java | 33 ++++++++- .../services/service/mail/VoteAddedEmail.java | 2 +- .../services/service/mail/VoteDeletedEmail.java | 2 +- .../services/service/mail/VoteEditedEmail.java | 2 +- .../resources/email/LostPasswordEmail.mustache | 8 +++ .../resources/email/LostPasswordEmail_fr.mustache | 8 +++ .../main/resources/email/PollClosedEmail.mustache | 0 .../resources/email/PollClosedEmail_fr.mustache | 0 .../main/resources/email/PollCreatedEmail.mustache | 15 ++++ .../resources/email/PollCreatedEmail_fr.mustache | 15 ++++ .../email/UserAccountCreatedEmail.mustache | 10 +++ .../email/UserAccountCreatedEmail_fr.mustache | 10 +++ .../service/PollenUIUrlRenderServiceTest.java | 79 ++++++++++++++++++++++ .../src/test/resources/pollen-services.properties | 5 ++ pollen-ui-angular/INSTALL.txt | 17 +++++ pollen-ui-angular/README.txt | 46 +------------ pollen-ui-angular/src/main/webapp/i18n/en.js | 2 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 + pollen-ui-angular/src/main/webapp/index.html | 2 + pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/userCtrl.js | 12 ++++ pollen-ui-angular/src/main/webapp/js/services.js | 4 ++ .../src/main/webapp/partials/inline-poll.html | 2 - .../src/main/webapp/partials/user-login.html | 2 +- 49 files changed, 497 insertions(+), 112 deletions(-) copy pollen-ui-angular/README.txt => pollen-rest-api/INSTALL.txt (82%) create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUIUrlRenderService.java copy pollen-rest-api/changelog.txt => pollen-services/src/main/resources/email/PollClosedEmail.mustache (100%) copy pollen-rest-api/changelog.txt => pollen-services/src/main/resources/email/PollClosedEmail_fr.mustache (100%) create mode 100644 pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUIUrlRenderServiceTest.java create mode 100644 pollen-ui-angular/INSTALL.txt -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit cdf1f79a9cb39089027d372001f4ac580b5d0f65 Merge: 05c1948 47a8f2d Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 14:36:00 2014 +0200 Merge branch 'feature/Notification' into develop pollen-rest-api/src/main/resources/mapping | 2 +- .../src/main/resources/pollen-rest-api.properties | 6 ++ .../services/config/PollenServiceConfig.java | 27 ++++++++ .../services/config/PollenServiceConfigOption.java | 28 +++++++- .../services/service/NotificationService.java | 34 +++++----- .../services/service/PollenServiceSupport.java | 4 ++ .../services/service/PollenUIUrlRenderService.java | 77 +++++++++++++++++++++ .../pollen/services/service/PollenUserService.java | 47 ++++++++++--- .../services/service/mail/ChoiceAddedEmail.java | 2 +- .../services/service/mail/ChoiceDeletedEmail.java | 2 +- .../services/service/mail/ChoiceEditedEmail.java | 2 +- .../services/service/mail/CommentAddedEmail.java | 2 +- .../services/service/mail/CommentDeletedEmail.java | 2 +- .../services/service/mail/CommentEditedEmail.java | 2 +- .../pollen/services/service/mail/EmailService.java | 24 ++++++- .../services/service/mail/LostPasswordEmail.java | 17 ++++- .../service/mail/PollChoicePeriodEndedEmail.java | 2 +- .../service/mail/PollChoicePeriodStartedEmail.java | 2 +- .../services/service/mail/PollClosedEmail.java | 2 +- .../services/service/mail/PollCreatedEmail.java | 22 +++++- .../service/mail/PollVotePeriodEndedEmail.java | 2 +- .../service/mail/PollVotePeriodStartedEmail.java | 2 +- .../service/mail/PollVoteReminderEmail.java | 2 +- .../mail/RestrictedPollInvitationEmail.java | 2 +- .../service/mail/UserAccountCreatedEmail.java | 33 ++++++++- .../services/service/mail/VoteAddedEmail.java | 2 +- .../services/service/mail/VoteDeletedEmail.java | 2 +- .../services/service/mail/VoteEditedEmail.java | 2 +- .../resources/email/LostPasswordEmail.mustache | 8 +++ .../resources/email/LostPasswordEmail_fr.mustache | 8 +++ ...wordEmail.mustache => PollClosedEmail.mustache} | 0 ...dEmail.mustache => PollClosedEmail_fr.mustache} | 0 .../main/resources/email/PollCreatedEmail.mustache | 15 ++++ .../resources/email/PollCreatedEmail_fr.mustache | 15 ++++ .../email/UserAccountCreatedEmail.mustache | 10 +++ .../email/UserAccountCreatedEmail_fr.mustache | 10 +++ .../service/PollenUIUrlRenderServiceTest.java | 79 ++++++++++++++++++++++ .../src/test/resources/pollen-services.properties | 5 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 2 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 + pollen-ui-angular/src/main/webapp/index.html | 2 + pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/userCtrl.js | 12 ++++ pollen-ui-angular/src/main/webapp/js/services.js | 4 ++ .../src/main/webapp/partials/inline-poll.html | 2 - .../src/main/webapp/partials/user-login.html | 2 +- 46 files changed, 476 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 7f2a165aef57320b003b544f4fb488f9f103e8bf Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 14:45:36 2014 +0200 Add INSTALL.txt, and update README.txt --- .../README.txt => pollen-rest-api/INSTALL.txt | 15 ++----- pollen-ui-angular/INSTALL.txt | 17 ++++++++ pollen-ui-angular/README.txt | 46 +--------------------- 3 files changed, 21 insertions(+), 57 deletions(-) diff --git a/pollen-ui-angular/README.txt b/pollen-rest-api/INSTALL.txt similarity index 82% copy from pollen-ui-angular/README.txt copy to pollen-rest-api/INSTALL.txt index 4b24402..08e42dd 100644 --- a/pollen-ui-angular/README.txt +++ b/pollen-rest-api/INSTALL.txt @@ -1,16 +1,7 @@ -POLLEN ------- - -Pollen est une application Web de sondages en ligne qui permet de créer et de -gérer des sondages avec différents types de choix (texte, date, image). -Les votants peuvent participer au sondage en suivant un lien qui identifie le -sondage. - - INSTALLATION ------------ -Pour installer l'application il suffit de déployer l'archive war dans un +Pour installer le serveur de l'application, il suffit de déployer l'archive war dans un conteneur Web comme Tomcat. Par défaut une base de données H2 est créée dans le répertoire /tmp. @@ -36,10 +27,10 @@ Pour modifier ce comportement par défaut il suffit de créer le fichier email_host=smtp.free.fr email_port=25 email_from=bot@pollen.org - + # Répertoire des flux de syndication (Atom) feedDir=/tmp/pollen/feeds - + # Adresse du site (utilisée pour les emails de rappel) siteUrl=http://www.site.org/pollen/ diff --git a/pollen-ui-angular/INSTALL.txt b/pollen-ui-angular/INSTALL.txt new file mode 100644 index 0000000..13ba347 --- /dev/null +++ b/pollen-ui-angular/INSTALL.txt @@ -0,0 +1,17 @@ +INSTALLATION +------------ + +Pour installer l'interface utilisateur de l'application il suffit de déployer l'archive war dans un +conteneur Web comme Tomcat. + +Un fichier de conf est a ajouter dans src/main/webapp/js/conf.js que vous pouvez copier depuis conf.js.example +Il faut définir conf.restURL avec l'adresse du serveur comme par exemple : http://localhost:8080/pollen-rest-api/v1 + + +Il est possible de mettre le fichier de conf hors du war en ajoutant un redirection directement dans le serveur apache : + +``` +Alias /pollen-ui-angular/js/conf.js /etc/pollen-ui-angular.js + +ProxyPass /pollen-ui-angular-latest/js/conf.js ! +``` \ No newline at end of file diff --git a/pollen-ui-angular/README.txt b/pollen-ui-angular/README.txt index 4b24402..4b539b5 100644 --- a/pollen-ui-angular/README.txt +++ b/pollen-ui-angular/README.txt @@ -10,49 +10,5 @@ sondage. INSTALLATION ------------ -Pour installer l'application il suffit de déployer l'archive war dans un -conteneur Web comme Tomcat. +Voir le fichier INSTALL.txt -Par défaut une base de données H2 est créée dans le répertoire /tmp. -Pour modifier ce comportement par défaut il suffit de créer le fichier -/etc/pollen.properties et de le remplir avec les propriétés suivantes : - - # Configuration de la base de données - hibernate.show_sql=false - hibernate.dialect=org.hibernate.dialect.H2Dialect - hibernate.connection.username=username - hibernate.connection.password=password - hibernate.connection.driver_class=org.h2.Driver - hibernate.connection.url=jdbc:h2:file://tmp/pollen/pollen - - # Répertoire des images transférées - upImgDir=/tmp/pollen/uploadedImages - - # Taille maximal des images transférées (en octets) - upload.filesize-max=1048576 - upload.requestsize-max=10485760 - - # Configuration de l'envoi d'emails automatiques - email_host=smtp.free.fr - email_port=25 - email_from=bot@pollen.org - - # Répertoire des flux de syndication (Atom) - feedDir=/tmp/pollen/feeds - - # Adresse du site (utilisée pour les emails de rappel) - siteUrl=http://www.site.org/pollen/ - -Pour une base PostgreSQL on aura : - - hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect - hibernate.connection.driver_class=org.postgresql.Driver - hibernate.default_schema=public - -Il peut-être nécessaire de redéployer l'application après avoir modifié ce -fichier. - -Un utilisateur avec les droits d'administration est créé automatiquement -(identifiant "admin", mot de passe "pollen"). Par mesure de sécurité il est -important de supprimer cet utilisateur après avoir créer un autre compte -administrateur. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm