Commit Graph

1351 Commits

Author SHA1 Message Date
4106e2ca96 Changed new logo DateChaprilOrg 2018-12-02 15:34:16 +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
Thomas De Backer
88fb61660a restrict custom urls
fixed coding standard issues

added error message to locale

Remove unecessary variable

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 10:25:14 +02:00
a31dcd60d6 Removed initial htaccess.txt file (previously renamed .htaccess). 2018-05-27 12:37:07 +02:00
7088684b2e Add phpinfo.php file for easy check. 2018-05-27 12:19:28 +02:00
f62e0408de Personnalisation du pied de page de courriel. 2018-05-06 11:50:15 +02:00
Thomas Citharel
59569071e8 Merge branch '1.1.4-bugfix' into 'master'
1.1.4 bugfix

See merge request framasoft/framadate!301
2018-04-15 12:23:57 +02:00
Thomas Citharel
30e77a77c4
Version 1.1.4
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 12:21:56 +02:00
Thomas Citharel
367b239549
Provide Fork-Awesome and add an option to disable it (should be useful on installations with Framanav)
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Use fork-awesome minified css

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 12:21:27 +02:00
Thomas Citharel
8ce671e4d9 Merge branch '1.1.3-bugfix' into 'master'
1.1.3 bugfix

See merge request framasoft/framadate!299
2018-04-15 11:35:10 +02:00
Thomas Citharel
901f907dd4
Release Version 1.1.3
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 11:33:39 +02:00
m
a80602e3d5
bug/error-on-empty-choices 2018-04-15 11:30:28 +02:00
Thomas Citharel
53572dbc1f Merge branch 'develop' into 'master'
Version 1.1.2

See merge request framasoft/framadate!295
2018-04-11 18:08:01 +02:00
Thomas Citharel
b2fc3a9d53
Remove unneeded Parsedown option
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-11 18:06:45 +02:00
Thomas Citharel
baadea8e74 Merge branch 'security/parsedown-safe-mode' into 'develop'
Enable Parsedown Safe-Mode

Closes #226

See merge request framasoft/framadate!293
2018-04-11 17:52:57 +02:00
Thomas Citharel
075ba1739c
Enable Parsedown Safe-Mode
Also remove the setUrlsLinked(false) so that we can haz urls

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-11 17:50:49 +02:00
Thomas Citharel
9829c826ef Merge branch 'develop' into 'master'
Version 1.1.1

See merge request framasoft/framadate!292
2018-04-11 15:55:16 +02:00
Thomas Citharel
32492cf119
Update version to 1.1.1
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-11 15:52:50 +02:00
Thomas Citharel
c5a2f299c5 Merge branch 'bug/send-voters-email' into 'develop'
Fix link sent by email to voters

Closes #312

See merge request framasoft/framadate!291
2018-04-11 15:51:54 +02:00
Thomas Citharel
d72cf4ce24
Fix link sent by email to voters
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-11 15:50:07 +02:00
Thomas Citharel
f931516f24 Merge branch 'develop' into 'master'
Release 1.1.0

See merge request framasoft/framadate!290
2018-04-11 10:14:24 +02:00
Thomas Citharel
4035193377
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-11 10:08:14 +02:00