Commit Graph

659 Commits

Author SHA1 Message Date
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
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
Antonin
2b38a7ddd6 Refactoring NotificationService 2015-10-13 01:03:41 +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
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
Olivier Perez
f377365c5b Merge branch 'master' into 'master'
Fix css header responsive + Framanav

Les 2 derniers commits cassent la présentation de l'entête : plus de trait horizontal, sous-titre décalé et message d'erreur/confirmation se retrouvent placés en haut.
C'est corrigé (compris ce qui déconnait ;) )

J'en ai profité pour placer la nav au bon endroit et ne l'activer que sur les sites en *framadate.org
(J'ai pas vérifié que ça marchait, je te laisser tester sur beta/openbar et me dire si jamais ça ne va pas…)

See merge request !62
2015-09-21 11:35:29 +02:00
JosephK
e3ef7e564a Fix css header responsive 2015-09-21 10:24:25 +02:00
JosephK
9a3590a9e1 Fix css header + Framanav 2015-09-21 10:03:18 +02:00
Olivier PEREZ
5ebd83e681 Fix responsive header 2015-09-20 13:39:35 +02:00
Olivier PEREZ
2a6b8acfe1 Some responsive 2015-09-19 17:01:07 +02:00
Olivier PEREZ
c5236ec3b3 Merge branch 'release/0.9' into 'master' 2015-09-19 16:46:19 +02:00
Olivier Perez
5b4bfad392 Merge branch 'release/0.9' into 'release/0.9'
Make chart button wraps

On small screens, the chart button is too large.

See merge request !59
2015-09-19 16:45:30 +02:00
Olivier PEREZ
d2e50afe31 Update INSTALL.md to use install.php 2015-09-19 16:42:08 +02:00
Olivier PEREZ
46afefb696 Fix RPad migration 2015-09-19 16:08:50 +02:00