Commit Graph

707 Commits

Author SHA1 Message Date
blr21560 cf9cda99bd Fixe issue #106
Syntax errors in CSS files
Erreurs de syntaxe dans des fichiers CSS
2015-11-04 18:03:09 +01:00
Olivier Perez f0a45bd203 Merge branch 'feature/private-polls' into 'develop'
Feature : private polls

Allowing to protect a poll by password .

An option can allow the user which doesn't know the password to see (and only see) the poll and its votes.

(Sorry for the double commits...)

See merge request !79
2015-10-30 22:04:56 +01:00
Antonin d72c5295ce useless spaces 2015-10-30 22:02:24 +01:00
Antonin 91de1661bb Inlining a change event 2015-10-30 22:02:24 +01:00
Antonin 7b05eeec44 Remove dev tests 2015-10-30 22:02:24 +01:00
Antonin 1376426f27 Useless else if removed 2015-10-30 22:02:24 +01:00
Antonin 3eae4d97d4 Local improvement (remove useless dots)
- French errors messages were missing due to bad merge.
2015-10-30 22:00:43 +01:00
Antonin 15c57eeb37 Allows the admin to modify password related stuff. 2015-10-30 20:45:18 +01:00
Antonin 3192098ff5 Merge branch 'feature/private-polls' of git.framasoft.org:Antonin/framadate into feature/private-polls 2015-10-29 15:00:53 +01:00
Antonin c6d6ad2393 Applying the password restriction in studs. 2015-10-29 11:52:13 +01:00
Antonin bb37d16dff Sugar for comment sending.
- Do not send if comment empty
    - Disable submit button while submit is in progress
2015-10-29 11:52:13 +01:00
Antonin 22253b4e68 Cleaning useless code. 2015-10-29 11:52:13 +01:00
Antonin 6cc46b5bae Composer.lock update 2015-10-29 11:52:13 +01:00
Antonin b462a6bbdb Hashing the password early 2015-10-29 11:52:13 +01:00
Antonin 161b6b14c0 Password options are used with poll creation.
- Just found that the "hidden" parameter wasn't...
2015-10-29 11:52:13 +01:00
Antonin cddbf3cb43 Safe way to hash password. 2015-10-29 11:52:13 +01:00
Antonin f888a643e0 Added column password in poll table. 2015-10-29 11:52:13 +01:00
Olivier Perez 1ba245258a Merge branch 'master' into develop 2015-10-29 09:42:30 +01:00
Olivier PEREZ 8f2c9f07d4 Don't split admin_poll_id as poll_id 2015-10-28 22:53:56 +01:00
Olivier PEREZ 15640a6788 Fix stupid break in adminstuds 2015-10-28 22:11:00 +01:00
Antonin c194d9a43f Applying the password restriction in studs. 2015-10-28 17:30:42 +01:00
Antonin 1ec9ea2dd5 Sugar for comment sending.
- Do not send if comment empty
    - Disable submit button while submit is in progress
2015-10-28 16:36:54 +01:00
Antonin f6f04c69e0 Cleaning useless code. 2015-10-28 15:08:54 +01:00
Antonin 6255a55128 Merge branch 'feature/admin_search_by_mail' into 'develop'
Admin : Recherche de sondages par adresse mail de l'auteur

- Ajout d'un champ pour chercher par adresse mail (type=text par laisser la possibilité de chercher une partie de l'adresse).
- Ajout des critères de recherche dans la requête SQL

See merge request !78
2015-10-28 14:25:45 +01:00
Antonin 5955c0ece0 Composer.lock update 2015-10-28 13:43:58 +01:00
Antonin 79133ef70e Hashing the password early 2015-10-28 13:40:46 +01:00
Antonin e20ac74f0b Password options are used with poll creation.
- Just found that the "hidden" parameter wasn't...
2015-10-28 13:40:46 +01:00
Antonin 05f840ceb0 Safe way to hash password. 2015-10-28 13:31:16 +01:00
Antonin 4e01d07da0 Added column password in poll table. 2015-10-28 13:30:31 +01:00
Olivier Perez 2cfeb385bb Admin: Search in polls by author's mail address 2015-10-28 13:06:02 +01:00
Olivier Perez 16c3c70f5a Update CHANGELOG for v1.0 2015-10-28 12:56:30 +01:00
Olivier Perez 61605e5e5a Merge branch 'master' into develop 2015-10-28 12:28:20 +01:00
Olivier Perez 6d8353b652 Ajout de la version 0.9.1 dans le CHANGELOG 2015-10-27 12:51:04 +01:00
JosephK 77728a5b69 Fix issue #98
(cherry picked from commit 761b485d9b)
2015-10-27 12:34:23 +01:00
Olivier Perez 3f1f957c5e Merge branch 'feature/ajax_submission_for_comments' into 'develop'
Feature - ajax submission for comments

