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
Olivier PEREZ
69a5bc2e1c
Hide poll hint into a modal
2015-10-13 00:42:33 +02:00
Olivier PEREZ
fe8f779217
Merge branch 'master' into develop
2015-10-12 23:58:57 +02:00
Olivier Perez
67134126b6
Merge branch 'fix/dont_sort_moments' into 'master'
...
Stop sorting the moments
- Don't sort moments at poll creation
- Don't sort moments at slot insertion
See merge request !65
2015-10-12 23:52:00 +02:00
Olivier PEREZ
6ce54e48d8
Fix after merge
2015-10-12 23:49:05 +02:00
Olivier PEREZ
4fa4ee0acc
Merge branch 'master' into develop
...
Conflicts:
admin/migration.php
2015-10-12 23:46:02 +02:00
Olivier Perez
76c2077100
Merge branch 'develop' into 'develop'
...
Timestamp on comments
The comments are now timestamped
See merge request !66
2015-10-12 23:39:30 +02:00
Olivier Perez
76c56a69ec
Merge branch 'master' into 'master'
...
If SMTP is enabled, 'private result' option is still activated.
'private result' option was hidded when the SMTP was not used.
See merge request !67
2015-10-12 23:36:35 +02:00
Olivier PEREZ
73af05cfee
Fix #77 Add question mark to home button
2015-10-12 23:32:24 +02:00
Antonin
0e8ee276e7
If SMTP is enabled, 'private result' option is still activated.
2015-10-12 23:29:53 +02:00
Olivier PEREZ
49a5350f90
Fix #83 Stop sorting moments at new slot insertion
2015-10-12 23:25:51 +02:00
Olivier PEREZ
c6c9546669
Fix #83 Stop sorting moments at poll creation
2015-10-12 23:25:49 +02:00
Antonin
6196a53a45
Display the comment timestamp
2015-10-12 23:14:21 +02:00
Olivier Perez
19f98558f1
Merge branch 'master' into 'master'
...
The name can be any value.
There is no reason to limit the caracters that can be used in the name.
Thus, removing the regex.
Fix #97
See merge request !64
2015-10-12 22:54:15 +02:00
Antonin
af95ceb06e
French admin translation typo
2015-10-12 22:28:27 +02:00
Antonin
ba9a444f33
Adding a date column in the comment table
2015-10-12 22:26:22 +02:00
Antonin
82876c573e
Set a length to comment table's name column
...
The name column was of text type. Passed to VARCHAR(64), like the poll name column.
2015-10-12 21:59:45 +02:00
Antonin
de18f826f0
The name can be any value.
...
There is no reason to limit the caracters that can be used in the name.
Thus, removing the regex.
Fix #97
2015-10-12 21:26:13 +02:00
Olivier Perez
8d543f7c23
Fix path to install.php => /admin/install.php
2015-10-08 10:51:12 +02:00
Olivier PEREZ
892fa11373
Don't allow ',' in slot labels
2015-10-05 23:59:43 +02:00
Olivier PEREZ
d17ba242d3
Add log when adding a slot manually
2015-10-05 23:54:50 +02:00
Olivier PEREZ
7cd51d38f3
Fix deletion when slot label contains html specific characters
2015-10-05 23:51:29 +02:00
Olivier PEREZ
4b6f7b685e
getUrlSondage: Cannot define links for EDIT and ACTION at the same time
2015-10-05 23:50:51 +02:00
Olivier PEREZ
b61f60155e
Fix the check for deleting the last slot
2015-10-05 23:50:00 +02:00
Olivier PEREZ
112c6e29e7
Add 2 keys in en.json
2015-10-05 21:07:00 +02:00
