Commit Graph

1325 Commits

Author SHA1 Message Date
Olivier Perez
1d75ef0ea2 Merge branch 'patch-1' into 'master'
Fix typo in INSTALL.md

See merge request framasoft/framadate!189
2017-09-29 15:02:01 +02:00
Nikos
6a2ee5604e Update it.json - some italian translation 2017-09-13 13:31:15 +02:00
Kyâne
a2df40b924 Fix typo in INSTALL.md 2017-09-06 19:19:29 +02:00
Quentin
d33cc58cf7 Update oc.json 2017-09-02 11:06:26 +02:00
Quentin
c03bd0216f Update oc.json with thin non-breakable spaces and + apostrophes + translations 2017-09-02 09:22:28 +02:00
Gwenn Meynier
71d8ef5134 [l10n] another breton fix 2017-06-21 23:29:55 +02:00
Gwenn Meynier
f8e00084be [l10n] corrections for breton translation 2017-06-14 13:24:02 +02:00
Antonin
724133f6ae Merge branch 'fix/NotScrollableOnMobile' into 'develop'
Let the table be scrollable even if there is no 'over' event

See merge request !170
2017-03-19 18:38:54 +01:00
Antonin
e9199d8396 Merge branch 'master' into 'master'
More NL translations

See merge request !172
2017-03-19 18:26:53 +01:00
Antonin
9229b5cb13 Merge branch 'fix/NotScrollableOnMobile' into 'develop'
Let the table be scrollable even if there is no 'over' event

See merge request !170
2017-03-19 18:25:46 +01:00
Antonin
53cf6498ed Merge branch 'bugfix/install' into 'master'
Bugfix/install

See merge request !168
2017-03-19 18:25:04 +01:00
Olivier Perez
d69de89f2f Merge branch 'feature/favicon' into 'develop'
Add favicon path to config

See merge request !164
2017-02-23 00:04:28 +01:00
Pierre Rudloff
3642bf87d4 Add favicon path to config 2017-02-22 21:16:09 +01:00
JosephK
ca653cf568 Merge branch 'spelling' into 'master'
Fix typos

See merge request !177
2017-02-20 07:04:36 +01:00
JosephK
de6de7d6ee Merge branch 'feature/fix-fork-link' into 'master'
README.md: Fix the fork link.

See merge request !175
2017-02-20 07:03:39 +01:00
JosephK
9bb4cab2d8 Merge branch 'gitignore' into 'master'
Add .htdigest to .gitignore

See merge request !176
2017-02-20 07:02:20 +01:00
JosephK
495db1b748 Merge branch 'patch-1' into 'master'
Update robots.txt

See merge request !178
2017-02-20 07:00:35 +01:00
JosephK
adcea7d04b Merge branch 'iss220' into 'master'
Sanitize names to avoid Formula Injections on CSV export (fix issue #220)

See merge request !171
2017-02-20 06:59:36 +01:00
Lucas D
254130559f Update robots.txt
For delete 
Allow: /apropos.php
Allow: /contacts.php

page does not exist anymore
2017-02-13 10:47:57 +01:00
François B
fd3526c9c7 Fix typos 2017-02-05 04:19:04 +01:00
François B
e8c3984a07 Add .htdigest to .gitignore 2017-02-05 03:25:20 +01:00
Cyril Roelandt
2205156a46 README.md: Fix the fork link. 2017-01-21 20:24:43 +01:00
Jeroen Demeyer
be44e53eda More NL translations 2017-01-06 14:19:49 +01:00
framartin
b0e6b82877 Sanitize names to avoid Formula Injections on CSV export 2017-01-05 18:48:46 +01:00
Olivier Perez
61e3d0735f Merge branch 'feature/piwik' into 'develop'
New tracking_code setting that inserts HTML code in the footer of every page

See merge request !163
2016-12-30 15:59:40 +01:00
Olivier PEREZ
00a755fb10 Let the table be scrollable even if there is no 'over' event 2016-12-29 16:23:29 +01:00
Olivier Perez
df2576445d Merge branch 'feature/admin_add_slot_on_enter' into 'develop'
Submit slot when hitting enter key

See merge request !162
2016-12-28 02:17:54 +01:00
Olivier Perez
8f6c665c3d Merge branch 'bugfix/nl-locale-date' into 'develop'
Get back the dutch locale

See merge request !165
2016-12-28 02:14:23 +01:00
Olivier Perez
b1d996f7d0 Merge branch 'bugfix/nl-date' into 'master'
Correcting the NL date locale

Closes #212

See merge request !166
2016-12-28 02:13:47 +01:00
Olivier Perez
2a9c663c8c Merge branch 'bugfix/phpmailler-update' into 'master'
PHPMailer update

Closes #217

See merge request !169
2016-12-28 02:11:46 +01:00
Damien Finck
7e05d8aef8 Improve a warning message 2016-12-27 18:11:52 +01:00
Antonin
61f57ee41c While we're at it, updating other components.
All those updates affect only the dev environment.
2016-12-27 17:10:10 +01:00
Antonin
e6c2d035fe Update phpmailer/phpmailer to fix security issue. 2016-12-27 16:21:46 +01:00
Damien Finck
5bb3d394a1 Add new key in all locales 2016-12-27 16:07:09 +01:00
Damien Finck
5012ed32db Fix typo + add key in all locales 2016-12-27 16:03:06 +01:00
Damien Finck
03727577e8 Add missing key 2016-12-27 15:29:46 +01:00
Damien Finck
57d6e1c0a4 Resources standardization 2016-12-27 15:29:25 +01:00
Damien Finck
545f167a7b Fix the check of template dir 2016-12-27 15:15:26 +01:00
Antonin
0a0b3b233b Correcting the NL date locale 2016-12-26 16:41:33 +01:00
Antonin
44aca0a7e7 Correcting the NL date locale 2016-12-26 16:38:26 +01:00
Antonin
e17abed619 Get back the NL locale from master. 2016-12-26 16:32:07 +01:00
Pierre Rudloff
c5a50a7cad New tracking_code setting that inserts HTML code in the footer of every page 2016-12-22 16:14:22 +01:00
Antonin
48de916f81 Submit slot when hitting enter key 2016-12-06 15:58:05 +01:00
Antonin
8f6a31737d Merge branch 'fix/Some_fixes_on_comments' into 'master'
Some fixes on comments

Fix #205 

See merge request !161
2016-12-06 15:34:30 +01:00
Antonin
14451ade7a Merge branch 'fix/Some_fixes_on_comments' into 'master'
Some fixes on comments

Fix #205 

See merge request !161
2016-12-06 15:34:10 +01:00
Olivier PEREZ
56620e4a43 Fix #200 - git.framassoft.org => framagit.org 2016-11-15 00:00:45 +01:00
Olivier PEREZ
716b171a36 n2.framasoft.org => framasoft.org 2016-11-14 23:53:05 +01:00
Olivier PEREZ
cf21a10314 Remove '/action' when calculating server URL 2016-11-14 23:41:57 +01:00
Olivier PEREZ
79ae5bb77d Fix the code that checks if we should send notification regarding type of notification 2016-11-14 23:35:04 +01:00
Olivier Perez
c6a98e16e8 Translate missing wordings 2016-10-24 19:31:51 +02:00