Commit Graph

269 Commits

Author SHA1 Message Date
Thomas De Backer
5951519ad8
restrict custom urls
fixed coding standard issues

added error message to locale

Remove unecessary variable

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-19 08:59:30 +02:00
Thomas Citharel
823c41d2e4
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-15 08:55:34 +02:00
Thomas Citharel
b008bfea9b
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-23 09:07:18 +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
Thomas Citharel
2b351bc3d1
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-20 14:31:18 +02:00
Thomas Citharel
0409256588 Merge branch 'Justine/Issue1' into 'develop'
Collecting polled users emails

Closes #38

See merge request framasoft/framadate!266
2018-04-19 16:55:21 +02:00
Thomas Citharel
abec2cb6a3
Refactor and fix indentation a bit, add a <pre> section for email collection and string changes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-19 16:53:54 +02:00
m
0841675577
ask name and comment before sending comment
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-19 15:12:13 +02:00
Thomas Citharel
aa690bb6d8
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-19 14:52:41 +02:00
m
41578b19c8
error on date poll creation
https://framagit.org/framasoft/framadate/issues/318

code style

modify error message on session expiration

new local text

remove empty string
2018-04-19 14:19:24 +02:00
Thomas Citharel
685d8b5e3d
Move VueJS template to x-template DOM and update strings
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 13:11:17 +02:00
Thomas Citharel
c1ea6ae2a8
Implement saving polls in localstorage and finding them
Also, this brings VueJS and MomentJS in Framadate, 🍾 🎉

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 12:46:01 +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
Luc Didry
b89622695e [i18n] Update translations 2018-04-17 11:56:52 +02:00
Thomas Citharel
4035193377
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-11 10:08:14 +02:00
m
402f2abf64 ajout du message "Le sondage est bien créé."
https://framagit.org/framasoft/framadate/issues/62
2018-04-07 22:32:52 +02:00
Thomas Citharel
2cf458960e
Improve the vote link reminder function
Move the link to a clickable button that copies the link inside the clipboard, and triggers a 2 sec popover to tell it to the user
If the clipboard API fails, the user should be redirected directly to the link

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-06 11:44:11 +02:00
Luc Didry
9ce586347b [i18n] Update translation 2018-04-05 09:12:09 +02:00
m
d2268e8543 Donner le lien d'édition d'un vote lorsqu'on est administrateur
https://framagit.org/framasoft/framadate/issues/209
2018-04-01 17:40:45 +02:00
Marjolaine Vé
3aaa7ee629
Change "Ifneedbe" into "If need be" 2018-03-29 13:13:29 +02:00
Marjolaine Vé
48134d70f7
Add french ecriture inclusive for 2 terms 2018-03-29 13:13:29 +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
Luc Didry
5b5330ceb9 [i18n] Update translations 2018-03-21 09:52:00 +01:00
Luc Didry
cf48c9c2d7 [i18n] update oc translation 2018-03-20 18:06:07 +01:00
Luc Didry
eccae40718 Update translations 2018-03-20 17:10:04 +01:00
Luc Didry
05e9ea1589 Update locales 2018-03-19 16:12:53 +01:00
Pierre Rudloff
f344169157 Missing string in French and English locales 2018-03-19 13:46:46 +01:00
Luc Didry
f340fbe046 Update json locale files (fetched from Zanata) 2018-02-27 17:12:25 +01:00
Luc Didry
1c8e0061b5 [Zanata] Prettyfying locales json files
In order to compare actual json files to zanata-backed files, we need to
sort the keys and have a 3-spaces indent.

This is done with jq:

cd locale/
mkdir tmp/
for i in *.json; do jq --indent 3 -S -M '.' < $i > tmp/$i ; done
mv tmp/* .
rmdir tmp
2018-02-27 17:12:15 +01:00
Tubia
1d89074965 Translate missing italian strings
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 12:08:57 +01:00
Lukas Müller
710304c183 German translation
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 11:44:44 +01:00
Thomas Citharel
7e12443bc2 Merge branch 'develop' into funky 2018-02-20 19:40:51 +01:00
Thomas Citharel
801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
Thomas Citharel
1de98223db Add a check at install to suggest setting session.cookie_httponly inside php.ini
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 17:44:08 +01:00
Marjolaine Vé
c350a7a012 Changement de le·a en le ou la 2018-02-20 17:04:11 +01:00
Marjolaine Vé
f11fd8c541 [FR] Ecriture inclusive 2018-02-20 17:04:11 +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
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
DAVID Titouan
1740a1d949 issue 240 desactivation checkbox resultat public
changement du nom de l'option "resultat visible" dans password en "seul les votes sont proteges"

correction de l'ajout du js pour issue240

correction test pour desactivation dynamique du champ
2018-02-20 10:58:30 +01:00
Thomas Citharel
af8c00f2b5 Merge branch 'feature/description' into 'develop'
Add description meta tag

See merge request framasoft/framadate!205
2018-02-19 10:54:20 +01:00
Thomas Citharel
68a47dba73 Merge branch 'master' into 'master'
Ajout de traductions Allemandes

See merge request framasoft/framadate!207
2018-02-18 23:40:18 +01:00
Thomas Citharel
1b105ba1d8 Merge branch 'dutch-locales' into 'master'
nl translations

See merge request framasoft/framadate!197
2018-02-18 23:40:00 +01:00
Thomas Citharel
3183b54dbf Merge branch 'master' into 'master'
Update it.json - some italian translation

See merge request framasoft/framadate!190
2018-02-18 23:39:24 +01:00
root
10dca1c2c5 update German translations 2018-02-05 13:02:43 +01:00
goofy-bz
f18ce7845d Update fr.json 2018-01-21 11:03:52 +01:00
goofy-bz
4e8d77f9af Update fr.json 2018-01-21 11:01:42 +01:00
Pierre Rudloff
2f2378a80f Add description meta tag 2018-01-16 14:04:02 +01:00
Yannick Francois
b93ff95a54 Corrige une faute d'anglais dans la clé d'un message 2018-01-04 22:53:18 +01:00
SpF
2bc9eb62d0 nl translations 2017-12-20 11:35:50 +01:00
Nikos
6a2ee5604e Update it.json - some italian translation 2017-09-13 13:31:15 +02:00