Commit Graph

1371 Commits

Author SHA1 Message Date
fd91b558a3 Merge tag '1.1.9' into chapril-1.1.8 to create chapril-1.1.9. 2019-05-10 18:31:03 +02:00
23f933595b Removed list of web browers (#3626) 2019-03-25 17:09:06 +01:00
a75ce8aab5 Improved english translation of FOOTER (#3250) 2019-03-10 17:42:11 +01:00
b108cbbd15 Added directory tools and script rapport_activite.sh (#3592) 2019-02-20 15:29:17 +01:00
4d58bc9371 Updated locale/fr.json and fr_FR.json (#3538,#3493,#3491) 2019-01-13 22:49:04 +01:00
add73d3189 Customization of another text for DateChaprilOrg in locale/en.json (#3538) 2019-01-04 23:22:53 +01:00
80f99c9c68 Customization of text for DateChaprilOrg in locale/en.json (#3538) 2019-01-04 23:17:45 +01:00
f3aab00199 Customization of text for DateChaprilOrg in locale/fr.json (#3538) 2019-01-04 23:06:54 +01:00
b9715d7142 Improved message 'où sont mes sondages?' (#3493) 2019-01-01 22:08:44 +01:00
2c7d79dca2 Modified third section in locale/fr.json (#3491) 2018-12-31 12:42:19 +01:00
4cf50cb7bf modified the mail text of 'where are my polls' (#3493) 2018-12-28 21:51:05 +01:00
1bf1656d87 personalized third section of comment (#3491) 2018-12-28 21:34:53 +01:00
8d76fae8a1 renamed logo-DateChaprilOrg.png (#3478) 2018-12-28 17:52:10 +01:00
Thomas Citharel
0e72dafbf6 Merge branch 'release-1.1.9' into 'master'
Release 1.1.9

See merge request framasoft/framadate/framadate!353
2018-12-04 18:23:24 +01:00
Thomas Citharel
e35589e1a8
Bump version
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-12-04 18:22:32 +01:00
Yoann
4fa7ae12d4
Fix wrong display of email subject with a date poll
fix parenthesis

Fix

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-12-04 18:18:56 +01:00
Thomas Citharel
15e1d1cc18 Merge branch 'backport-session-fix' into 'master'
backport session fix

See merge request framasoft/framadate/framadate!352
2018-12-04 18:08:23 +01:00
Lazare Olivry
ca347b024d backport session fix 2018-12-04 18:02:54 +01:00
4106e2ca96 Changed new logo DateChaprilOrg 2018-12-02 15:34:16 +01:00
Thomas Citharel
faa2ee1289 Merge branch 'patch-1' into 'master'
Set $rowDatetime to int for comparison

See merge request framasoft/framadate/framadate!350
2018-11-05 16:25:04 +01:00
Thomas Citharel
46338cc078 Set $rowDatetime to int for comparison
Closes #379
2018-11-05 16:22:04 +01:00
cb10c87d07 Added script for automatic poll purge (#3150). 2018-08-15 11:28:41 +02:00
ebe9add057 Fixed mistaken message about expiry date (#3205). 2018-08-13 16:02:06 +02:00
13c2543a7a Updated AdminPollService to correct bug on end_date 2018-08-13 12:19:06 +02:00
c2eb45666a Updated fr.json to suppress <br/> 2018-08-12 16:03:58 +02:00
30c94c7aa1 Merge remote-tracking branch 'origin/master' into chapril-1.1.8
mise à jour vers 1.1.8
2018-08-12 15:00:08 +02:00
4fe0b2097f Updated AdminPollService to limit end_date (#3206). 2018-08-08 22:56:34 +02:00
f4debb7da8 Updated one little mistake. Suppressed one blank character 2018-08-07 23:18:58 +02:00
506c56aa28 Updated one word forgetten 2018-08-07 22:36:08 +02:00
782a42d571 Updated according with agir issue 3205 2018-08-07 22:32:25 +02:00
205c9230ad Updated one word for test 2018-08-07 21:55:21 +02:00
46356b9744 Changed pushline APRIL instead of Framasoft. 2018-08-03 20:33:52 +02:00
25def10867 Improved English translation 2018-08-03 17:26:20 +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
Thomas Citharel
5ffd4361e4 Fix #358, #355 and #342
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:06:23 +02:00
fcfc8786fa Updated English punch line 2018-08-03 12:53:57 +02:00
7ba226af4a Removed <br>, custom the email. 2018-08-01 17:39:18 +02:00
07368eb2d5 updated fr_FR.json 2018-08-01 17:29:57 +02:00
9a6784c6a6 Merge remote-tracking branch 'origin/develop' tag1.1.7 into chapril
Conflicts:
	locale/fr.json
2018-07-28 17:57:58 +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
Thomas Citharel
0da24788d0 Bump version
(yeah, forgot last one)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 12:18:22 +02:00
Thomas Citharel
cad9dac189 Fix an issue with smarty filters and priority
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 12:17:59 +02:00
Thomas Citharel
bc28281477 Update deps and bump PHPMailer to version 6
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 12:17:33 +02:00
Thomas Citharel
be128e8158 Handle XSS issue on date poll slots
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 10:56:09 +02:00
m
a1a7d180f8 fork-awesome enabled by default 2018-07-09 10:26:12 +02:00
m
15e78ba070 Better handle undefined config values
https://framagit.org/framasoft/framadate/issues/322
2018-07-09 10:26:06 +02:00