|
|
2ba6d93dde
|
Merge branch 'release' into testserver
|
2018-09-03 21:47:44 +02:00 |
|
|
|
97cf98140c
|
Merged in lang/french.php from https://github.com/eruedin/cats
|
2018-09-03 21:32:40 +02:00 |
|
|
|
238df056c6
|
changed encoding to Windows 1252...
|
2018-09-03 21:19:21 +02:00 |
|
|
|
f1c858b624
|
Merge remote-tracking branch 'origin/release' into release
|
2018-09-03 18:52:27 +00:00 |
|
|
|
1c70b1b36f
|
Old uncommited changes to index.php.template, probably due to migration of PHP version
|
2018-03-04 17:48:36 +00:00 |
|
Bernhard "Ted" Fröhlich
|
7eceae87cc
|
Merge pull request #8 from eruedin/patch-2
Update french.php
|
2018-03-04 18:24:31 +01:00 |
|
eruedin
|
1c01550518
|
Update french.php
All changes as descrived in the bug tracker and reviewed two years ago at https://github.com/eruedin/cats/blob/release/lang/french.php copy-pasted, as I found no other way to move it back to this place.
|
2018-03-01 23:45:38 +01:00 |
|
|
|
250eec9e15
|
cats_user with underscore...
|
2016-01-08 18:18:48 +01:00 |
|
|
|
3c356e876c
|
Quote username with hyphen
Newer versions seem to require quotes for usernames with hyphens...
|
2016-01-08 18:12:32 +01:00 |
|
|
|
c616ed3711
|
Merge remote-tracking branch 'origin/bug-1407' into testserver
|
2015-12-04 23:43:17 +01:00 |
|
|
|
db5cb0dce6
|
Changes proposed by Felix Dörre, plus making the file location invariant
|
2015-12-04 23:32:25 +01:00 |
|
|
|
030fdc9726
|
Merge branch 'release' into testserver
|
2015-11-27 21:55:20 +01:00 |
|
|
|
7a213874f2
|
Commented in the correct functions!
|
2015-11-27 20:41:54 +00:00 |
|
|
|
73ccca3694
|
Adjustments to support class 3 client certificates
|
2015-11-27 20:28:09 +00:00 |
|
|
|
4cdf387a9c
|
Merge branch 'bug-1149' into testserver
|
2015-10-18 19:50:49 +02:00 |
|
|
|
de7ed758b1
|
Typo...
|
2015-10-18 19:35:38 +02:00 |
|
|
|
f2c0a7300c
|
Merge branch 'bug-1149' into testserver
Conflicts:
lang/french.php
|
2015-10-18 16:23:22 +02:00 |
|
|
|
c2078f36d9
|
Merge branch 'bug-1149' of github.com:CAcertOrg/cats into bug-1149
|
2015-10-18 16:09:51 +02:00 |
|
|
|
0fe3c3509f
|
Do not accept certificates for login which have nor Email field set
|
2015-10-18 16:06:55 +02:00 |
|
|
|
2680c6889b
|
Merge branch 'bug-1405' into testserver
|
2015-10-16 23:55:58 +02:00 |
|
|
|
3a3c3aa3d2
|
Merge branch 'bug-1376' into testserver
Conflicts:
lang/french.php
|
2015-10-16 23:27:09 +02:00 |
|
|
|
1d06e8556d
|
Removed login_with_api.php
|
2015-10-16 22:48:07 +02:00 |
|
|
|
fe93d7eacf
|
Added meta tag to define charset
|
2015-09-03 00:19:47 +02:00 |
|
|
|
6605a64dca
|
Experimental branch: remove htmlspecialchars conversion from input to simplify usage of non ISO-8859-1 characters in translations as HTML-entities. Have to check for side effects...
|
2015-09-02 23:11:58 +02:00 |
|
|
|
9c1a43b741
|
Merge remote-tracking branch 'origin/bug-1098' into testserver
|
2015-07-28 22:08:17 +02:00 |
|
|
|
fa27e3da5f
|
Remove PayPal buttons
|
2015-07-28 21:50:15 +02:00 |
|
|
|
32ac67d87f
|
Since we currently cannot handle requests for Certificates of Achievement the Donate-Button should be hidden to avoid later grievances...
|
2015-07-28 21:40:12 +02:00 |
|
Marcus Mängel
|
073c875602
|
bug 1098: removed "/" from template file. This needs to be replaced on the productive system as well.
|
2015-06-30 22:48:13 +02:00 |
|
|
|
aae47d592b
|
Merge branch 'bug-1140' into release
|
2014-02-12 22:04:16 +01:00 |
|
|
|
ae6585e46d
|
Merge branch 'bug-970' into testserver
|
2014-02-11 23:39:59 +01:00 |
|
|
|
0e23382d1d
|
Merge branch 'release' of git@github.com:bergerc/cats into bug-970
Conflicts:
lang/french.php
manually resolved
|
2014-02-11 23:34:04 +01:00 |
|
|
|
f7eb4451b6
|
Adjusted to production server paths
|
2014-02-10 21:39:11 +01:00 |
|
|
|
e143133c02
|
Merge branch 'bug-1245' into testserver
|
2014-02-10 21:26:12 +01:00 |
|
|
|
5a80f36ef1
|
Added missing parameters to htmlspecialchars
|
2014-02-10 21:22:02 +01:00 |
|
|
|
c47c026f6b
|
Merge pull request #6 from MarioLipinski/bug-1203
#1203 session_register was removed as of PHP 5.4, usage did not make any...
|
2014-01-20 15:12:30 -08:00 |
|
Bernhard Fröhlich
|
1ba7e20c17
|
Fixed comment syntax
|
2014-01-21 00:06:16 +01:00 |
|
Mario Lipinski
|
c5fc1b9222
|
#1203 session_register was removed as of PHP 5.4, usage did not make any sense there anyway.
|
2013-08-20 02:28:14 +02:00 |
|
Christophe Berger
|
ab166312f5
|
Add version of L1ON (https://bugs.cacert.org/view.php?id=970#c4098)
|
2013-07-05 22:41:23 +02:00 |
|
|
|
5ea4dbc11e
|
Merge commit 'origin/release' into bug-970
|
2013-04-11 18:31:16 +02:00 |
|
|
|
bcd16dd883
|
Merge branch 'bug-1140' into testserver
|
2013-04-11 00:11:50 +02:00 |
|
|
|
e19037d598
|
bug 500: Added button to request certificate in learnprogress page if there are passed tests.
|
2013-04-10 23:56:15 +02:00 |
|
|
|
a53d97b7cb
|
BugFix in function call
|
2013-04-10 23:30:42 +02:00 |
|
|
|
528f9b31a3
|
Once again fixed indention
|
2013-04-10 22:43:51 +02:00 |
|
|
|
e0538cf1a0
|
Used the opportunity and re-formatted the file consistently, without using tabs.
|
2013-04-10 22:22:33 +02:00 |
|
U-berger\christophe
|
a2fa6ae7e5
|
Convert line ending to Windows. New proposal for french translation
|
2013-04-10 10:23:38 +02:00 |
|
Christophe Berger
|
7a708c2689
|
Corrections for the french translation
https://bugs.cacert.org/view.php?id=970
|
2013-04-08 02:47:38 +02:00 |
|
|
|
7711fd61e8
|
Merge pull request #3 from INOPIAE/bug-1140
bug 1140: added the status passed to the progress table
|
2013-04-07 07:50:27 -07:00 |
|
|
|
0131a14bd5
|
Merge branch 'bug-1161' into release
|
2013-04-06 22:57:28 +02:00 |
|
|
|
853c79d044
|
Merge pull request #2 from CAcertOrg/doc
Doc
|
2013-04-06 13:36:12 -07:00 |
|
|
|
ab0b851d36
|
Merge branch 'bug-1161' into testserver
|
2013-04-06 22:05:36 +02:00 |
|
