branch develop updated (0c8cb675 -> 7da4b570)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 0c8cb675 indentation new 176b0b8e refs #1 doc services tiers new 7da4b570 correction error riot 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 7da4b570f6943a7b6fe17c602bd5a432b34c55ba Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 7 15:46:06 2017 +0200 correction error riot commit 176b0b8ef49f413f957972db9fa961fba827dc52 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 7 15:38:11 2017 +0200 refs #1 doc services tiers Summary of changes: README.md | 31 ++++++++++++++++++++++ .../src/main/web/tag/poll/Votes.tag.html | 4 +-- 2 files changed, 32 insertions(+), 3 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 https://gitlab.nuiton.org/chorem/pollen.git commit 176b0b8ef49f413f957972db9fa961fba827dc52 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 7 15:38:11 2017 +0200 refs #1 doc services tiers --- README.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/README.md b/README.md index a9ac6d5e..35d19df0 100644 --- a/README.md +++ b/README.md @@ -61,3 +61,34 @@ 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. + + +SERVICES TIERS +-------------- + +Les utilisateurs peuvent créer des comptes Pollen et s'y connecter à partir des services tiers suivants (l'id du service est entre parenthèse): +- Amazon (*amazon*) +- Facebook (*facebook*) +- Flickr (*flickr*) +- Foursquare (*foursquare*) +- Github (*github*) +- Google Plus (*googleplus*) +- Hotmail (*hotmail*) +- Instagram (*instagram*) +- LinkedIn (*linkedin* ou *linkedin2*) +- Mendeley (*mendeley*) +- Myspace (*myspace*) +- Nimble (*nimble*) +- Runkeeper (*runkeeper*) +- Salesforce (*salesforce*) +- Stack Exchange (*stackexchange*) +- Twitter (*twitter*) +- Yahoo (*yahoo*) +- Yammer (*yammer*) + +Pour activer la connexion à partir de ces services, vous devez obtenir une clé d'API auprès de chacun des services +que vous voulez activer. Ils pourront vous demander le nom de domaine sur lequel est installée votre instance de Pollen, +mais également les URLs de redirection à autoriser (c'est notamment le cas pour Google Plus). Les URLs utilisées dans Pollen sont : + +- http(s)://{*url de l'instance Pollen*}/?loginProvider=*id du service*/&action=signin +- http(s)://{*url de l'instance Pollen*}/?loginProvider=*id du service*/&action=link \ No newline at end of file -- 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 https://gitlab.nuiton.org/chorem/pollen.git commit 7da4b570f6943a7b6fe17c602bd5a432b34c55ba Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 7 15:46:06 2017 +0200 correction error riot --- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index c5615258..f9424f0a 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -66,7 +66,7 @@ require("../components/HumanInput.tag.html"); </span> </div> </div> - <div class="footer separator-top" if="{poll.canVote}"> + <div class="footer separator-top" if="{loaded && poll.canVote}"> <div class="current-voter-actions separator-right"> <div class="current-voter-buttons"> <button if={!voteInEdition} @@ -214,8 +214,6 @@ require("../components/HumanInput.tag.html"); && this.refs.results0.offsetWidth / this.poll.choices.length >= MIN_CHOICE_COLUMN_WIDTH; }; - console.log(this.poll) - this.onPollChange = poll => { this.loaded = poll.choices !== undefined; this.poll = poll; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm