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

1524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mindiell
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
Florent Grouin
e78ad00d28 Add new file (breton translation for bootstrap-datepicker) 2019-02-20 13:52:07 +01:00
JosephK
c3e29e7e82 .git folder deleted before creating latest.zip 2019-01-07 08:42:11 +01:00
Thomas Citharel
c4551c2e71 Merge branch 'feature/force-https' into 'develop' 
Allow overriding HTTPS

See merge request framasoft/framadate/framadate!346
 2018-11-30 11:25:51 +01:00
Tai Kedzierski
179b048f59 Removed redundant truth check. 2018-11-30 11:19:50 +01:00
Maik Hummel
b549beabde Update german translation (fixes #368) 2018-11-20 16:51:06 +01:00
Thomas Citharel
cbf6fbffc7 Merge branch 'patch-1' into 'develop' 
Update INSTALL.md : link actualization

See merge request framasoft/framadate/framadate!348
 2018-10-25 15:08:00 +02:00
Thierry Munoz
4e1a0e944a Update INSTALL.md : link actualization 2018-10-25 15:03:43 +02:00
Thomas Citharel
47261c5677 Merge branch 'patch-1' into 'develop' 
Update README.md : links actualization

See merge request framasoft/framadate/framadate!347
 2018-10-25 14:43:13 +02:00
Tai Kedzierski
537037154e fix erroneous comparator in entrypoint 2018-10-25 13:28:14 +01:00
Thierry Munoz
49c1ec8de7 Update README.md : links actualization 2018-10-25 14:24:10 +02: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
Thomas Citharel
76db7de73c Merge branch 'bug/fix_incorrect_display_email_subject' into 'develop' 
Fix wrong display of email subject with a date poll

Closes #375

See merge request framasoft/framadate!342
 2018-10-10 10:37:06 +02:00
Delattre Yoann
b5effb8eaa fix parenthesis 2018-10-10 10:27:41 +02:00
Yoann
28a82388cf Fix wrong display of email subject with a date poll 2018-10-10 10:03:53 +02:00
Thomas Citharel
49bd7c9169 Merge branch 'install-fixes' into 'develop' 
Install fixes

See merge request framasoft/framadate!339
 2018-10-09 11:52:03 +02:00
Thomas Citharel
f313699149 Install fixes 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-10-09 11:50:25 +02:00
Thomas Citharel
d29b703e0e Merge branch 'bug/369-template-syntax-error-creation-step3' into 'develop' 
Fixed syntax error by escaping a quote.

Closes #369

See merge request framasoft/framadate!335
 2018-09-11 15:43:29 +02:00
Marc Karassev
14b00691c7 Fixed syntax error by escaping a quote. 2018-09-11 15:38:50 +02:00
Thomas Citharel
7baf995f91 Fix escaping apostroph 2018-08-30 14:14:23 +02:00
Thomas Citharel
d0207ebb5b Merge branch 'zanata-use-git-branch' into 'develop' 
[zanata] Use git branch to specify the version of zanata's project

See merge request framasoft/framadate!333
 2018-08-17 14:02:07 +02:00
Luc Didry
ff88628acf
[zanata] Use git branch to specify the version of zanata's project 2018-08-17 13:58:43 +02:00
Thomas Citharel
3402571e85 Merge branch 'work-on-locales' into 'develop' 
Working on locales

See merge request framasoft/framadate!332
 2018-08-17 13:47:35 +02:00
Luc Didry
ed95625cbe
[i18n] Update br, de and fr translations 2018-08-14 15:01:23 +02: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
Luc Didry
f691694ff1
[zanata] Update Zanata URL 2018-08-14 13:29:37 +02:00
Thomas Citharel
e3060e18d2 Merge branch 'master-merge' into 'master' 
Master merge

See merge request framasoft/framadate!329
 2018-08-03 14:37:51 +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
79586319fc Add session.cookie_httponly = 1 to local php.ini 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-08-03 14:29:45 +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