summaryrefslogtreecommitdiff
path: root/pages
AgeCommit message (Collapse)Author
2013-08-13Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137Benny Baumann
Conflicts: includes/account.php pages/account/10.php pages/account/3.php pages/gpg/0.php www/gpg.php
2013-08-13Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137Benny Baumann
Conflicts: includes/notary.inc.php
2013-07-23Merge branch 'bug-1177' into bug-1137Benny Baumann
2013-07-23Merge branch 'bug-893' into bug-1136Benny Baumann
2013-07-23Merge branch 'bug-1177' into bug-893Benny Baumann
2013-07-23bug 1177: Fix colspan values for old display of assurance pointsBenny Baumann
2013-07-22Merge branch 'bug-893' into bug-1136Benny Baumann
Conflicts: includes/temp_functions.php pages/account/43.php
2013-07-22Merge branch 'bug-1177' into bug-1137Benny Baumann
Conflicts: includes/notary.inc.php includes/wot.inc.php www/wot.php
2013-07-21Merge branch 'bug-1177' into bug-893Benny Baumann
Conflicts: includes/account.php
2013-07-21bug 1177: Update include references from wot.inc.php to link to notary.inc.phpBenny Baumann
2013-07-15bug 1190: Use double quoted strings to allow line breaksMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-15bug 1190: DohMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-15bug 1190: Limit number of news itemsMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-15bug 1190: properly handle entitiesMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-15bug 1190: Fix possible code injectionMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-07-14Merge alternate branch 'bug-1190' by magu into bug-1190Benny Baumann
2013-07-14bug-1190: white spaceMartin Gummi
2013-07-14bug 1123: fixed merge conflicts on testserverBenny Baumann
2013-07-14bug 1123: added layout changesBenny Baumann
2013-07-14bug 1123: implement CCA acception for client certsBenny Baumann
2013-07-14bug-1190: Change parsing of new feed from blog.cacert.org via XML ParserMartin Gummi
2013-07-14bug 1123: changed layout of pages/account/3.phpBenny Baumann
2013-07-14bug 1190: changed length parameter to adjust the text for <!CDATA[ ]]> for ↵INOPIAE
the description
2013-07-12Merge branch 'bug-782' into releaseBenny Baumann
2013-07-12Merge branch 'bug-1176' into releaseBenny Baumann
2013-06-25Merge branch 'bug-1102' into releaseBenny Baumann
2013-06-25bug 1176: Ensure that the notary table to show was given before determining ↵Benny Baumann
which one
2013-06-25bug 1176: User ID not always initialized properlyBenny Baumann
2013-06-25Merge branch 'bug-1008' into releaseBenny Baumann
2013-06-25Merge branch 'bug-999' into releaseBenny Baumann
2013-06-23bug 782: removed previous echo, fixed update sql in account.php, added ↵INOPIAE
missing form tag in gpg/2.php
2013-06-19bug 1102: avoid splitting the PHP code block when not sensiblebug-1102Benny Baumann
2013-06-19bug-1102: Redirect to CertificationPracticeStatement.phpMartin Gummi
2013-06-18bug 782: change the layout on account/12.php and account/5.php, added error ↵INOPIAE
check in account.php
2013-06-15Merge branch 'release' into bug-782Michael Tänzer
Conflicts: includes/account.php pages/account/12.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-06-12bug 782: Actually show the expiry date not the revocation dateMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-06-12bug 782: White space clean-upMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-06-12bug 782: Show the footer and exit after the form so it is actuallyMichael Tänzer
displayed Signed-off-by: Michael Tänzer <neo@nhng.de>
2013-06-12bug 1008: fixed query output from $res to $res1bug-1008INOPIAE
2013-06-09bug 1137: corrected some checks in wot.inc.php and wot.phpINOPIAE
2013-05-22bug 782: changed wordingINOPIAE
2013-05-15Merge remote-tracking branch 'origin/bug-1122' into releaseMichael Tänzer
2013-05-15bug 782: added format for XHTML, typo fixingINOPIAE
2013-05-14bug 782: Added comment update for all certificate view pagesINOPIAE
2013-05-13 bug 782: changed variable names in account.php, adjusted table in account/5.phpINOPIAE
2013-05-13Merge branch 'bug-1124' into releaseBenny Baumann
2013-05-13Merge branch 'bug-740' into releaseBenny Baumann
2013-05-13Merge branch 'bug-1165' into releaseBenny Baumann
2013-05-13Merge branch 'bug-1154' into releaseBenny Baumann
2013-05-01bug 782: fixed typoINOPIAE