Commit Graph

155 Commits

Author SHA1 Message Date
Paul B
e8620026cf
refacto(logService): add a new logEntries method to the log service
As a followup to #362 this is a small addition to the log service when
we want to log a list of entries into a single message.

The log service can itself make sure to escape commas instead of
expecting callers to do so.
2019-04-15 16:07:32 +02:00
Paul B
dc164c4d79
fix(admin/add_column): stop modifying user input in stored data
An [earlier
change](892fa11373)
modifed the user's input when creating new columns in an existing
Poll.

Indeed all `,` comma were replaced by `-` dashes and the user inputs
was saved as such.

It seems the rational behind it was to keep the existing "formatting"
of log messages where different elements were separated by commas.

This commit makes sure to not strip the users' data but only the
logged message.

Fixes #384
2019-04-15 15:05:26 +02:00
Luc Didry
6b3c5f0610
WIP Working on locales 2018-08-14 14:35:08 +02:00
Thomas Citharel
5e43c1974d Merge branch 'master' into develop 2018-08-14 14:26:15 +02:00
Thomas Citharel
5ffd4361e4 Fix #358, #355 and #342
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:06:23 +02:00
Thomas Citharel
e7d5b1762e Merge tag '1.1.7' into develop 2018-07-09 15:53:59 +02:00
Thomas Citharel
a6e337e046 Fix issue with limit of participants
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 15:50:46 +02:00
Thomas Citharel
f861b77326 Merge tag '1.1.6' into develop 2018-07-09 12:26:38 +02:00
Thomas Citharel
bc28281477 Update deps and bump PHPMailer to version 6
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 12:17:33 +02:00
Thomas Citharel
d6c2f01457
Introduce an use_sendmail option
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 15:50:35 +02:00
Thomas Citharel
4c0c2a16f9
Small fixes
Change CollectMail class name, add a title on voters name in admin with email value

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 12:36:18 +02:00
Meteor-Furet
feb0c1e6ce
Modification collect_users_mail de bool à int (MAJ de la création d'un sondage) 2018-05-25 11:39:28 +02:00
PICHOU Kyâne
a64e182076 Fix missing beginTransaction() 2018-05-16 21:55:54 +02:00
Thomas Citharel
87a61ebea3
Couple of fixes following DBAL migration
* Make sure we save timestamp as a string (🙈) inside slot table
* Make sure to set poll format properly at creation
* More Repository methods use DBAL specifics
* Clear legacy check all tables call

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-23 10:27:15 +02:00
Thomas Citharel
006a191544
Make Framadate compatible with PostgreSQL and great again !
* Move the database handling to Doctrine DBAL
* Move Migrations to Doctrine Migrations
* Rename migrations for Doctrine Migrations Uses
* Fix Migrations
* Change config parameters, introduce db name, host and port parameters and get rid of database url
* Change install form for this
* Add a CLI command to make migrations
* Add config.test.php to be used with APP_ENV=test for testing

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

CS

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add sqlite to CI and execute migration in test env

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Typo

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

SQLite is already inside the image...

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Rebase two new migrations

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Move from trait to abstract class and remove legacy migration table after checks

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

CS

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Move doctrine command path inside CI

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Move abstract migration class to correct namespace and remove unused command

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

CS

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Check for legacy migration table existence

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Check if legacy migration table exists before deleting it

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add messages for skipped migrations and fix an issue with MySQL ERR_NO_DATE Migration

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-22 18:37:53 +02:00
JMarlow
68d5b64180
Collecting Polled Users Emails
Modification de la BDD : ajout de la colonne mail dans la table vote

Modification de la BDD : ajout de la colonne mail dans la table vote (bis)

MAJ de VoteRepository : méthode insert et update

MAJ de PollService : méthodes updateVote, addVote et splitVotes

Modification studs.php, adminstuds.php et vote_table_date.tpl : OK pour l'ajout d'un vote avec nom + mail

Modification de vote_table_classic.tpl : OK pour l'ajout d'un vote avec nom + mail

Ajout d'un bouton enveloppe pour chaque colonne avec méthode de traitement pour test

Le numéro de la colonne est enfin récupéré correctement

Implémentation récupération des adresses mails des sondés intéressants dans adminstuds.php et appel d'un fichier display_mails.tpl qui affichent ces adresses mails.

Extension du traitement pour les sondages classic

Ajout récupération des adresses des non aussi, et ajouts de tests pour l'affichage

Changement des input type=text en type=email

Corrections automatiques pour passage pipelines

Corrections suite aux remarques sur la merge request

Corrections 2 suite aux remarques sur la merge request

Corrections 3 suite aux remarques sur la merge request

Modif BDD : ajout colonne collect_mail dans poll

Modif classes Form, PollRepository

Passage de la collecte des mails des sondés en fonctionalité optionnelle

Si la collecte de mail est activée, la saisie du mail est obligatoire

Ajout avertissements collect_mail + editableByAll dans création de sondage et tableaux de vote

Update create poll string and put a danger background on warning

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Translation strings updated and better position for the email public warning message

Also, a CSS tweak and cleanup

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

CS

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 12:34:08 +02:00
m
0f4587adf8 less often demo cleaning 2018-04-15 23:30:40 +02:00
m
081fdae5f5 code style 2018-04-15 11:59:40 +02:00
m
00b871df5c nettoyage du sondage de démonstration
https://framagit.org/framasoft/framadate/issues/316
2018-04-14 08:48:24 +02:00
m
3b54590bde IC 2018-04-13 21:26:00 +02:00
m
6455f4be87 nettoyage du sondage de démonstration
https://framagit.org/framasoft/framadate/issues/316
2018-04-13 21:24:43 +02:00
m
46df3b6fce change test 2018-04-08 11:29:03 +02:00
m
179235eaf9 refactoring vote checks 2018-04-06 21:16:28 +02:00
m
f921d383a9 bug/test-name-on-vote-edit 2018-04-06 14:00:20 +02:00
Thomas Citharel
08f7ca141d
CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-06 09:43:32 +02:00
Thomas Citharel
61ac8fcf76
Refactor a bit
Also fix utf8 issue on licence file

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-06 09:40:53 +02:00
m
c79b32984d bug/undefined-offset-on-best-choices 2018-04-05 17:34:43 +02:00
m
6f257f416a fix code style 2018-04-03 14:09:18 +02:00
Mathieu
1d8244fd99 correction : filtre adresse e-mail avec nom de domaine internationalisé
https://framagit.org/framasoft/framadate/merge_requests/268
2018-04-03 12:30:37 +02:00
m
cdd1840217 correction : filtre adresse e-mail avec nom de domaine internationalisé
https://framagit.org/framasoft/framadate/issues/233
2018-04-01 19:29:32 +02:00
Thomas Citharel
7134581535
Fix ValueMax validation and improve error messages for username format
Closes #295
New translation strings
Check that ValueMax is >= 1
Show details if error in advanced settings
Correctly show error message for ValueMax
Make email field an email one
Make username, email (if smtp of course) and title required html inputs

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-29 12:54:48 +02:00
Thomas Citharel
129dcba693 Merge branch 'allow-smtp-config' into 'develop'
Allow setting SMTP config

Closes #192 and #150

See merge request framasoft/framadate!224
2018-03-21 14:30:50 +01:00
Thomas Citharel
26761c97a6 CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:26:00 +01:00
Thomas Citharel
7ffd7f0b21 Fix unable to vote with ConcurrentVoteException when ValueMax is null
Closes #276

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:23:35 +01:00
Simon LEBLANC
8720595874 Allow setting SMTP config
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 11:07:11 +01:00
Thomas Citharel
77f05b1c21 fix issue with check for maxValue
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 19:29:56 +01:00
Thomas Citharel
801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
Thomas Citharel
a442cc5ee7 CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 16:50:14 +01:00
Thomas Citharel
ff47a21ac2 Check that conditions on valueMax are acceptable before adding the vote
Handles people voting when the answers valueMax has been reached by someone else in the background

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 16:47:10 +01:00
Thomas Citharel
76b19ee9ba fix votes wrongly calculated because of type check
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 15:17:14 +01:00
Thomas Citharel
2d39a83a7f rebase and run php-cs-fixer
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 14:15:18 +01:00
Erwan TERTRAIS
64ff414900 ValueMax : limit the number of voters per option
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 14:15:18 +01:00
Thomas Citharel
3157d6a590 Run php-cs-fixer with a custom config. This may break a lot of things
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:43:30 +01:00
Antonin
8f6a31737d Merge branch 'fix/Some_fixes_on_comments' into 'master'
Some fixes on comments

Fix #205 

See merge request !161
2016-12-06 15:34:30 +01:00
Olivier PEREZ
79ae5bb77d Fix the code that checks if we should send notification regarding type of notification 2016-11-14 23:35:04 +01:00
Olivier Perez
651289ec2d Merge branch 'bugfix/typo-in-comment-header' into 'develop'
Correcting comment typo in file header

Fix #190 

See merge request !144
2016-08-04 22:26:50 +02:00
Olivier Perez
fa5014de32
Fixed expiry date edition 2016-06-30 20:48:30 +02:00
Antonin
b739683d96 Install : check that the config.php file is written. 2016-05-04 01:27:51 +02:00
Antonin
8085dd3c3e Adding remove key functionnality to SessionService 2016-04-29 19:38:00 +02:00
Olivier PEREZ
0ffdbe8573 Merge branch 'master' into develop 2016-03-05 15:59:10 +01:00