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
goofy-bz
250a6bba65
Update fr.json - my bad
2016-10-14 19:32:13 +02:00
goofy-bz
c7992be6bb
Update fr.json - minor fix s/optionnel/facultatif
2016-10-14 19:29:30 +02:00
Antonin
f5e579437a
Problèmes d'envois de commentaire de l'administrateur sur un sondage avec mot de passe.
2016-10-14 09:02:47 +02:00
Antonin
df8bbf3f65
Correction de l'editabilité du sondage : derniers noublis !
2016-10-14 08:49:47 +02:00
Antonin
daf7fcd30a
Bug sur l'éditabilité des sondage.
2016-10-14 08:22:15 +02:00
Antonin
7a1033b216
Merge branch 'master' into release
2016-10-14 07:28:03 +02:00
Antonin
1714434eb9
Merge branch 'task/merge-dutch-language-from-master' into 'release'
...
Task - merge dutch language from master
I also normalized the indentation from the current javascript "norm" of the project.
All `locale/` files of the b2d8723043!160
2016-10-14 07:12:09 +02:00
Antonin
b2d8723043
Unification of locale indentation.
2016-10-13 17:40:48 +02:00
Antonin
ac3a8ca25c
Get back the NL locale from master.
2016-10-13 17:36:39 +02:00
Antonin
76c2b1ae1c
Merge branch 'patch-1' into 'release'
...
Update oc.json
Translated the remaining French bits
See merge request !159
2016-10-12 20:22:13 +02:00
Quentin
4eb2d8b381
Update oc.json
2016-10-12 20:01:23 +02:00
Antonin
a414f96a88
Merge branch 'patch-1' into 'release'
...
Update br.json
translate missing strings
(made online with gitlab, sorry for the ugly branch name)
See merge request !158
2016-10-12 17:30:51 +02:00