The sending of comments has been ajaxified, in order to prevent the lose of vote data while commenting.

The comment list is also refreshed while commenting.

See merge request !72
2015-10-26 17:00:40 +01:00
Antonin 5552cc4d9d studs.js refactoring.
- Replacing "" by ''
    - Use chaining when possible
    - Correct the scrolling on comment correctly set.
2015-10-26 16:49:32 +01:00
Antonin 974148550b Refactoring for better reading 2015-10-26 16:28:59 +01:00
Antonin 0e0becb5c4 Replacing :: by NotificationService:: 2015-10-26 16:26:22 +01:00
Olivier Perez fd5cfe3ca6 Merge branch 'reverse-proxy-https' into 'develop'
Set URLs to https if HTTP X-Forwarded-Proto=https

This line changes all URLs to https URLs if the Framadate installation
is behind a reverse proxy, and the reverse proxy adds the
X-Forwarded-Proto header with the 'https' value. Configuration for
nginx:

> proxy_set_header X-Forwarded-Proto https;

This setup is currently used by the Framadate installation of
Bits of Freedom (https://kies.bof.nl).

See merge request !77
2015-10-26 15:55:08 +01:00
Olivier Perez d652407252 Merge branch 'develop' into 'develop'
Fix issue #98

Placement des radios à côté des labels pour éviter le retour au début du tableau de la barre de scroll (les navigateurs basés sur webkit font le focus sur les radios quand on clique sur les labels) #98 

See merge request !75
2015-10-26 15:21:21 +01:00
Imre Jonk 7ba352f0e5 Set URLs to https if HTTP X-Forwarded-Proto=https
This line changes all URLs to https URLs if the Framadate installation
is behind a reverse proxy, and the reverse proxy adds the
X-Forwarded-Proto header with the 'https' value. Configuration for
nginx:

proxy_set_header X-Forwarded-Proto https;

This setup is currently used by the Framadate installation of
Bits of Freedom (https://kies.bof.nl).
2015-10-26 15:02:02 +01:00
JosephK 761b485d9b Fix issue #98 2015-10-26 13:44:23 +01:00
Antonin 166927f8af Ajaxifisation des commentaires.
- Permet de ne pas perdre ses votes à l'ajout d'un commentaire.
	- On rafraichit aussi à l'envois du commentaire la liste des commentaires.

Fix #3
2015-10-22 22:50:53 +02:00
Olivier Perez 5ffc332b48 Merge branch 'Add_nonHTML_version_to_mails' into 'develop'
Fix #87 Use PHPMailer to add non-HTML body to mails

Utilisation de PHPMailer

See merge request !70
2015-10-22 21:58:46 +02:00
Olivier Perez 1a75a63860 Merge branch 'master' into 'master'
Deux petits corrections, dont une faute d'inattention dans ma traduction

Il faut juste pas oublier cette actualisation, vu qu'aucune autre activité est prévisible à court terme. En fait, je ne sais pas comment agir dans une telle situation. ;-)

See merge request !69
2015-10-22 21:40:06 +02:00
Olivier PEREZ 882203fad8 Fix #87 Use PHPMailer to add non-HTML body to mails 2015-10-22 21:34:15 +02:00
Olivier PEREZ 242b2ca09b Optimise scrolling -> Delete heavy useless JS
(cherry picked from commit 029fcbf470)
2015-10-22 20:33:25 +02:00
Olivier PEREZ 029fcbf470 Optimise scrolling -> Delete heavy useless JS 2015-10-22 20:26:44 +02:00
Olivier Perez c3183d564f Merge branch 'feature/hide_hint_panel' into 'develop'
Cacher le message d'aide

J'ai caché le message d'aide dans un modal qu'on ouvre via le bouton (?).

See merge request !68
2015-10-13 01:08:32 +02:00
Antonin 2b38a7ddd6 Refactoring NotificationService 2015-10-13 01:03:41 +02:00