Commit Graph

1504 Commits

Author SHA1 Message Date
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
Thomas Citharel
80336b431e Merge branch 'locale/update-locales' into 'develop'
Pull locales from Zanata

See merge request framasoft/framadate/framadate!367
2019-04-16 12:33:15 +02:00
Thomas Citharel
bd6f2ab1d2
Pull locales from Zanata
Including changes from !366

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-16 12:31:47 +02:00
Thomas Citharel
6a4b2a44a1 Merge branch 'framadate-feature/add_version' into 'develop'
Add version in the pages footer

See merge request framasoft/framadate/framadate!366
2019-04-16 12:19:57 +02:00
Liquidsoul
7703360d44
Add new localization key for the version in locale/en.json 2019-04-16 12:00:35 +02:00
Liquidsoul
5268a5bd7a
Use placeholder injection for the version string 2019-04-16 12:00:35 +02:00
2624f2da10
#338: Affichage de la version 2019-04-16 12:00:35 +02:00
Thomas Citharel
0493a05526 Merge branch 'csv-export-bom-header' into 'develop'
CSV export: add UTF-8 BOM header

See merge request framasoft/framadate/framadate!365
2019-04-16 11:43:07 +02:00
Thomas Citharel
69d00042e6 Merge branch 'fix-email-encoding-issues' into 'develop'
Fix email issues

Closes #419 et #416

See merge request framasoft/framadate/framadate!364
2019-04-16 11:37:21 +02:00
Cyril Roelandt
f626d29843 CSV export: add UTF-8 BOM header.
When exporting a poll to CSV, no BOM character is written. Most applications can
properly detect the required encoding, but some do not, and might find it
helpful to be able to read a BOM character.

--
Comment added 2019-04-16, nico@bou.io:

The issue is specifically with Excel that assumes Latin-1 by default, but switches to utf-8 if a BOM is present. On the other hand, LibreOffice and other apps seem to behave correctly with a BOM.
2019-04-16 11:32:42 +02:00
Paul B
a51ee59d1c
mailservice: use a custom html2text callback for plain text emails
The current `html2text` function from the PHPMailer library strips all
html tags and only keeps the inner html.

In the case of <a> tags we need to share the `href` attribute to the
user when he reads his mail in plain text format.

Fixes #419
2019-04-15 18:43:27 +02:00
Nicolas Bouilleaud
7b0e42bec4 Use the new named constant for 'utf-8' 2019-04-15 17:53:53 +02:00
Paul B
ed223f2176
deps: bump the PHPMailer library version from 6.0.5 to 6.0.7
This includes a small security fix (in v6.0.6) and keeps us up-to-date
with the vendor PHPMailer library.
2019-04-15 17:24:20 +02:00
Nicolas Bouilleaud
6b91a226ba Set the MailService Charset before setting the body
msgHTML builds the text/plain part by converting the passed html to text in the current CharSet; the default Charset being iso-8859-1, most non-ascii characters are lost.

fixes #416
2019-04-15 17:22:09 +02:00
Thomas Citharel
b272a5a7a1 Merge branch 'fix-poll-entry-modification' into 'develop'
refacto(logService): add a new logEntries method to the log service

See merge request framasoft/framadate/framadate!363
2019-04-15 16:48:05 +02:00
Paul B
e8620026cf
refacto(logService): add a new logEntries method to the log service
As a followup to #362 this is a small addition to the log service when
we want to log a list of entries into a single message.

The log service can itself make sure to escape commas instead of
expecting callers to do so.
2019-04-15 16:07:32 +02:00
Thomas Citharel
5f7388cddb Merge branch 'fix-poll-entry-modification' into 'develop'
fix(admin/add_column): stop modifying user input in stored data

Closes #384

See merge request framasoft/framadate/framadate!362
2019-04-15 15:16:47 +02:00
Paul B
dc164c4d79
fix(admin/add_column): stop modifying user input in stored data
An [earlier
change](892fa11373)
modifed the user's input when creating new columns in an existing
Poll.

Indeed all `,` comma were replaced by `-` dashes and the user inputs
was saved as such.

It seems the rational behind it was to keep the existing "formatting"
of log messages where different elements were separated by commas.

This commit makes sure to not strip the users' data but only the
logged message.

Fixes #384
2019-04-15 15:05:26 +02:00
Thomas Citharel
e13f66eb4d Merge branch 'fix-fin_sondage_autre-disabled-style' into 'develop'
Remove the “disabled” class from fin_sondage_autre

See merge request framasoft/framadate/framadate!361
2019-04-15 14:59:49 +02:00
Nicolas Bouilleaud
3071455882 Remove the “disabled” class from fin_sondage_autre
Currently, the button still looks disabled even when more than one choice is filled.

In classic_poll.js, the disabled *property* is set/unset according to isSubmitChoicesAvalaible(). The disabled *class* is not changed after being set in the template.
In the bootstrap css, either the disabled class or the disabled gray out the button. Let’s just use the disabled property.
2019-04-15 12:03:13 +02:00
Thomas Citharel
a29c25883a Merge branch 'fix-settime-exception' into 'develop'
Update german translation

Closes #368

See merge request framasoft/framadate/framadate!351
2019-04-15 11:42:02 +02:00
Thomas Citharel
6090568446 Merge branch 'patch-2' into 'develop'
Add new file (breton translation for bootstrap-datepicker)

See merge request framasoft/framadate/framadate!357
2019-02-21 10:33:57 +01:00