Commit Graph

1464 Commits

Author SHA1 Message Date
Thomas Citharel
3ba045791f Merge branch 'dbal' into 'develop'
Make Framadate compatible with PostgreSQL and great again !

Closes #90 et #179

See merge request framasoft/framadate!305
2018-04-22 18:55:55 +02:00
Thomas Citharel
7f41eb831c
Remove class FramaDB and unused call
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-22 18:45:30 +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
Quentin Dupont
235002cd24 Warn when url has a wrong format 2018-04-22 12:54:12 +02:00
Thomas Citharel
c4e9cb59d3 Merge branch 'bug/button-create-poll-step-2' into 'develop'
bug/button-create-poll-step-2

See merge request framasoft/framadate!308
2018-04-21 11:56:56 +02:00
m
8e8ffedc4a bug/button-create-poll-step-2 2018-04-20 20:11:10 +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
17c264721e Merge branch 'bug/send-comment-button' into 'develop'
Bug/send comment button

See merge request framasoft/framadate!307
2018-04-20 09:24:37 +02:00
m
e379b58d58 bug/send-comment-button 2018-04-20 09:17:37 +02:00
m
b2a550d09b Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop 2018-04-19 21:53:28 +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
Thomas Citharel
b24cc43c85 Merge branch 'bug/better-handle-undefined-config-values' into 'develop'
Bug/better handle undefined config values

See merge request framasoft/framadate!304
2018-04-19 15:33:56 +02:00
Thomas Citharel
4c4fb1557f Merge branch 'feature/ask-name-and-comment-before-sending' into 'develop'
feature/ask name and comment before sending

See merge request framasoft/framadate!285
2018-04-19 15:21:49 +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
Thomas Citharel
06c3a8a078 Merge branch 'bug/create-date-poll-step-2' into 'develop'
Bug/create date poll step 2

See merge request framasoft/framadate!302
2018-04-19 14:20:54 +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
m
81092482af Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop 2018-04-19 14:14:42 +02:00
Thomas Citharel
290ec002d5 Merge branch 'feature/files-cleaning' into 'develop'
Feature/files cleaning

See merge request framasoft/framadate!306
2018-04-19 14:06:16 +02:00
m
3330d28f29
nettoyage de printemps
clean type test
2018-04-19 14:05:22 +02:00
m
fb7c5e2f12 fork-awesome enabled by default 2018-04-18 17:05:20 +02:00
m
cc0f572335 Better handle undefined config values
https://framagit.org/framasoft/framadate/issues/322
2018-04-18 16:49:02 +02:00
m
0b598b8e80 Merge branch 'develop' of https://framagit.org/framasoft/framadate into develop 2018-04-18 16:14:33 +02:00
Thomas Citharel
2627dc2ae6
Fixup for find_polls with empty localstorage
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 13:33:38 +02:00
Thomas Citharel
1a3081b58d Merge branch 'save-poll-localstorage' into 'develop'
Implement saving polls in localstorage and finding them

Closes #235

See merge request framasoft/framadate!283
2018-04-18 13:12:49 +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
7a12d98943
Handle localstorage empty or failure properly
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-18 12:46:02 +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
Thomas Citharel
6dd8fb1723 Merge branch 'feature/clean-demo-poll' into 'develop'
Feature/clean demo poll

See merge request framasoft/framadate!297
2018-04-18 11:13:27 +02:00
Luc Didry
b89622695e [i18n] Update translations 2018-04-17 11:56:52 +02:00
Luc Didry
7d9f5becec Add script to add a key/value in locale/en.json + put all scripts in scripts/ 2018-04-17 11:46:15 +02:00
m
5b2a40ac58 Merge remote-tracking branch 'framadate/develop' into develop 2018-04-16 07:32:46 +02:00
m
0f4587adf8 less often demo cleaning 2018-04-15 23:30:40 +02:00
Thomas Citharel
59569071e8 Merge branch '1.1.4-bugfix' into 'master'
1.1.4 bugfix

See merge request framasoft/framadate!301
2018-04-15 12:23:57 +02:00
Thomas Citharel
30e77a77c4
Version 1.1.4
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 12:21:56 +02:00
Thomas Citharel
367b239549
Provide Fork-Awesome and add an option to disable it (should be useful on installations with Framanav)
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Use fork-awesome minified css

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 12:21:27 +02:00
Thomas Citharel
3878c3ce7c Merge branch 'fork-awesome' into 'develop'
Fork awesome

See merge request framasoft/framadate!300
2018-04-15 12:19:31 +02:00
Thomas Citharel
a004576592
Provide Fork-Awesome and add an option to disable it (should be useful on installations with Framanav)
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Use fork-awesome minified css

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 12:17:35 +02:00
m
081fdae5f5 code style 2018-04-15 11:59:40 +02:00
Thomas Citharel
8528a7fe65
Update version to 1.2.0 on develop
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 11:41:03 +02:00
Thomas Citharel
8ce671e4d9 Merge branch '1.1.3-bugfix' into 'master'
1.1.3 bugfix

See merge request framasoft/framadate!299
2018-04-15 11:35:10 +02:00
Thomas Citharel
901f907dd4
Release Version 1.1.3
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 11:33:39 +02:00
m
a80602e3d5
bug/error-on-empty-choices 2018-04-15 11:30:28 +02:00
Thomas Citharel
c723c81697 Merge branch 'bug/error-on-empty-choices' into 'develop'
Bug/error on empty choices - 1.1.0

See merge request framasoft/framadate!298
2018-04-15 11:29:27 +02:00
m
afd83efd79
bug/error-on-empty-choices 2018-04-15 11:28:27 +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