Paul B
9dd1a6ecf9
refacto: factorise code between date_poll and classic_poll creation
...
The last confirmation step during poll creation flow is identical
between date polls and classical polls.
This commit moves the code in the `PollService` to be used in both
creation poll controllers.
2019-04-19 15:52:28 +02:00
Paul B
dd55b7444c
MailService: expose a function 'isEnabled'
...
The `use_smtp` configuration key really means: Are emails enabled?
Indeed the 'smtp' naming is here for legacy reasons. (cf #425 )
2019-04-19 15:52:28 +02:00
Paul B
f0b38fdb42
sessionService: use a generic removeAll function to unset FORM data
...
Instead of manually removing entries in the SESSION object, let the
SessionService do the work in creating poll controllers.
2019-04-19 15:52:27 +02:00
Paul B
5d74a5600d
cleanup: backport changes from date_poll into classic_poll
...
The last action of creatin a poll is the same code between classical
and date polls.
This commit backports the minor refactoring to have the exact same
code.
(done with ediff to make sure the code was similar)
2019-04-19 15:52:26 +02:00
Thomas Citharel
705abe6cd6
Merge branch 'ci-migration-testing' into 'develop'
...
ci: some cleanup of the gitlab-ci file and testing migrations on MySQL
See merge request framasoft/framadate/framadate!388
2019-04-19 14:32:56 +02:00
PaulR
c26fef6b39
CI: cleanup the gitlab-ci yml file and test MySQL and PostgreSQL migrations
...
This commit splits the `test` job into three separate jobs:
- test
- lint
- db:migrate
It also factorise some code, and remove useless use of git checkout
2019-04-19 14:32:56 +02:00
Thomas Citharel
d87ca39693
Merge branch 'locales/pot-change-after-387' into 'develop'
...
Update pot after !387
See merge request framasoft/framadate/framadate!392
2019-04-19 13:51:48 +02:00
Thomas Citharel
2c056068de
Update pot after !387
...
(also make sure it's pushed to Zanata)
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-19 13:50:50 +02:00
Thomas Citharel
36bff4d5cc
Merge branch 'localize-date-placeholders' into 'develop'
...
i18n: localize the date format placeholders
See merge request framasoft/framadate/framadate!387
2019-04-19 13:38:41 +02:00
Thomas Citharel
b63e90e53f
Merge branch 'docker/smtp' into 'develop'
...
Add development SMTP server in docker-compose
See merge request framasoft/framadate/framadate!391
2019-04-19 13:35:21 +02:00
Liquidsoul
e03ad97382
Add development SMTP server
2019-04-19 12:59:13 +02:00
Pierre de La Morinerie
fe5d28e394
i18n: use full nouns in date placeholders
2019-04-18 15:44:06 +02:00
Pierre de La Morinerie
78714069f0
i18n: localize the date format placeholders
...
For instance, when using French, display the date input placeholder
as "jj/mm/aaaa" (instead of "dd/mm/yyyy").
This doesn't change the way dates are actually parsed – only what is
displayed to the user changes.
2019-04-18 12:18:02 +02:00
Thomas Citharel
c9382973ca
Merge branch 'locales/add-locales-for-385' into 'develop'
...
Add locales for !385
See merge request framasoft/framadate/framadate!386
2019-04-18 12:07:56 +02:00
Thomas Citharel
a0d29ea0d5
Add locales for !385
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-18 12:06:55 +02:00
Thomas Citharel
4bd8e248e0
Merge branch 'fix-expiry-date' into 'develop'
...
locales: fix missing "Expiry date" key
See merge request framasoft/framadate/framadate!385
2019-04-18 12:00:34 +02:00
Pierre de La Morinerie
ee4053c524
locales: fix missing "Expiry date" key
2019-04-18 11:56:48 +02:00
Thomas Citharel
93d9f44bb1
Merge branch 'mail/templates' into 'develop'
...
Extract mail content creation and sending into the NotificationService
See merge request framasoft/framadate/framadate!382
2019-04-18 11:24:07 +02:00
Liquidsoul
c72dfa17b8
Extract mail creation for FindPollsByMail into NotificationService
2019-04-17 17:41:21 +02:00
Liquidsoul
26d3552276
Move edit link mail notification to NotificationService
2019-04-17 17:41:21 +02:00
Liquidsoul
fb05b82e66
Use NotificationService to send poll creation mails
2019-04-17 17:41:20 +02:00
Liquidsoul
8dcea674e8
Add notificationservice->sendPollCreationMails
2019-04-17 17:41:20 +02:00
Liquidsoul
ad8f8ab22c
Extract creation mails content into smarty templates
2019-04-17 17:41:20 +02:00
Liquidsoul
29e599983e
Add smarty dependency on NotificationService
2019-04-17 17:41:20 +02:00
Thomas Citharel
4f7e858ed3
Merge branch 'locales/fix-date-format' into 'develop'
...
Fix date format
See merge request framasoft/framadate/framadate!381
2019-04-17 17:32:01 +02:00
Thomas Citharel
3cebdfa1ea
Fix date format
...
Parsing and displaying
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-17 17:30:12 +02:00
Thomas Citharel
89d94fb16b
Merge branch 'mm/framadate-bug/datepicker-disable-selected-dates' into 'develop'
...
Fix already selected days not being highlighted
Closes #361
See merge request framasoft/framadate/framadate!380
2019-04-17 16:22:09 +02:00
m
f2b57fec9b
correct #361
2019-04-17 16:15:14 +02:00
Thomas Citharel
d50305afb3
Merge branch 'workaround-datepicker-below-modal-safari' into 'develop'
...
Workaround the datepicker appearing below the add_days modal on Safari
See merge request framasoft/framadate/framadate!379
2019-04-17 16:12:30 +02:00
Thomas Citharel
1062f72d56
Merge branch 'fix-trads' into 'develop'
...
scripts: fix translations
See merge request framasoft/framadate/framadate!377
2019-04-17 16:01:03 +02:00
Nicolas Bouilleaud
61c449205c
Workaround the datepicker appearing below the add_days modal on Safari
...
The correct solution would probably be to upgrade the version of bootstrap and bootstrap-datepicker that we use
My understandng of the bug is:
* bootstrap-datepicker finds the first ancestor whose z-index isn’t auto, and sets its own z-index to the found elemenents z-index + 10.
* On Firefox and Chrome, the modal element is returned (its z-index is 1050)
* On Safari, the modal-dialog element is found. Its z-index is auto, but Safari reports this as '0', which makes the z-index of the datepicker 10.
2019-04-17 15:51:00 +02:00
Pierre de La Morinerie
20c324a018
templates: fix localisation of a string
2019-04-17 15:09:08 +02:00
Pierre de La Morinerie
d110ee558f
scripts: fix translations
...
Translations with a comma in the key are rewritten to be on a single
line.
But this failed when the comma was just preceded by a dot (like in
`etc.,`).
Fix the script so that it works even in those cases.
2019-04-17 12:51:37 +02:00
Thomas Citharel
723cf83484
Merge branch 'locale/update' into 'develop'
...
Update locales
See merge request framasoft/framadate/framadate!376
2019-04-17 10:18:23 +02:00
Thomas Citharel
b73ce470b8
Update locales
...
Following !373
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-17 10:16:53 +02:00
Thomas Citharel
fd2d00b2f6
Merge branch 'feature/prevent-leaving' into 'develop'
...
Prevent leaving in case of vote started or comment written but not submitted
See merge request framasoft/framadate/framadate!373
2019-04-17 10:11:11 +02:00
Thomas Citharel
ec939a8a30
Merge branch 'framadate-bug/limit_end_date_when_updating_poll' into 'develop'
...
Limit end date when updating poll (#336 )
See merge request framasoft/framadate/framadate!372
2019-04-16 16:14:15 +02:00
Thomas Citharel
0fb673457b
Merge branch 'improvement/better-default-domain-with-docker' into 'develop'
...
Improvement/better default domain with docker
See merge request framasoft/framadate/framadate!371
2019-04-16 16:13:23 +02:00
2e87e1f761
Fixed the previous fix about end_date bug in case of too far date.
2019-04-16 16:06:00 +02:00
38552da738
Updated AdminPollService to limit end_date ( #336 ).
2019-04-16 16:06:00 +02:00
Paul B
6d9130ef84
refacto(utils): remove a useless intermediate variable
...
This is the commit of the suggestion I made here:
https://framagit.org/framasoft/framadate/framadate/merge_requests/344/diffs#note_399810
2019-04-16 16:04:27 +02:00
Marc Karassev
3ec6435323
Made docker-compose generate a configuration forcing the domain to be set to $_SERVER['SERVER_NAME'] in order to properly get assets while accessing the website from another device.
2019-04-16 15:58:57 +02:00
Thomas Citharel
4b8de04f60
Merge branch 'locales/fix-again' into 'develop'
...
Fix missing locales (again…)
See merge request framasoft/framadate/framadate!370
2019-04-16 15:58:12 +02:00
Thomas Citharel
5fb1887497
Fix missing locales (again…)
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-16 15:57:00 +02:00
Marc Karassev
b58e61c575
Handled domain determination when constant APP_URL is defined but empty.
...
Now the bahavior matches the comments in config.php:
// Fully qualified domain name of your webserver.
// If this is unset or empty, the servername is determined automatically.
// You *have to set this* if you are running Framadate behind a reverse proxy.
// const APP_URL = '<www.mydomain.fr>';
2019-04-16 15:56:28 +02:00
Antonin
d819327c61
Prevent leaving in case of vote started or comment written but not submitted
2019-04-16 15:36:57 +02:00
Thomas Citharel
324ac9dfcb
Merge branch 'fix/mail/text/linebreaks' into 'develop'
...
Fix line breaks in mails text part
See merge request framasoft/framadate/framadate!368
2019-04-16 15:15:16 +02:00
Thomas Citharel
409c5e3d2b
Merge branch 'check-translations' into 'develop'
...
i18n: adds a check on missing translation keys in locale/*.json file
See merge request framasoft/framadate/framadate!369
2019-04-16 15:11:21 +02:00
Paul B
64f086c04f
i18n: adds a check on missing translation keys in locale/*.json file
...
This commit adds a script to check all keys from translation files to
make sure no missing keys / no translation files are incorrect.
Even if missing keys should not happen (because we use a script to add
keys automatically) this script made helped to understand that all
three `ar`, `eo` and `fr_FR` translation files were completly off
compared to the `en.json` file.
I believe we can safely delete `ar`, `eo` and `fr_FR` locales from
Zanata (because those languages are not set in the ALLOWED_LANGUAGES
config array). ⚠️ this needs to be check in the production `config.php`
file ⚠️ .
Deleting the `fr_FR` locale file should solve both !358 and #395
closes !358 #395
2019-04-16 14:55:15 +02:00
Liquidsoul
46e0edc3dd
Replace html <br/> tags with \n in mail text
2019-04-16 14:11:07 +02:00