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
JosephK
c06abca356
Fix "Votre nom" trop petit pour la saisie lorsqu'il y a un grand nombre de colonnes.
2015-09-24 17:27:29 +02:00
Olivier PEREZ
f634e36344
Replace HR with DIV
2015-09-23 22:18:22 +02:00
Michael Uplawski
46cff48402
Cooler.
2015-09-23 18:43:59 +02:00
Michael Uplawski
9cd8b1faff
Typo / faute d'inattention.
2015-09-23 18:42:31 +02:00
Olivier Perez
9daef4b09e
Use __f to format some messages
2015-09-23 13:47:35 +02:00
Olivier Perez
929d92da6b
Merge branch 'toothbrush/framadate-release/0.9'
...
Conflicts:
locale/en.json
2015-09-23 13:41:07 +02:00
Olivier Perez
e591aaf633
Merge branch 'master' into 'master'
...
Master
Quelques corrections pour la version allemande.
Il y aura certainement d'autres.
See merge request !63
2015-09-22 16:56:16 +02:00
Michael Uplawski
c1eab5089a
Footer now with text.
...
Donations to french associations are probably not deductible in Germany. So the German text must include the constraint “in France” / „in Frankreich“.
2015-09-22 16:02:21 +02:00
Michael Uplawski
fdee49c5d8
ça y est de ma part
2015-09-22 11:13:54 +02:00
Michael Uplawski
5f605b44af
more corrections
2015-09-22 10:25:41 +02:00
Michael Uplawski
681b5b2df7
more corrections
2015-09-22 10:18:17 +02:00
Michael Uplawski
5a08d43543
Corr.
2015-09-22 09:59:45 +02:00
Michael Uplawski
d6a38cd315
Sabotage-Fix. Des corrections pour la version allemande... peut-être..??!
2015-09-22 09:52:38 +02:00
Michael Uplawski
f8a2a0beb4
Version Allemande : Quelques corrections et traductions manquant jusqu'à maintenant.
2015-09-22 09:41:03 +02:00
JosephK
74d5d87dae
Oups… :-/
2015-09-21 13:06:47 +02:00
