Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
23
1
Fork 0
Code Issues Pull Requests Releases Activity
1,377 Commits 11 Branches 32 Tags 9.3 MiB
b04f95f0e1
Commit Graph

1377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Thomas Citharel
83ba53dffa Merge branch 'doc/deprecate-changelog' into 'develop' 
Deprecate CHANGELOG.md

See merge request framasoft/framadate!296
 2018-04-12 23:53:57 +02:00
framartin
94f7288446 deprecate CHANGELOG.md 2018-04-12 18:37:46 -03:00
Thomas Citharel
b2fc3a9d53
Remove unneeded Parsedown option 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 18:06:45 +02:00
Thomas Citharel
baadea8e74 Merge branch 'security/parsedown-safe-mode' into 'develop' 
Enable Parsedown Safe-Mode

Closes #226

See merge request framasoft/framadate!293
 2018-04-11 17:52:57 +02:00
Thomas Citharel
075ba1739c
Enable Parsedown Safe-Mode 
Also remove the setUrlsLinked(false) so that we can haz urls

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 17:50:49 +02:00
Thomas Citharel
32492cf119
Update version to 1.1.1 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 15:52:50 +02:00
Thomas Citharel
c5a2f299c5 Merge branch 'bug/send-voters-email' into 'develop' 
Fix link sent by email to voters

Closes #312

See merge request framasoft/framadate!291
 2018-04-11 15:51:54 +02:00
Thomas Citharel
d72cf4ce24
Fix link sent by email to voters 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 15:50:07 +02:00
Thomas Citharel
4035193377
Update locales 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 10:08:14 +02:00
Thomas Citharel
4838577d9d
Release 1.1.0 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 09:59:05 +02:00
Luc Didry
8e8b8a63cb [zanata] fix zanata --min-doc-percent option 2018-04-10 22:36:20 +02:00
Luc Didry
3db84de4aa [zanata] pull locales only if translated at 50% or more 2018-04-10 22:14:10 +02:00
Thomas Citharel
2a33310d4d Merge branch 'build-only-on-stable-tags' into 'develop' 
Build artifacts only on stable tags

Closes #306

See merge request framasoft/framadate!289
 2018-04-10 21:57:20 +02:00
Thomas Citharel
ff7bf2b2a2
Build artifacts only on stable tags 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-10 21:56:01 +02:00
Thomas Citharel
8e6373c964
Version 1.1.0-beta.4 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-10 12:43:47 +02:00
m
f9c3cde701 Merge remote-tracking branch 'framadate/develop' into develop 2018-04-09 22:13:15 +02:00
Thomas Citharel
a092777657 Merge branch 'feature/message-on-poll-creation' into 'develop' 
ajout du message "Le sondage est bien créé."

See merge request framasoft/framadate!286
 2018-04-08 21:56:22 +02:00
Thomas Citharel
412b409397 Merge branch 'bug/vote-rempli-si-erreur-nom' into 'develop' 
Bug/vote rempli si erreur nom

See merge request framasoft/framadate!284
 2018-04-08 21:54:24 +02:00
Thomas Citharel
be1f29773b Merge branch 'bug/test-name-on-vote-edit' into 'develop' 
bug/test name on vote edit

See merge request framasoft/framadate!282
 2018-04-08 21:53:53 +02:00
m
46df3b6fce change test 2018-04-08 11:29:03 +02:00
m
addaa95ce7 using SessionService 2018-04-08 11:21:11 +02:00
m
852c2c0d2a HTML 5 and fixes 2018-04-08 10:46:46 +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
m
179235eaf9 refactoring vote checks 2018-04-06 21:16:28 +02:00
m
c4f27dc6e0 code style 2018-04-06 14:04:07 +02:00