Commit Graph

412 Commits

Author SHA1 Message Date
Thomas Citharel
082644a021
Version 1.2.0-alpha.1
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-05-01 20:51:55 +02:00
Thomas Citharel
1d0b565594 Merge branch 'create-poll-fix' into 'develop'
fix(create_poll): don't send emails in case of DB transaction errors

See merge request framasoft/framadate/framadate!384
2019-04-19 20:44:14 +02:00
Thomas Citharel
9f2cf79171 Merge branch 'mail/templates' into 'develop'
Extract poll update notification mails into smarty templates

See merge request framasoft/framadate/framadate!390
2019-04-19 20:43:00 +02:00
Thomas Citharel
532118ef06
Rebase and add public modifiers
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-19 20:40:32 +02:00
Liquidsoul
1a66bd8bbe
Initialize Services factory 2019-04-19 20:37:35 +02:00
Liquidsoul
f641a35f8b
Add Services factory 2019-04-19 20:37:34 +02:00
Liquidsoul
8f23917639
Inject session and purge services in PollService 2019-04-19 20:37:34 +02:00
Thomas Citharel
bc964e87a7
[Big] Move displaying dates from libc to PHP-intl / ICU
* Make sure we always work only with DateTimes
* Support slots again under SQLite
* Small fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-19 20:29:32 +02:00
Paul B
c93741f475
create_poll: don't send emails in case of DB transaction errors
This commit adds an error message in the STEP 3 of the poll creation
form in case there is a DB transactions error.

It also makes sure to not send emails in case of those DB transaction
errors.
2019-04-19 17:58:59 +02:00
Liquidsoul
cefcb834d7
Extract poll update notification mails into smarty templates 2019-04-19 16:56:10 +02:00
Thomas Citharel
13d1103698 Merge branch 'refacto-creation-poll-service' into 'develop'
Refactorisation of the creation poll service

See merge request framasoft/framadate/framadate!383
2019-04-19 16:40:47 +02:00
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
Nicolas Bouilleaud
bc78721381 Fix i18n.php review comments
* Use the actually found locale for $locale in the rest of the app
2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
955faa108c Fix i18n.php review comments
* Use the DEFAULT_LANGUAGE as the default in locale_lookup.
* Initialise the translators explicitly.
2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
94739ba971 Fix i18n.php review comments
Use the DEFAULT_LANGUAGE as the default in locale_lookup.
2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
20240fee15 Fix i18n.php review comments
* remove useless is_string check
* use the DEFAULT_LANGUAGE when Accept-Language is invalid.
2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
aca1b57dfc Enable Hungarian (Magyar) 2019-04-19 14:58:32 +02:00
Nicolas Bouilleaud
e7947354ac Fix smarty_function_markdown_to_text() to use $locale 2019-04-19 14:46:26 +02:00
Nicolas Bouilleaud
31f0a26baa Remove o80/i18n 2019-04-19 14:46:26 +02:00
Nicolas Bouilleaud
3a6317c25a Rework i18n using Symfony/translation
Reimplement the __() and __f() functions using Symfony.
2019-04-19 14:46:26 +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
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
8dcea674e8
Add notificationservice->sendPollCreationMails 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
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
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
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
Liquidsoul
46e0edc3dd
Replace html <br/> tags with \n in mail text 2019-04-16 14:11:07 +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
2624f2da10
#338: Affichage de la version 2019-04-16 12:00:35 +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
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
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
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
Tai Kedzierski
179b048f59 Removed redundant truth check. 2018-11-30 11:19:50 +01:00
Tai Kedzierski
4242fe2914 Allow overriding HTTPS
In the case where the proxy does not pass `HTTP_X_FORWARDED_PROTO`, we need a way to explicitly request `https://` scheme on callbacks.

This change adds a constant `FORCE_HTTPS` which can be used to forcibly override automatic detection of HTTPS usage, when set.
2018-10-24 18:07:09 +01:00
Luc Didry
6b3c5f0610
WIP Working on locales 2018-08-14 14:35:08 +02:00
Thomas Citharel
5e43c1974d Merge branch 'master' into develop 2018-08-14 14:26:15 +02:00
Thomas Citharel
84ac58c430 Release 1.1.8
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:30:09 +02:00
Thomas Citharel
70db1e91e0 Release v1.1.8-beta.1
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:07:02 +02:00
Thomas Citharel
5ffd4361e4 Fix #358, #355 and #342
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:06:23 +02:00
Thomas Citharel
e7d5b1762e Merge tag '1.1.7' into develop 2018-07-09 15:53:59 +02:00
Thomas Citharel
b40957f484 Bump version
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 15:51:05 +02:00
Thomas Citharel
a6e337e046 Fix issue with limit of participants
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 15:50:46 +02:00