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

1496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
m
f921d383a9 bug/test-name-on-vote-edit 2018-04-06 14:00:20 +02:00
m
c180090a59 rebase 
Merge branch 'bug/vote-rempli-si-erreur-nom' of https://framagit.org/mm/framadate into bug/vote-rempli-si-erreur-nom
 2018-04-06 12:20:53 +02:00
m
659cb1ec75 correction CI 2018-04-06 12:19:15 +02:00
m
445dac2e51 Ne pas effacer les sélections après l'erreur "Vous avez déjà voté" 
https://framagit.org/framasoft/framadate/issues/194
 2018-04-06 12:19:15 +02:00
Thomas Citharel
20e5f5c130 Merge branch 'develop' into 'master' 
Version 1.1.0-beta.3

See merge request framasoft/framadate!281
 2018-04-06 12:04:45 +02:00
Thomas Citharel
cb03c5c054
Check locales only on develop 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 11:51:08 +02:00
Thomas Citharel
f470d63ab0 Merge branch 'improve-vote-link' into 'develop' 
Improve the vote link reminder function

Closes #307

See merge request framasoft/framadate!280
 2018-04-06 11:48:05 +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
Thomas Citharel
f2078ce2f5 Merge branch 'debug-ci-artifacts' into 'develop' 
Debug CI Artifacts

Closes #304

See merge request framasoft/framadate!279
 2018-04-06 10:07:09 +02:00
Thomas Citharel
a4ad96c78f
Put correct rights on produced zip 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 10:06:34 +02:00
Thomas Citharel
e6f6df5eb6
Version 1.1.0-beta.3 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:53:50 +02:00
Thomas Citharel
c27c747726 Merge branch 'improve-tests' into 'develop' 
Improve tests a bit

See merge request framasoft/framadate!278
 2018-04-06 09:48:20 +02:00
Thomas Citharel
f726adf2ee Merge branch 'bug/undefined-offset-on-best-choices' into 'develop' 
bug/undefined-offset-on-best-choices

See merge request framasoft/framadate!277
 2018-04-06 09:46:50 +02:00
Thomas Citharel
2c3dfa8f59
Improve tests a bit 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:46:30 +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
Thomas Citharel
37df499a37 Merge branch 'bug/send_edit_link_by_email_action' into 'develop' 
correction : Les mails aux sondés contenant le lien d'édition du vote ne partent pas

See merge request framasoft/framadate!276
 2018-04-06 09:13:39 +02:00
m
c79b32984d bug/undefined-offset-on-best-choices 2018-04-05 17:34:43 +02:00
Luc Didry
0151361cc9 [i18n] Add check-trad job + pull locales when deploying to beta 2018-04-05 10:46:55 +02:00
Luc Didry
9ce586347b [i18n] Update translation 2018-04-05 09:12:09 +02:00
m
4e4e21cef2 correction CI 2018-04-04 23:01:57 +02:00
m
54fd8464d9 Ne pas effacer les sélections après l'erreur "Vous avez déjà voté" 
https://framagit.org/framasoft/framadate/issues/194
 2018-04-04 22:18:53 +02:00
m
a003254c7d Les mails aux sondés contenant le lien d'édition du vote ne partent pas 
https://framagit.org/framasoft/framadate/issues/221
 2018-04-04 20:03:55 +02:00
Thomas Citharel
5b4b8a8606 Merge branch 'feature/adresse-email-Nom-de-domaine-internationalisé-2' into 'develop' 
Feature/adresse email nom de domaine internationalisé

Closes #233

See merge request framasoft/framadate!274
 2018-04-03 20:30:57 +02:00
Thomas Citharel
a367a4abac Merge branch 'feature/lien-edition-vote' into 'develop' 
Donner le lien d'édition d'un vote lorsqu'on est administrateur

See merge request framasoft/framadate!267
 2018-04-03 20:20:01 +02:00
m
25e62c238d Merge branch 'mm/framadate-feature/adresse-email-Nom-de-domaine-internationalisé' into develop 2018-04-03 20:07:49 +02:00
m
6f257f416a fix code style 2018-04-03 14:09:18 +02:00
m
599f3104f6 new test for InputService -> filterMail 2018-04-03 13:21:47 +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
Thomas Citharel
3c9b8d3708 Merge branch 'trim-mail' into 'develop' 
add trim function in order to delete the blank characters in mail input

See merge request framasoft/framadate!272
 2018-04-03 09:36:25 +02:00
Anael
9da92fd775
issues 237, add trim function in order to delete the blank characters in mail input 2018-04-03 09:32:29 +02:00
Thomas Citharel
72de7bff1c Merge branch 'bug/sondage-avec-smtp-désactivé' into 'develop' 
correction : Adresse e-mail d'un sondage avec SMTP désactivé

See merge request framasoft/framadate!270
 2018-04-03 09:27:37 +02:00
m
d1870e516e
Adresse e-mail d'un sondage avec SMTP désactivé 
https://framagit.org/framasoft/framadate/issues/301

retour pour recherche d'une autre solution

Adresse e-mail d'un sondage avec SMTP désactivé
https://framagit.org/framasoft/framadate/issues/301

CS

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-03 09:26:31 +02:00
Thomas Citharel
56d6e015c1 Merge branch 'add-git-to-beta-deploy' into 'develop' 
Add git to beta.framadate.org deploy so that we can be sure on which revision we're on

See merge request framasoft/framadate!271
 2018-04-02 11:34:12 +02:00
Thomas Citharel
37c2df781a
Add git to beta.framadate.org deploy so that we can be sure on which revision we're on 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-02 11:32:08 +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
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
Thomas Citharel
6855cf4a47 Merge branch 'develop' into 'master' 
Version 1.1.0-beta.2

See merge request framasoft/framadate!265
 2018-03-29 13:50:18 +02:00
Thomas Citharel
48c3551e61 Merge branch 'feature/traduction-fr' into 'develop' 
Traductions

See merge request framasoft/framadate!257
 2018-03-29 13:32:41 +02:00