summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-12Merge branch 'testserver-mods' into testservertestserverMichael Tänzer
2012-12-12Cherry-pick fix that got lost on merge conflict resolutionMichael Tänzer
bug 1072: Change IP addresses Signed-off-by: Michael Tänzer <neo@nhng.de> (cherry picked from commit 042c5b32c12de2122170c0849b4fd6417427b923) Conflicts: www/cats/cats_import.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-12-12testserver: Work around CRLs redirecting to crl.cacert.orgMichael Tänzer
Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-12-12Merge branch 'release' into testserverMichael Tänzer
2012-12-11Merge branch 'tarballs' into releaseMichael Tänzer
2012-12-11Source code taken from cacert-20121211.tar.bz2Michael Tänzer
2012-12-11Merge branch 'bug-1070' into releaseMichael Tänzer
2012-12-11Merge branch 'release' into testserver-modsMichael Tänzer
Conflicts: www/cats/cats_import.php Signed-off-by: Michael Tänzer <neo@nhng.de>
2012-12-10Merge branch 'bug-512' into testserverBenny Baumann
Conflicts: includes/general.php
2012-12-10Merge branch 'bug-795' into testserverBenny Baumann
2012-12-10Merge branch 'bug-1118' into testserverBenny Baumann
2012-12-10bug 795: correct copy paste errorINOPIAE
2012-12-10bug 795: correted robotest if functionalityINOPIAE
2012-12-10Merge remote-tracking branch 'origin/bug-977' into releaseMichael Tänzer
2012-12-10Merge remote-tracking branch 'origin/bug-1111' into releaseMichael Tänzer
2012-12-10Merge remote-tracking branch 'origin/bug-1114' into releaseMichael Tänzer
2012-12-08bug 795: Changed contact form to just one form with two different send ↵INOPIAE
buttons and added a hidden field robotest for honeypot. in styles/default.css a new style ".robotic" is added for the robotest
2012-11-29bug 1118: removed change for ttpadmin tinyintINOPIAE
2012-11-29bug 1118: Prepared script for change of databaseINOPIAE
2012-11-28bug 512:Moved get_assurer_status from includes/general.php to ↵INOPIAE
includes/lib/general.php to make the function available for the scripting. Changed script to includes/lib/general.php
2012-11-21Merge branch 'bug-782' into testserverBenny Baumann
2012-11-21Merge branch 'bug-1109' into testserverBenny Baumann
2012-11-21bug 1109: added commentbug-1109INOPIAE
2012-11-21bug 1109: Added reference commentINOPIAE
2012-11-21bug 782: typo fixINOPIAE
2012-11-21Merge branch 'bug-782' into testserverBenny Baumann
2012-11-21Merge branch 'bug-1111' into testserverBenny Baumann
2012-11-21bug 1111: small typobug-1111INOPIAE
2012-11-21bug 782: Changed row idINOPIAE
2012-11-21bug 782: changed insert sql (deleted intval) on account.php, adjustment text ↵INOPIAE
area
2012-11-21Merge branch 'bug-1111' into testserverBenny Baumann
2012-11-21bug 1111: changed typoINOPIAE
2012-11-20Merge branch 'bug-1111' into testserverBenny Baumann
2012-11-20bug 1111: Changed TTP according to new statedINOPIAE
2012-11-20Merge branch 'bug-1111' into testserverBenny Baumann
2012-11-20Merge branch 'bug-977' into testserverBenny Baumann
2012-11-20bug 1111: fixed typo, deleted \n\n, changed http to httpsINOPIAE
2012-11-20Merge branch 'bug-1109' into testserverBenny Baumann
2012-11-20bug 1109: Deleted commented text at the end of the page.INOPIAE
2012-11-20Merge branch 'bug-1109' into testserverBenny Baumann
2012-11-20bug 1109: fixed missing tag in 21.php and 0.php added one line in 0.phpINOPIAE
2012-11-20Merge branch 'bug-1109' into testserverBenny Baumann
2012-11-20Merge branch 'bug-782' into testserverBenny Baumann
2012-11-20bug 1109: Added line to index 0.php and changed order on 21.phpINOPIAE
2012-11-20Merge branch 'bug-1109' into testserverBenny Baumann
2012-11-20bug 782: added missing link to lib\check_weak_key.phpINOPIAE
2012-11-20Merge branch 'bug-782' of git://git-cacert.it-sls.de/cacert-devel into bug-782INOPIAE
2012-11-20bug 1109: Added lines for Swift Number to bank account dataINOPIAE
2012-11-14Bug 782: fixed layout, change of comment not yet realised in overview 5.phpINOPIAE
2012-11-14Merge branch 'bug-1111' into testserverBenny Baumann